Changeset 870

Timestamp:

05/16/13 17:10:25 (10 years ago)

Author:

olahaye

Message:

[rpm:packaging] Moved password auto config from jobarchived package to main package as we are not sure that the web interface is installed when running the %post in jobarchived package.

File:

• branches/1.0/pkg/rpm/jobmonarch.spec.in (modified) (2 diffs)

branches/1.0/pkg/rpm/jobmonarch.spec.in

@@ -118 +118 @@
 %__rm -rf $RPM_BUILD_ROOT
 
-%post -n jobmonarch-jobmond
-# $1 = 1 => install ($1 = 2 => upgrade)
-if [ "$1" = 1 ]; then
-    /sbin/chkconfig --add jobmond
-elif [ "$1" = 2 ]; then
-    /sbin/service jobmond condrestart
-fi
-
-%post -n jobmonarch-jobarchived
+%post
 # $1 = 1 => install ($1 = 2 => upgrade)
 if [ "$1" = 1 ]; then
@@ -138 +130 @@
     # Set the password in the ganglia conf.php
     sed -i -e "s|^//\$JOB_ARCHIVE_SQL_PASSWORD.*|\$JOB_ARCHIVE_SQL_PASSWORD = \"$DB_PASSWD\"|g" %{gangliaaddonsdir}/job_monarch/conf.php
+fi
+
+%post -n jobmonarch-jobmond
+# $1 = 1 => install ($1 = 2 => upgrade)
+if [ "$1" = 1 ]; then
+    /sbin/chkconfig --add jobmond
+elif [ "$1" = 2 ]; then
+    /sbin/service jobmond condrestart
+fi
+
+%post -n jobmonarch-jobarchived
+# $1 = 1 => install ($1 = 2 => upgrade)
+if [ "$1" = 1 ]; then
     # Enable the service
     /sbin/chkconfig --add jobarchived