From mboxrd@z Thu Jan 1 00:00:00 1970 From: rmccabe@sourceware.org Date: 5 Jun 2007 05:30:24 -0000 Subject: [Cluster-devel] conga ./conga.spec.in.in luci/site/Makefile ma ... Message-ID: <20070605053024.17493.qmail@sourceware.org> List-Id: 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 Branch: EXPERIMENTAL Changes by: rmccabe at sourceware.org 2007-06-05 05:30:23 Modified files: . : conga.spec.in.in luci/site : Makefile make : version.in Log message: bz240034 Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=EXPERIMENTAL&r1=1.77&r2=1.77.2.1 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/Makefile.diff?cvsroot=cluster&only_with_tag=EXPERIMENTAL&r1=1.12&r2=1.12.4.1 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&only_with_tag=EXPERIMENTAL&r1=1.31.2.1&r2=1.31.2.2 --- conga/conga.spec.in.in 2007/05/03 19:55:10 1.77 +++ conga/conga.spec.in.in 2007/06/05 05:30:22 1.77.2.1 @@ -131,45 +131,48 @@ %endif %pre -n luci -if ! /bin/grep ^luci\:x /etc/group 2>&1 >/dev/null; then - /usr/sbin/groupadd -r -f luci >/dev/null 2>&1 +if ! /bin/grep ^luci\:x /etc/group >&/dev/null; then + /usr/sbin/groupadd -r -f luci >&/dev/null fi -if ! /bin/grep ^luci\:x /etc/passwd 2>&1 >/dev/null; then - /usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/luci -g luci luci >/dev/null 2>&1 +if ! /bin/grep ^luci\:x /etc/passwd >&/dev/null; then + /usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/luci -g luci luci >&/dev/null fi %post -n luci /sbin/chkconfig --add luci -/sbin/service luci status >/dev/null 2>&1 +/sbin/service luci status >&/dev/null LUCI_RUNNING=$? if [ "$LUCI_RUNNING" == "0" ]; then - /sbin/service luci stop >/dev/null 2>&1 + /sbin/service luci stop >&/dev/null fi -if [ -e /var/lib/luci/var/luci_backup.xml ]; then +if [ -f /var/lib/luci/var/luci_backup.xml ]; then # restore luci database - /usr/sbin/luci_admin restore >/dev/null 2>&1 + /usr/sbin/luci_admin restore >&/dev/null fi + # set initial admin password (if not already set) to random value -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 +grep True /var/lib/luci/.default_password_has_been_reset >&/dev/null +if [ $? -ne 0 ]; then + /usr/sbin/luci_admin password --random >&/dev/null && + rm -f /var/lib/luci/var/Data.fs.index /var/lib/luci/var/Data.fs.tmp /var/lib/luci/var/Data.fs.old fi if [ "$LUCI_RUNNING" == "0" ]; then - /sbin/service luci start >/dev/null 2>&1 + /sbin/service luci start >&/dev/null fi %preun -n luci if [ "$1" == "0" ]; then - /sbin/service luci stop >/dev/null 2>&1 + /sbin/service luci stop >&/dev/null /sbin/chkconfig --del luci fi -/sbin/service luci status >/dev/null 2>&1 +/sbin/service luci status >&/dev/null LUCI_RUNNING=$? if [ "$LUCI_RUNNING" == "0" ]; then - /sbin/service luci stop >/dev/null 2>&1 + /sbin/service luci stop >&/dev/null fi -/usr/sbin/luci_admin backup >/dev/null 2>&1 +/usr/sbin/luci_admin backup >&/dev/null if [ "$LUCI_RUNNING" == "0" ]; then - /sbin/service luci start >/dev/null 2>&1 + /sbin/service luci start >&/dev/null fi @@ -244,33 +247,33 @@ %{_libexecdir}/ricci-modlog %pre -n ricci -if ! /bin/grep ^ricci\:x /etc/group 2>&1 >/dev/null; then - /usr/sbin/groupadd -r -f ricci >/dev/null 2>&1 +if ! /bin/grep ^ricci\:x /etc/group >&/dev/null; then + /usr/sbin/groupadd -r -f ricci >&/dev/null fi -if ! /bin/grep ^ricci\:x /etc/passwd 2>&1 >/dev/null; then - /usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/ricci -g ricci ricci >/dev/null 2>&1 +if ! /bin/grep ^ricci\:x /etc/passwd >&/dev/null; then + /usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/ricci -g ricci ricci >&/dev/null fi %post -n ricci -DBUS_PID=`cat /var/run/messagebus.pid 2> /dev/null` -/bin/kill -s SIGHUP $DBUS_PID > /dev/null 2>&1 -/sbin/service oddjobd reload >/dev/null 2>&1 +DBUS_PID=`cat /var/run/messagebus.pid 2>/dev/null` +/bin/kill -s SIGHUP $DBUS_PID >&/dev/null +/sbin/service oddjobd reload >&/dev/null /sbin/chkconfig --add ricci %preun -n ricci if [ "$1" == "0" ]; then - /sbin/service ricci stop > /dev/null 2>&1 + /sbin/service ricci stop >&/dev/null /sbin/chkconfig --del ricci fi %postun -n ricci if [ "$1" == "0" ]; then - DBUS_PID=`cat /var/run/messagebus.pid 2> /dev/null` - /bin/kill -s SIGHUP $DBUS_PID > /dev/null 2>&1 - /sbin/service oddjobd reload > /dev/null 2>&1 + DBUS_PID=`cat /var/run/messagebus.pid 2>/dev/null` + /bin/kill -s SIGHUP $DBUS_PID >&/dev/null + /sbin/service oddjobd reload >&/dev/null fi if [ "$1" == "1" ]; then - /sbin/service ricci condrestart > /dev/null 2>&1 + /sbin/service ricci condrestart >&/dev/null fi --- conga/luci/site/Makefile 2006/12/06 22:34:09 1.12 +++ conga/luci/site/Makefile 2007/06/05 05:30:22 1.12.4.1 @@ -40,8 +40,6 @@ install: install -d ${DESTDIR}/var/lib/luci - echo False > ${DESTDIR}/var/lib/luci/.default_password_has_been_reset - chmod 640 ${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 @@ -72,13 +70,6 @@ install -d ${DESTDIR}/var/lib/luci/var install -m 600 luci/var/Data.fs ${DESTDIR}/var/lib/luci/var/Data.fs - install -m 600 luci/var/Data.fs ${DESTDIR}/var/lib/luci/var/Data.fs.old - touch ${DESTDIR}/var/lib/luci/var/Data.fs.index - chmod 600 ${DESTDIR}/var/lib/luci/var/Data.fs.index - touch ${DESTDIR}/var/lib/luci/var/Data.fs.tmp - chmod 600 ${DESTDIR}/var/lib/luci/var/Data.fs.tmp - touch ${DESTDIR}/var/lib/luci/var/Data.fs.lock - chmod 644 ${DESTDIR}/var/lib/luci/var/Data.fs.lock install -d ${DESTDIR}/var/lib/luci/var/pts # install -m 644 `find luci/var/pts -maxdepth 1 -type f | grep .mo | grep -v \~ | grep -v \#` ${DESTDIR}/var/lib/luci/var/pts install -d ${DESTDIR}/var/lib/luci/var/certs @@ -95,4 +86,3 @@ distclean: clean - --- conga/make/version.in 2007/05/03 20:01:08 1.31.2.1 +++ conga/make/version.in 2007/06/05 05:30:23 1.31.2.2 @@ -1,5 +1,5 @@ VERSION=0.10.0 -RELEASE=0_UNRELEASED +RELEASE=1_UNRELEASED # Remove "_UNRELEASED" at release time. # Put release num at the beggining, # so that after it gets released, it has