Hello community, here is the log from the commit of package cobbler for openSUSE:Factory checked in at 2012-04-20 15:11:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cobbler (Old) and /work/SRC/openSUSE:Factory/.cobbler.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cobbler", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2012-04-19 08:48:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cobbler.new/cobbler.changes 2012-04-20 15:12:05.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Apr 19 10:57:50 CEST 2012 - [email protected] + +- moved the secret generation from RPM post-script to the + init-script, to avoid that all appliances will still have the + same key + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cobbler.spec ++++++ --- /var/tmp/diff_new_pack.1zVpkv/_old 2012-04-20 15:12:06.000000000 +0200 +++ /var/tmp/diff_new_pack.1zVpkv/_new 2012-04-20 15:12:06.000000000 +0200 @@ -60,6 +60,7 @@ %endif Requires: createrepo +Requires: openssl #%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 #Requires: fence-agents #%endif @@ -466,13 +467,6 @@ #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. ++++++ fix-initscript.dif ++++++ --- /var/tmp/diff_new_pack.1zVpkv/_old 2012-04-20 15:12:06.000000000 +0200 +++ /var/tmp/diff_new_pack.1zVpkv/_new 2012-04-20 15:12:06.000000000 +0200 @@ -1,7 +1,5 @@ -Index: config/cobblerd -=================================================================== ---- config/cobblerd.orig -+++ config/cobblerd +--- config/cobblerd ++++ config/cobblerd 2012/04/19 08:55:40 @@ -7,8 +7,9 @@ ### BEGIN INIT INFO @@ -14,10 +12,17 @@ # Default-Stop: 0 1 2 6 # Short-Description: daemon for libvirt virtualization API # Description: This is a daemon that a provides remote cobbler API -@@ -50,8 +51,26 @@ RETVAL=0 +@@ -50,8 +51,33 @@ start() { echo -n $"Starting cobbler daemon: " ++ # Change the SECRET_KEY option in the Django settings.py file ++ # required for security reasons, should be unique on all systems ++ # the default is empty -> SECRET_KEY = '' ++ # such a key will be changed now ++ # (moved from the post-section of the RPM to the init-script for appliances) ++ 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 + if ! grep '\[tftpd\]' /etc/cobbler/modules.conf > /dev/null 2>&1; then + echo + echo "no [tftpd] section found in /etc/cobbler/modules.conf" @@ -42,7 +47,7 @@ rc_status -v elif [ -e $DEBIAN_VERSION ]; then if [ -f $LOCKFILE ]; then -@@ -66,7 +85,7 @@ start() { +@@ -66,7 +92,7 @@ fi RETVAL=$? echo @@ -51,7 +56,7 @@ return $RETVAL } -@@ -91,7 +110,9 @@ stop() { +@@ -91,7 +117,9 @@ RETVAL=$? echo if [ $RETVAL -eq 0 ]; then @@ -62,7 +67,7 @@ rm -f /var/run/$SERVICE.pid fi } -@@ -111,6 +132,7 @@ case "$1" in +@@ -111,6 +139,7 @@ echo -n "Checking for service cobblerd " checkproc /usr/bin/cobblerd rc_status -v @@ -70,7 +75,7 @@ elif [ -f $DEBIAN_VERSION ]; then if [ -f $LOCKFILE ]; then RETVAL=0 -@@ -125,7 +147,7 @@ case "$1" in +@@ -125,7 +154,7 @@ fi ;; condrestart) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
