From e276eef783134b7676921c3f7869cb258b26cd95 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Tue, 29 Jan 2013 10:43:55 -0600 Subject: Version bump to 1.3.0rc2 Signed-off-by: Sol Jerome --- misc/bcfg2-selinux.spec | 11 +++++++---- misc/bcfg2.spec | 11 +++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) (limited to 'misc') diff --git a/misc/bcfg2-selinux.spec b/misc/bcfg2-selinux.spec index f8e6dbeb1..e5a0eed16 100644 --- a/misc/bcfg2-selinux.spec +++ b/misc/bcfg2-selinux.spec @@ -9,7 +9,7 @@ Name: bcfg2-selinux Version: 1.3.0 -Release: 0.0rc1 +Release: 0.0rc2 Summary: Bcfg2 Client and Server SELinux policy %if 0%{?suse_version} @@ -24,8 +24,8 @@ Conflicts: selinux-policy = 3.11.1 License: BSD URL: http://bcfg2.org -Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/%{name}-%{version}rc1.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}rc1-%{release}-root-%(%{__id_u} -n) +Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/%{name}-%{version}rc2.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}rc2-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: checkpolicy, selinux-policy-devel, hardlink @@ -65,7 +65,7 @@ deployment strategies. This package includes the Bcfg2 server and client SELinux policy. %prep -%setup -q -n %{name}-%{version}rc1 +%setup -q -n %{name}-%{version}rc2 %build cd redhat/selinux @@ -120,6 +120,9 @@ if [ $1 -eq 0 ] ; then fi %changelog +* Tue Jan 29 2013 Sol Jerome 1.3.0-0.0rc2 +- New upstream release + * Wed Jan 09 2013 Sol Jerome 1.3.0-0.0rc1 - New upstream release diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec index a798471af..18791eccf 100644 --- a/misc/bcfg2.spec +++ b/misc/bcfg2.spec @@ -6,7 +6,7 @@ Name: bcfg2 Version: 1.3.0 -Release: 0.0rc1 +Release: 0.0rc2 Summary: Configuration management system %if 0%{?suse_version} @@ -17,8 +17,8 @@ Group: Applications/System %endif License: BSD URL: http://bcfg2.org -Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/%{name}-%{version}rc1.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}rc1-%{release}-root-%(%{__id_u} -n) +Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/%{name}-%{version}rc2.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}rc2-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel @@ -267,7 +267,7 @@ deployment strategies. This package includes the Bcfg2 reports web frontend. %prep -%setup -q -n %{name}-%{version}rc1 +%setup -q -n %{name}-%{version}rc2 %build %{__python}%{pythonversion} setup.py build @@ -443,6 +443,9 @@ fi %endif %changelog +* Tue Jan 29 2013 Sol Jerome 1.3.0-0.0rc2 +- New upstream release + * Wed Jan 09 2013 Sol Jerome 1.3.0-0.0rc1 - New upstream release -- cgit v1.2.3-1-g7c22 From 51e6930af7319a71571237fa2642cee76c736057 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Wed, 30 Jan 2013 10:47:35 -0500 Subject: divided up Bcfg2/*.py files appropriately amongst bcfg2/bcfg2-server RPMs --- misc/bcfg2.spec | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'misc') diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec index 18791eccf..35435001f 100644 --- a/misc/bcfg2.spec +++ b/misc/bcfg2.spec @@ -318,7 +318,8 @@ cp -r build/sphinx/html/* %{buildroot}%{_defaultdocdir}/bcfg2-doc-%{version} # mandriva and RHEL 5 cannot handle %ghost without the file existing, # so let's touch a bunch of empty config files -touch %{buildroot}%{_sysconfdir}/bcfg2.conf %{buildroot}%{_sysconfdir}/bcfg2-web.conf +touch %{buildroot}%{_sysconfdir}/bcfg2.conf \ + %{buildroot}%{_sysconfdir}/bcfg2-web.conf %clean [ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot} || exit 2 @@ -327,9 +328,13 @@ touch %{buildroot}%{_sysconfdir}/bcfg2.conf %{buildroot}%{_sysconfdir}/bcfg2-web %defattr(-,root,root,-) %{_sbindir}/bcfg2 %dir %{python_sitelib}/Bcfg2 -%{python_sitelib}/Bcfg2/*.py* -%dir %{python_sitelib}/Bcfg2/Client -%{python_sitelib}/Bcfg2/Client/* +%{python_sitelib}/Bcfg2/Compat.py* +%{python_sitelib}/Bcfg2/__init__.py* +%{python_sitelib}/Bcfg2/Logger.py* +%{python_sitelib}/Bcfg2/Options.py* +%{python_sitelib}/Bcfg2/Proxy.py* +%{python_sitelib}/Bcfg2/version.py* +%{python_sitelib}/Bcfg2/Client %{_mandir}/man1/bcfg2.1* %{_mandir}/man5/bcfg2.conf.5* %{_initrddir}/bcfg2 @@ -350,6 +355,12 @@ touch %{buildroot}%{_sysconfdir}/bcfg2.conf %{buildroot}%{_sysconfdir}/bcfg2-web %{_initrddir}/bcfg2-server %{_initrddir}/bcfg2-report-collector %dir %{python_sitelib}/Bcfg2 +%{python_sitelib}/Bcfg2/Cache.py* +%{python_sitelib}/Bcfg2/Encryption.py* +%{python_sitelib}/Bcfg2/SSLServer.py* +%{python_sitelib}/Bcfg2/Statistics.py* +%{python_sitelib}/Bcfg2/manage.py* +%{python_sitelib}/Bcfg2/settings.py* %{python_sitelib}/Bcfg2/Server %{python_sitelib}/Bcfg2/Reporting %exclude %{python_sitelib}/Bcfg2/Server/CherryPyCore.py -- cgit v1.2.3-1-g7c22 From 3bfc1704af29e1de66003ec11b7fc9a1ab87abc0 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Mon, 4 Feb 2013 08:56:44 -0600 Subject: bcfg2-web: Fix wsgi configuration for SELinux This creates the wsgi socket in a location where httpd is allowed to write by default (at least on RHEL). Creating the socket in /etc/httpd/run will not work without allowing httpd_t to write to httpd_config_t:dir. Signed-off-by: Sol Jerome --- misc/apache/bcfg2.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'misc') diff --git a/misc/apache/bcfg2.conf b/misc/apache/bcfg2.conf index b9b4b0452..6cd5addf5 100644 --- a/misc/apache/bcfg2.conf +++ b/misc/apache/bcfg2.conf @@ -4,7 +4,7 @@ # WSGIScriptAlias /bcfg2 "/usr/share/bcfg2/reports.wsgi" - WSGISocketPrefix run + WSGISocketPrefix /var/run/httpd/wsgi WSGIDaemonProcess Bcfg2.Server.Reports processes=1 threads=10 WSGIProcessGroup Bcfg2.Server.Reports -- cgit v1.2.3-1-g7c22