Changeset 924 for branches/1.1

Timestamp:

05/24/13 16:31:52 (11 years ago)

Author:

olahaye

Message:

[default config] Correctly set the JOBARCHIVE_RRDS in both jobarchived.conf anf web/conf.php.in

Location:

branches/1.1

Files:

• Makefile (modified) (1 diff)
• jobarchived/jobarchived.conf (modified) (1 diff)
• web/conf.php.in (modified) (1 diff)

branches/1.1/Makefile

@@ -89 +89 @@
         @echo "Using $(JOBARCHIVE_RRDS) as jobarchive path to  store rrds files. If it's not what"
         @echo "you want, use make JOBARCHIVE_RRDS=/path/to/you/jobarchived/rrdsfiles ."
-        @sed -i -e 's|/var/lib/jobarchive|$(JOBARCHIVE_RRDS)|g' jobarchived/jobarchived.conf web/addons/job_monarch/conf.php
+        @sed -i -e 's|__JOBARCHIVE_RRDS__|$(JOBARCHIVE_RRDS)|g' jobarchived/jobarchived.conf web/addons/job_monarch/conf.php
         @#
         @# Files in SBIN_DIR

branches/1.1/jobarchived/jobarchived.conf

@@ -69 +69 @@
 # Where to store the archived rrd's
 #
-ARCHIVE_PATH                    : /usr/local/jobmonarch
+ARCHIVE_PATH                    : __JOBARCHIVE_RRDS__
 
 # Archive's SQL dbase to use

branches/1.1/web/conf.php.in

@@ -82 +82 @@
 // Path to the job archive rrd files
 //
-$JOB_ARCHIVE_DIR = "/var/lib/jobarchive";
+$JOB_ARCHIVE_DIR = "__JOBARCHIVE_RRDS__";
 
 // Location of the job archive (postgres) database