Hello community,
here is the log from the commit of package cobbler for openSUSE:Factory checked
in at 2012-04-19 08:48:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cobbler (Old)
and /work/SRC/openSUSE:Factory/.cobbler.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cobbler", Maintainer is "u...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2012-03-30
14:19:01.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.cobbler.new/cobbler.changes 2012-04-19
08:48:47.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Apr 17 17:11:59 CEST 2012 - u...@suse.de
+
+- create a secret during installation
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cobbler.spec ++++++
--- /var/tmp/diff_new_pack.gDVgrT/_old 2012-04-19 08:48:49.000000000 +0200
+++ /var/tmp/diff_new_pack.gDVgrT/_new 2012-04-19 08:48:49.000000000 +0200
@@ -19,6 +19,16 @@
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
#%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%if 0%{?suse_version}
+%define www_path /srv/
+%define apache_user wwwrun
+%define apache_group www
+%else
+%define www_path %{_var}
+%define apache_user apache
+%define apache_group apache
+%endif
+
%define _binaries_in_noarch_packages_terminate_build 0
Summary: Boot server configurator
Name: cobbler
@@ -40,11 +50,9 @@
Requires: apache2
Requires: apache2-mod_python
Requires: apache2-mod_wsgi
-BuildRequires: distribution-release
#Requires: tftp
Requires: syslinux
-#BuildRequires: apache2 apache2-mod_python tftp distribution-release
-BuildRequires: apache2 apache2-mod_python tftp
+BuildRequires: apache2 apache2-mod_python tftp distribution-release
%else
Requires: httpd
Requires: tftp-server
@@ -136,7 +144,7 @@
mv vendor-files/cobbler_firewall_settings
$RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/cobbler
PREFIX="--prefix=/usr"
mkdir -p $RPM_BUILD_ROOT/etc/apache2/vhosts.d
-mkdir -p $RPM_BUILD_ROOT/srv/www/logs
+mkdir -p $RPM_BUILD_ROOT/%{www_path}/www/logs
%endif
%{__python} setup.py install --optimize=1 --root=$RPM_BUILD_ROOT $PREFIX
mkdir -p $RPM_BUILD_ROOT/usr/sbin
@@ -234,8 +242,8 @@
%else
%defattr(755,apache,apache)
%endif
-%dir /srv/www/cobbler/svc/
-/srv/www/cobbler/svc/*
+%dir /%{www_path}/www/cobbler/svc/
+/%{www_path}/www/cobbler/svc/*
%{_sbindir}/rccobblerd
%defattr(755,root,root)
@@ -257,22 +265,16 @@
%else
%defattr(755,apache,apache)
%endif
-%dir /srv/www/cobbler/
-%dir /srv/www/cobbler/localmirror
-%dir /srv/www/cobbler/repo_mirror
-%dir /srv/www/cobbler/ks_mirror
-%dir /srv/www/cobbler/ks_mirror/config
-%dir /srv/www/cobbler/links
-#%dir /var/www/cobbler/webui (MOVED to cobbler-web)
+%dir /%{www_path}/www/cobbler/
+%dir /%{www_path}/www/cobbler/localmirror
+%dir /%{www_path}/www/cobbler/repo_mirror
+%dir /%{www_path}/www/cobbler/ks_mirror
+%dir /%{www_path}/www/cobbler/ks_mirror/config
+%dir /%{www_path}/www/cobbler/links
%dir /srv/www/cobbler/aux
-%if 0%{suse_version}
-%defattr(444,wwwrun,www)
-%else
-%defattr(444,apache,apache)
-%endif
-#/var/www/cobbler/webui/* (MOVED TO cobbler-web)
-/srv/www/cobbler/aux/anamon
-/srv/www/cobbler/aux/anamon.init
+%defattr(444,%{apache_user},%{apache_group})
+/%{www_path}/www/cobbler/aux/anamon
+/%{www_path}/www/cobbler/aux/anamon.init
%defattr(755,root,root)
%{_bindir}/cobbler
@@ -464,16 +466,19 @@
#BuildArch: noarch
Url: http://fedorahosted.org/cobbler/
+%post -n cobbler-web
+# Change the SECRET_KEY option in the Django settings.py file
+# required for security reasons, should be unique on all systems
+RAND_SECRET=$(openssl rand -base64 40 | sed 's/\//\\\//g')
+sed -i -e "s/SECRET_KEY = ''/SECRET_KEY = \'$RAND_SECRET\'/"
/usr/share/cobbler/web/settings.py
+
+
%description -n cobbler-web
Web interface for Cobbler that allows visiting http://server/cobbler_web to
configure the install server.
%files -n cobbler-web
-%if 0%{suse_version}
-%defattr(-,wwwrun,www)
-%else
-%defattr(-,apache,apache)
-%endif
+%defattr(-,%{apache_user},%{apache_group})
%dir /usr/share/cobbler/web
/usr/share/cobbler/web/*
%if 0%{?suse_version} >= 1030
@@ -482,9 +487,9 @@
%config(noreplace) /etc/httpd/conf.d/cobbler_web.conf
%endif
%dir /var/lib/cobbler/webui_sessions
-%dir /srv/www/cobbler_webui_content
-%dir /srv/www/logs
-/srv/www/cobbler_webui_content/*
+%dir /%{www_path}/www/cobbler_webui_content
+%dir /%{www_path}/www/logs
+/%{www_path}/www/cobbler_webui_content/*
%doc AUTHORS COPYING CHANGELOG README
%changelog
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
