- fixed hyperEstraier index URI setting in config file to work finewq

git-svn-id: svn+ssh://llin/home/dpavlin/private/svn/BackupPC/trunk@384 8392b6e1-25fa-0310-8288-cc32f8e212ea

diff --git a/Makefile b/Makefile
index 7f8206a..58722f1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -16,12 +16,14 @@ agi:
        sudo /etc/init.d/backuppc-agi stop
        sudo perl ./configure.pl --batch --config-path=/data/backuppc-agi/data/conf/config.pl
        cd custom/ && find . -type f | grep -v '.svn' | sudo cpio -puV /data/backuppc-agi/
+       cat /data/backuppc-agi/data/conf/config.pl | perl -e 'while(<>){if($$_=~m/^(.*)___ESTRAIER_URI___(.*)$$/gi){print "$${1}http://localhost:1978/nodes/agi$$2";}else{print $$_;}}' | less
        sudo /etc/init.d/backuppc-agi start
 
 qc:
        sudo /etc/init.d/backuppc-qc stop
        sudo perl ./configure.pl --batch --config-path=/data/backuppc-qc/data/conf/config.pl
        cd custom/ && find . -type f | grep -v '.svn' | sudo cpio -puV /data/backuppc-qc/
+       cat /data/backuppc-qc/data/conf/config.pl | perl -e 'while(<>){if($$_=~m/^(.*)___ESTRAIER_URI___(.*)$$/gi){print "$${1}http://localhost:1978/nodes/qc$$2";}else{print $$_;}}' | less
        sudo /etc/init.d/backuppc-qc start
 
 install:

diff --git a/conf/config.pl b/conf/config.pl
index 3166efc..496a4c3 100644 (file)
--- a/conf/config.pl
+++ b/conf/config.pl
@@ -1755,7 +1755,7 @@ $Conf{SearchUser} = 'dpavlin';
 # use following line to disable Hyper Estraier and prevent upgrades
 # from overwriting it
 #$Conf{HyperEstraierIndex} = '';
-$Conf{HyperEstraierIndex} = 'http://localhost:1978/node/backuppc';
+$Conf{HyperEstraierIndex} = '___ESTRAIER_URI___';
 
 #
 # temp directory for storing gzip and iso files when createing iso images