[Fusionforge-commits] r15584 - in branches/Branch_5_2: . src/deb-specific src/debian src/etc/templates src/packaging/install src/plugins/cvstracker src/utils

Roland Mas lolando at fusionforge.org
Fri May 25 14:42:23 CEST 2012


Author: lolando
Date: 2012-05-25 14:42:22 +0200 (Fri, 25 May 2012)
New Revision: 15584

Removed:
   branches/Branch_5_2/src/utils/fill-in-the-blanks.pl
Modified:
   branches/Branch_5_2/
   branches/Branch_5_2/src/deb-specific/create-vhosts.sh
   branches/Branch_5_2/src/deb-specific/prepare-vhosts-file.pl
   branches/Branch_5_2/src/debian/changelog
   branches/Branch_5_2/src/etc/templates/httpd.vhosts
   branches/Branch_5_2/src/packaging/install/common
   branches/Branch_5_2/src/plugins/cvstracker/Makefile
Log:
Removed fill-in-the-blanks.pl and references to it

Modified: branches/Branch_5_2/src/deb-specific/create-vhosts.sh
===================================================================
--- branches/Branch_5_2/src/deb-specific/create-vhosts.sh	2012-05-24 14:42:17 UTC (rev 15583)
+++ branches/Branch_5_2/src/deb-specific/create-vhosts.sh	2012-05-25 12:42:22 UTC (rev 15584)
@@ -2,14 +2,7 @@
 
 set -e
 
-#su -s /bin/sh gforge -c /usr/share/gforge/bin/prepare-vhosts-file.pl
-#TODO (remove workaround) make proper db connect config so the previous line works
 /usr/share/gforge/bin/prepare-vhosts-file.pl
-[ -f /var/lib/gforge/etc/templates/httpd.vhosts ] && \
-	/usr/share/gforge/bin/fill-in-the-blanks.pl \
-		/var/lib/gforge/etc/templates/httpd.vhosts \
-		/var/lib/gforge/etc/httpd.vhosts \
-		/etc/fusionforge/fusionforge.conf
 
 case "$1" in
 	--norestart)

Modified: branches/Branch_5_2/src/deb-specific/prepare-vhosts-file.pl
===================================================================
--- branches/Branch_5_2/src/deb-specific/prepare-vhosts-file.pl	2012-05-24 14:42:17 UTC (rev 15583)
+++ branches/Branch_5_2/src/deb-specific/prepare-vhosts-file.pl	2012-05-25 12:42:22 UTC (rev 15584)
@@ -34,6 +34,10 @@
     $hash{docdir} = $docdir ;
     $hash{cgidir} = $cgidir ;
 
