From 725b9152eb30bb91254c976fc06596443421105d Mon Sep 17 00:00:00 2001 From: Alexandre Neymann Date: Mon, 19 Jan 2009 17:40:52 +0000 Subject: [PATCH] - add Required gettext package - with rpm install admin_password is no more in /etc/gforge/siteadmin.pass but in /etc/gforge/gforge.conf --- gforge/gforge.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gforge/gforge.spec b/gforge/gforge.spec index 6d47075421..a7a9537c31 100644 --- a/gforge/gforge.spec +++ b/gforge/gforge.spec @@ -43,6 +43,7 @@ Requires: php-jpgraph php-gd Requires: libnss-pgsql >= 1.4 Requires: mailman Requires: nscd +Requires: gettext BuildRequires: perl @@ -219,9 +220,11 @@ if [ "$1" -eq "1" ]; then # generating and updating site admin password %randstr SITEADMIN_PASSWORD 8 - - echo "$SITEADMIN_PASSWORD" > %{GFORGE_CONF_DIR}/siteadmin.pass - chmod 0600 %{GFORGE_CONF_DIR}/siteadmin.pass + + # updating admin_password in gforge.conf + perl -pi -e " + s#^admin_password=.*#admin_password="$SITEADMIN_PASSWORD"#g" %{GFORGE_CONF_DIR}/gforge.conf + SITEADMIN_PASSWORD=`echo -n $SITEADMIN_PASSWORD | md5sum | awk '{print $1}'` # creating gforge database user @@ -330,7 +333,7 @@ if [ "$1" -eq "0" ]; then # dropping gforge users su -l postgres -s /bin/sh -c "dropuser %{dbuser} >/dev/null 2>&1 ; dropuser gforge_nss >/dev/null 2>&1 ; dropuser gforge_mta >/dev/null 2>&1" - for file in siteadmin.pass local.pl httpd.secrets local.inc httpd.conf httpd.vhosts database.inc ; do + for file in local.pl httpd.secrets local.inc httpd.conf httpd.vhosts database.inc ; do rm -f %{GFORGE_CONF_DIR}/$file done # Remove PostgreSQL access -- 2.30.2