[Fusionforge-commits] r15402 - in branches/Branch_5_1: . src/deb-specific src/debian

Roland Mas lolando at fusionforge.org
Fri Apr 27 14:39:30 CEST 2012


Author: lolando
Date: 2012-04-27 14:39:30 +0200 (Fri, 27 Apr 2012)
New Revision: 15402

Modified:
   branches/Branch_5_1/
   branches/Branch_5_1/src/deb-specific/install-dns.sh
   branches/Branch_5_1/src/debian/changelog
Log:
Stop using local.pl in install-dns.sh

Modified: branches/Branch_5_1/src/deb-specific/install-dns.sh
===================================================================
--- branches/Branch_5_1/src/deb-specific/install-dns.sh	2012-04-27 12:29:38 UTC (rev 15401)
+++ branches/Branch_5_1/src/deb-specific/install-dns.sh	2012-04-27 12:39:30 UTC (rev 15402)
@@ -14,8 +14,8 @@
 case "$1" in
     configure-files)
 	cp -a /etc/bind/named.conf /etc/bind/named.conf.gforge-new
-	domain_name=$(perl -e'require "/etc/gforge/local.pl"; print "$domain_name\n";')
-	ip_address=$(perl -e'require "/etc/gforge/local.pl"; print "$sys_ip_address\n";')
+        domain_name=`/usr/share/gforge/bin/forge_get_config web_host`
+        ip_address=`/usr/share/gforge/bin/forge_get_config ip_address`
 	# export domain_name=$1
 	# export ip_address=$2
   	if ! grep -q "// Next line inserted by GForge install" /etc/bind/named.conf.gforge-new ; then
@@ -26,9 +26,9 @@
   	fi
 	;;
     configure)
-	domain_name=$(perl -e'require "/etc/gforge/local.pl"; print "$domain_name\n";')
-	ip_address=$(perl -e'require "/etc/gforge/local.pl"; print "$sys_ip_address\n";')
-	sys_simple_dns=$(perl -e'require "/etc/gforge/local.pl"; print "$sys_simple_dns\n";')
+        domain_name=`/usr/share/gforge/bin/forge_get_config web_host`
+        ip_address=`/usr/share/gforge/bin/forge_get_config ip_address`
+        sys_simple_dns=`/usr/share/gforge/bin/forge_get_config simple_dns`
   	serial=`date '+%Y%m%d'`01
   	# scm_host lists_host are useless for now
   	for i in domain_name ip_address serial ; do

Modified: branches/Branch_5_1/src/debian/changelog
===================================================================
--- branches/Branch_5_1/src/debian/changelog	2012-04-27 12:29:38 UTC (rev 15401)
+++ branches/Branch_5_1/src/debian/changelog	2012-04-27 12:39:30 UTC (rev 15402)
@@ -1,8 +1,10 @@
 fusionforge (5.1.1-5+1) unstable; urgency=low
 
   * Fixes in search.
+  * Use current way to get configuration values instead of looking for the
+    old file, thanks to Andreas Beckmann (closes: #668878).
 
- -- Roland Mas <lolando at debian.org>  Thu, 26 Apr 2012 11:43:47 +0200
+ -- Roland Mas <lolando at debian.org>  Fri, 27 Apr 2012 14:38:52 +0200
 
 fusionforge (5.1.1-5) unstable; urgency=low
 




More information about the Fusionforge-commits mailing list