Changeset 847


Ignore:
Timestamp:
04/28/13 12:07:46 (8 years ago)
Author:
olahaye
Message:

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

Location:
branches/1.0
Files:
1 edited
1 moved

Legend:

Unmodified
Added
Removed
  • branches/1.0/Makefile

    r846 r847  
    2828REQUIRED = ./jobarchived ./jobmond ./web
    2929
    30 deb:    tarball-bzip
    31 rpm:    tarball-bzip
    32 
    33 all:    tarball deb rpm
     30all:
    3431
    3532tarball:        tarball-gzip tarball-bzip
     
    7067        @echo "\nUsing $(GANGLIA_ROOT) as Ganglia root installation path. If it's not what"
    7168        @echo "you want, use make GANGLIA_ROOT=/path/to/your/ganglia/root ."
    72         @sed -i -e 's|/var/www/ganglia/|$(GANGLIA_ROOT)/|g' web/addons/job_monarch/conf.php
     69        @sed -e 's|__GANGLIA_ROOT__|$(GANGLIA_ROOT)/|g' web/conf.php.in > web/addons/job_monarch/conf.php
    7370        @#
    7471        @# Set the correct JOBARCHIVE_RRDS in jobarchve.conf and ganglia conf.php
     
    128125        @chown -R $(GANGLIA_USER) ./web
    129126        @chown $(HTTPD_USER) ./web/addons/job_monarch/dwoo/compiled
    130         @(cd web; rsync -a --exclude=.svn --exclude=*_test* --exclude=*-example.php . $(DESTDIR)$(GANGLIA_ROOT)/)
     127        @(cd web; rsync -a --exclude=.svn --exclude=*_test* --exclude=*-example.php ./addons ./templates $(DESTDIR)$(GANGLIA_ROOT)/)
    131128        @#
    132129        @echo "\nInstallation complete.\n"
     
    195192        rm -rf ./pkg/rpm/jobmonarch.spec
    196193        rm -rf ./debian/{files,*.log,jobmonarch-jobmond/,jobmonarch-jobarchived/,jobmonarch-webfrontend/,tmp/}
     194        rm -f web/addons/job_monarch/conf.php
  • branches/1.0/web/conf.php.in

    r845 r847  
    2222// Path to Ganglia's web frontend root
    2323//
    24 $GANGLIA_PATH = "/var/www/ganglia/";
     24$GANGLIA_PATH = "__GANGLIA_ROOT__";
    2525
    2626// Format of how to display a date and time in human readable format
Note: See TracChangeset for help on using the changeset viewer.