From mboxrd@z Thu Jan  1 00:00:00 1970
From: kupcevic@sourceware.org <kupcevic@sourceware.org>
Date: 23 Aug 2006 19:58:44 -0000
Subject: [Cluster-devel] conga ./conga.spec.in.in luci/init.d/luci luci ...
Message-ID: <20060823195844.13727.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic at sourceware.org	2006-08-23 19:58:43

Modified files:
	.              : conga.spec.in.in 
	luci/init.d    : luci 
	luci/site      : Makefile 
	luci/site/luci/bin: runzope.in 
	luci/utils     : luci_admin 
Removed files:
	luci/site/luci : .admin_password_has_been_set 

Log message:
	luci: init.d/luci fails with meaningful message if default password has not been changed

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.38&r2=1.39
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/init.d/luci.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/.admin_password_has_been_set.diff?cvsroot=cluster&r1=1.1&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/bin/runzope.in.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/utils/luci_admin.diff?cvsroot=cluster&r1=1.48&r2=1.49

--- conga/conga.spec.in.in	2006/08/22 23:01:17	1.38
+++ conga/conga.spec.in.in	2006/08/23 19:58:42	1.39
@@ -149,7 +149,7 @@
    /usr/sbin/luci_admin restore >/dev/null 2>&1
 fi
 # set initial admin password (if not already set) to random value
-if ! /bin/grep True /var/lib/luci/.admin_password_has_been_set; then
+if ! /bin/grep True /var/lib/luci/.default_password_has_been_reset 2>&1 >/dev/null; then
    /usr/sbin/luci_admin password --random >/dev/null 2>&1
 fi
 if [ "$LUCI_RUNNING" == "0" ]; then
--- conga/luci/init.d/luci	2006/08/16 02:57:52	1.7
+++ conga/luci/init.d/luci	2006/08/23 19:58:42	1.8
@@ -75,7 +75,6 @@
 
 start()
 {
-    rm -f /var/lib/luci/var/Data.fs.index
     $LUCID >/dev/null 2>/dev/null &
     
     https_certs_ok
@@ -149,7 +148,17 @@
 
 case $1 in
 	start)
-	        echo -n "Starting $ID: "
+	        if ! /bin/grep True /var/lib/luci/.default_password_has_been_reset 2>&1 >/dev/null; then
+		    echo ""
+		    echo "luci's 'admin' password has to be changed before server is allowed to start"
+		    echo "To do so, execute (as root): " 
+		    echo -e "\tluci_admin password"
+		    echo ""
+		    /usr/bin/logger -t $ID "startup failed (password not reset): execute 'luci_admin password'"
+		    exit 1
+		fi
+		
+		echo -n "Starting $ID: "
 		system_running
 		rtrn=$?
 		if [ "1$rtrn" != "10" ] ; then
--- conga/luci/site/Makefile	2006/08/18 13:28:44	1.9
+++ conga/luci/site/Makefile	2006/08/23 19:58:42	1.10
@@ -40,7 +40,8 @@
 
 install:
 	install -d ${DESTDIR}/var/lib/luci
-	install -m 0640 luci/.admin_password_has_been_set ${DESTDIR}/var/lib/luci/
+	echo False > ${DESTDIR}/var/lib/luci/.default_password_has_been_reset
+	chmod -m 0640 ${DESTDIR}/var/lib/luci/.default_password_has_been_reset
 
 	install -d ${DESTDIR}/var/lib/luci/bin
 #	install `find luci/bin -maxdepth 1 -type f` ${DESTDIR}/var/lib/luci/bin
--- conga/luci/site/luci/bin/runzope.in	2006/08/18 20:01:14	1.3
+++ conga/luci/site/luci/bin/runzope.in	2006/08/23 19:58:42	1.4
@@ -20,12 +20,12 @@
 ZOPE_RUN="$SOFTWARE_HOME/Zope2/Startup/run.py"
 
 
-if /bin/grep True /var/lib/luci/.admin_password_has_been_set; then
+if /bin/grep True /var/lib/luci/.default_password_has_been_reset >/dev/null 2>&1; then
     exec "$PYTHON" "$ZOPE_RUN" -C "$CONFIG_FILE" "$@"
 else 
     echo ""
     echo ""
-    echo "luci \'admin\' password has to be changed before server is allowed to start"
+    echo "luci's 'admin' password has to be changed before server is allowed to start"
     echo "To do so, execute (as root): " 
     echo -e "\tluci_admin password"
     echo ""
--- conga/luci/utils/luci_admin	2006/08/18 20:01:14	1.48
+++ conga/luci/utils/luci_admin	2006/08/23 19:58:43	1.49
@@ -42,7 +42,7 @@
 LUCI_CERT_DIR       = LUCI_HOME_DIR + '/var/certs/'
 LUCI_BACKUP_DIR     = LUCI_HOME_DIR + '/var'
 LUCI_BACKUP_PATH    = LUCI_BACKUP_DIR + '/luci_backup.xml'
-LUCI_ADMIN_SET_PATH = LUCI_HOME_DIR + '/.admin_password_has_been_set'
+LUCI_ADMIN_SET_PATH = LUCI_HOME_DIR + '/.default_password_has_been_reset'
 
 SSL_PRIVKEY_NAME       = 'privkey.pem'
 SSL_PUBKEY_NAME        = 'cacert.pem'
@@ -1160,7 +1160,7 @@
     print
     print '\tinit: initialize Luci site'
     print '\tpassword: reset admin password'
-    print '\t\tpassword: reset admin password to random value (disable account)'
+    print '\t\t--random: reset admin password to random value (disable account)'
     print '\tbackup: backup Luci site to a file'
     print '\trestore: restore Luci site from backup'
     print '\thelp: this help message'