Changeset 847

Timestamp:

04/28/13 12:07:46 (10 years ago)

Author:

olahaye

Message:

[install] Fixed the conf.php GANGLIA_ROOT setup. avoid modifying source.

Location:

branches/1.0

Files:

• Makefile (modified) (4 diffs)
• web/conf.php.in (moved) (moved from branches/1.0/web/addons/job_monarch/conf.php) (1 diff)

branches/1.0/Makefile

@@ -28 +28 @@
 REQUIRED = ./jobarchived ./jobmond ./web
 
-deb:    tarball-bzip
-rpm:    tarball-bzip
-
-all:    tarball deb rpm
+all:
 
 tarball:        tarball-gzip tarball-bzip
@@ -70 +67 @@
         @echo "\nUsing $(GANGLIA_ROOT) as Ganglia root installation path. If it's not what"
         @echo "you want, use make GANGLIA_ROOT=/path/to/your/ganglia/root ."
-        @sed -i -e 's|/var/www/ganglia/|$(GANGLIA_ROOT)/|g' web/addons/job_monarch/conf.php
+        @sed -e 's|__GANGLIA_ROOT__|$(GANGLIA_ROOT)/|g' web/conf.php.in > web/addons/job_monarch/conf.php
         @#
         @# Set the correct JOBARCHIVE_RRDS in jobarchve.conf and ganglia conf.php
@@ -128 +125 @@
         @chown -R $(GANGLIA_USER) ./web
         @chown $(HTTPD_USER) ./web/addons/job_monarch/dwoo/compiled
-        @(cd web; rsync -a --exclude=.svn --exclude=*_test* --exclude=*-example.php . $(DESTDIR)$(GANGLIA_ROOT)/)
+        @(cd web; rsync -a --exclude=.svn --exclude=*_test* --exclude=*-example.php ./addons ./templates $(DESTDIR)$(GANGLIA_ROOT)/)
         @#
         @echo "\nInstallation complete.\n"
@@ -195 +192 @@
         rm -rf ./pkg/rpm/jobmonarch.spec
         rm -rf ./debian/{files,*.log,jobmonarch-jobmond/,jobmonarch-jobarchived/,jobmonarch-webfrontend/,tmp/}
+        rm -f web/addons/job_monarch/conf.php

branches/1.0/web/conf.php.in

@@ -22 +22 @@
 // Path to Ganglia's web frontend root
 //
-$GANGLIA_PATH = "/var/www/ganglia/";
+$GANGLIA_PATH = "__GANGLIA_ROOT__";
 
 // Format of how to display a date and time in human readable format