[Fusionforge-commits] r10045 - trunk/gforge/utils
Roland Mas
lolando at libremir.placard.fr.eu.org
Wed Jun 16 17:26:10 CEST 2010
Author: lolando
Date: 2010-06-16 17:26:10 +0200 (Wed, 16 Jun 2010)
New Revision: 10045
Modified:
trunk/gforge/utils/forge_get_config
trunk/gforge/utils/manage-apache-config.sh
Log:
More generic pattern replacement for Apache config files
Modified: trunk/gforge/utils/forge_get_config
===================================================================
--- trunk/gforge/utils/forge_get_config 2010-06-16 15:25:55 UTC (rev 10044)
+++ trunk/gforge/utils/forge_get_config 2010-06-16 15:26:10 UTC (rev 10045)
@@ -35,17 +35,30 @@
}
echo "$v\n" ;
} elseif (count($argv) == 2) {
- $v = forge_get_config ($argv[1]) ;
- if ($v === true) {
- $v = 'yes' ;
- } elseif ($v === false) {
- $v = 'no' ;
+ if ($argv[1] == 'list-all-variables') {
+ $c = FusionForgeConfig::get_instance () ;
+ $sections = $c->get_sections() ;
+ foreach ($sections as $s) {
+ $variables = $c->get_variables($s) ;
+ foreach ($variables as $v) {
+ print "$s/$v\n" ;
+ }
+ }
+ } else {
+ $v = forge_get_config ($argv[1]) ;
+ if ($v === true) {
+ $v = 'yes' ;
+ } elseif ($v === false) {
+ $v = 'no' ;
+ }
+ echo "$v\n" ;
}
- echo "$v\n" ;
} else {
echo "Usage: .../forge-get-config <variable> [ <section> ]
For instance: .../forge-get-config web_host
.../forge-get-config repo_prefix scmsvn
+
+Or: .../forge-get-config list-all-variables
" ;
exit (1) ;
}
Modified: trunk/gforge/utils/manage-apache-config.sh
===================================================================
--- trunk/gforge/utils/manage-apache-config.sh 2010-06-16 15:25:55 UTC (rev 10044)
+++ trunk/gforge/utils/manage-apache-config.sh 2010-06-16 15:26:10 UTC (rev 10045)
@@ -60,14 +60,13 @@
dir=$(forge_get_config config_path)/httpd.conf.d
cd $dir
files=$(ls *.inc *.conf | xargs grep -l {[a-z_]*/[a-z_]*})
+ vars=$(forge_get_config list-all-variables)
for f in $files ; do
ftmp=$(mktemp $f.generated.XXXXXX)
cp -a $f $ftmp
- for v in config_path source_path data_path log_path chroot custom_path url_prefix groupdir_prefix web_host lists_host database_host database_name database_user database_password ldap_password jabber_password ; do
-
- grep -q {core/$v} $ftmp && sed -i -e s,{core/$v},$(forge_get_config $v),g $ftmp
+ for v in $vars ; do
+ grep -q {$v} $ftmp && sed -i -e s,{$v},$(forge_get_config ${v##*/} ${v%%/*}),g $ftmp
done
- grep -q {mediawiki/src_path} $ftmp && sed -i -e s,{mediawiki/src_path},$(forge_get_config src_path mediawiki),g $ftmp
mv $ftmp $f.generated
done
;;
More information about the Fusionforge-commits
mailing list