+    foreach my $k (qw/groupdir_prefix log_path/) {
+	$hash{$k} = &forge_get_config ($k) ;
+    }
+
     foreach my $tmpl_line (@ilist) {
 	my $line = $tmpl_line ;
 	chomp $line ;

Modified: branches/Branch_5_2/src/debian/changelog
===================================================================
--- branches/Branch_5_2/src/debian/changelog	2012-05-24 14:42:17 UTC (rev 15583)
+++ branches/Branch_5_2/src/debian/changelog	2012-05-25 12:42:22 UTC (rev 15584)
@@ -1,3 +1,9 @@
+fusionforge (5.1.50+svn15558-2) experimental; urgency=low
+
+  * 
+
+ -- Roland Mas <lolando at debian.org>  Fri, 25 May 2012 14:28:46 +0200
+
 fusionforge (5.1.50+svn15558-1) experimental; urgency=low
 
   * New upstream SVN snapshot from the 5.2 stabilisation branch.

Modified: branches/Branch_5_2/src/etc/templates/httpd.vhosts
===================================================================
--- branches/Branch_5_2/src/etc/templates/httpd.vhosts	2012-05-24 14:42:17 UTC (rev 15583)
+++ branches/Branch_5_2/src/etc/templates/httpd.vhosts	2012-05-25 12:42:22 UTC (rev 15584)
@@ -2,14 +2,16 @@
 	ServerName {vhost_name}
 	VirtualDocumentRoot {docdir}
         VirtualScriptAlias {cgidir}
-        <Directory {gforge_chroot}{groupdir}>
+        <Directory {core/groupdir_prefix}>
                Options Indexes FollowSymlinks
                AllowOverride All
                order allow,deny
                allow from all
        </Directory>
-  LogFormat "%h %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" gforge
-  CustomLog "|{cronolog_path} {var_log_gforge}/%Y/%m/%d/gforge.log" gforge
+  LogFormat "%h %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" fusionforge
+  CustomLog {core/log_path}/access.log fusionforge
+  LogFormat "%{Host}i %h %l %u %t %{SSL_PROTOCOL}x:%{SSL_CIPHER}x \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combinedvhssl
+  CustomLog {core/log_path}/awstats.log combinedvhssl
   # Ensure that we don't try to use SSL on SSL Servers
   <IfModule apache_ssl.c>
     SSLDisable

Modified: branches/Branch_5_2/src/packaging/install/common
===================================================================
--- branches/Branch_5_2/src/packaging/install/common	2012-05-24 14:42:17 UTC (rev 15583)
+++ branches/Branch_5_2/src/packaging/install/common	2012-05-25 12:42:22 UTC (rev 15584)
@@ -5,7 +5,6 @@
 #
 deb-specific/install-chroot.sh         usr/share/@OLDPACKAGE@/bin/
 deb-specific/install-ssh.sh            usr/share/@OLDPACKAGE@/bin/
-utils/fill-in-the-blanks.pl            usr/share/@OLDPACKAGE@/bin/
 utils/include.pl                       usr/share/@OLDPACKAGE@/lib/
 utils/forge_get_config                 usr/share/@OLDPACKAGE@/bin/
 utils/migrate-to-ini-files.sh	       usr/share/@OLDPACKAGE@/bin/

Modified: branches/Branch_5_2/src/plugins/cvstracker/Makefile
===================================================================
--- branches/Branch_5_2/src/plugins/cvstracker/Makefile	2012-05-24 14:42:17 UTC (rev 15583)
+++ branches/Branch_5_2/src/plugins/cvstracker/Makefile	2012-05-25 12:42:22 UTC (rev 15584)
@@ -27,10 +27,6 @@
 	find $(DESTDIR)/usr/share/gforge/plugins/$(PLUGIN)/db/ -type f | xargs chmod 0644
 	find $(DESTDIR)/etc/gforge/plugins/$(PLUGIN)/ -type f | xargs chmod 0644
 	find $(DESTDIR)/usr/share/gforge/www/plugins/$(PLUGIN)/ -type f | xargs chmod 0644
-	/usr/share/gforge/bin/fill-in-the-blanks.pl \
-	$(DESTDIR)/etc/gforge/plugins/cvstracker/cvstracker.conf.tmpl \
-	$(DESTDIR)/etc/gforge/plugins/cvstracker/cvstracker.conf \
-        $(DESTDIR)/etc/fusionforge/fusionforge.conf
 	chmod 0644 $(DESTDIR)/etc/gforge/plugins/cvstracker/cvstracker.conf
 	$(DESTDIR)/usr/share/gforge/plugins/cvstracker/bin/db-upgrade.pl
 	$(DESTDIR)/usr/share/gforge/bin/register-plugin cvstracker "cvstracker"	

Deleted: branches/Branch_5_2/src/utils/fill-in-the-blanks.pl
===================================================================
--- branches/Branch_5_2/src/utils/fill-in-the-blanks.pl	2012-05-24 14:42:17 UTC (rev 15583)
+++ branches/Branch_5_2/src/utils/fill-in-the-blanks.pl	2012-05-25 12:42:22 UTC (rev 15584)
@@ -1,69 +0,0 @@
-#! /usr/bin/perl -w
-
-use strict ;
-
-use vars qw/$ifile $ofile $cfile $prefix $tmpfile %hash $key $val $cur $code $line $token/ ;
-
-# use Debconf::Client::ConfModule ':all';
-
-if ($#ARGV < 1) {
-    print STDERR "Missing parameter.\n\n" ;
-    print STDERR "Usage: fill-in-the-blanks.pl <in-template> <out-file> [<conf_files>]\n" ;
-    exit 1 ;
-}
-
-if ($#ARGV >= 2) {
-	$ifile = shift @ARGV ;
-	$ofile = shift @ARGV ;
-	$cfile = shift @ARGV ;
-} else {
-	$ifile = shift @ARGV ;
-	$ofile = shift @ARGV ;
-	$cfile = "/etc/fusionforge/fusionforge.conf" ;
-}
-%hash = () ;
-
-open CONF, "$cfile" ;
-while ($line = <CONF>) {
-    chomp $line ;
-    next if $line =~ m/^\s*#/ ;
-    ($key, $val) = split ('=', $line, 2) ;
-    $hash{$key} = $val ;
-}
-close CONF ;
-
-while ($#ARGV > -1 ) {
-	$cfile = shift @ARGV ;
-	open CONF, "$cfile" ;
-	while ($line = <CONF>) {
-    		chomp $line ;
-    		next if $line =~ m/^\s*#/ ;
-    		($key, $val) = split ('=', $line, 2) ;
-    		$hash{$key} = $val ;
-	}
-	close CONF ;
-}
-
-$hash{"PLEASE DO NOT REMOVE THIS LINE"} =
-    "Do not edit this file, edit /etc/gforge/templates/* and run fusionforge-config" ;
-
-umask 0077 ;
-open (IFILE, $ifile)
-    or die "Can't open input file '$ifile'" ;
-if (-e $ofile) {
-    unlink $ofile
-	or die "Can't unlink output file '$ofile'" ;
-}
-open (OFILE, "> $ofile")
-    or die "Can't open output file '$ofile'" ;
-
-while ($line = <IFILE>) {
-    chomp $line ;
-    foreach $cur (keys %hash) {
-	$token = "{$cur}" ;
-	$line =~ s/$token/$hash{$cur}/g ;
-    }
-    print OFILE "$line\n";
-}
-close IFILE ;
-close OFILE ;




More information about the Fusionforge-commits mailing list