[Fusionforge-commits] FusionForge branch GUM updated. 964258b624d44fafcde4073326b6e767bdd6606c

Sylvain Beucler beuc-inria at fusionforge.org
Tue Aug 12 18:44:06 CEST 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, GUM has been updated
       via  964258b624d44fafcde4073326b6e767bdd6606c (commit)
       via  1cec82a8d95618ff658c011531984d323a9f4c4c (commit)
       via  dc3b23cc1b05091d6c7311ba70a405a6ef83b381 (commit)
       via  ae128c4db4e22b2d53f156a65e9105cf45616c44 (commit)
       via  f88b50dec581a9653e5721f648a4c1184e24dea0 (commit)
       via  4a66caab2c217eb492087312ea2e96c94c6ef3c2 (commit)
       via  4e06af47c16c7a84d8a07e85be09e021df9f7191 (commit)
       via  449c88df828e5774a19f8cbc6391ea5bdc7822c8 (commit)
      from  e7b773850176812fdb33bba18a665c1f168262ca (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 964258b624d44fafcde4073326b6e767bdd6606c
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Tue Aug 12 18:42:20 2014 +0200

    install: tidy etc/

diff --git a/src/GNUmakefile b/src/GNUmakefile
index d193000..b721e1c 100644
--- a/src/GNUmakefile
+++ b/src/GNUmakefile
@@ -30,13 +30,14 @@ install-config: install-base-dirs
 #	Install initial configuration without overwriting
 	cp -a --no-clobber etc/config.ini.d/* $(DESTDIR)$(config_path)/config.ini.d/
 	if [ ! -e $(DESTDIR)$(config_path)/config.ini ]; then \
-		sed templates/config.ini \
+		sed etc/config.ini \
 			-e 's, at source_path@,$(pkgdatadir),' \
 			-e 's, at data_path@,$(data_path),' \
 			-e 's, at config_path@,$(config_path),' \
 			-e 's, at log_path@,$(log_path),' \
 			> $(DESTDIR)$(config_path)/config.ini; \
 	fi
+#	TODO: install the following at post-install time
 	if [ ! -e $(DESTDIR)$(config_path)/config.ini.d/secrets.ini ]; then \
 		sed templates/secrets.ini \
 			-e 's, at database_host@,$(database_host),' \
diff --git a/src/etc/README b/src/etc/README
index c03967b..3d16e37 100644
--- a/src/etc/README
+++ b/src/etc/README
@@ -1,6 +1 @@
-# Generated files are removed from source tree
-# Use 
-../utils/manage-apache-config.sh build
-# to build config files
-# or just 
-# sh README in this directory
+Build-time configuration.
diff --git a/src/etc/README.httpd-conf-d-flavours b/src/etc/README.httpd-conf-d-flavours
deleted file mode 100644
index 907c277..0000000
--- a/src/etc/README.httpd-conf-d-flavours
+++ /dev/null
@@ -1,16 +0,0 @@
-The following information may be helpful to developers.
-
-The different httpd.conf.d-*/ directories are *generated* out of
-contents of 'httpd.conf.d/'. At the moment, there are 3 flavours of
-these files ("fhs", "opt" and "usrlocal").
-
-The script src/utils/manage-apache-config.sh must be used to
-regenerate the files for these flavours.
-
-Please make modifications in the source files inside 'httpd.conf.d/'
-and regenerate.
-
-More details available in :
-http://lists.fusionforge.org/pipermail/fusionforge-general/2010-June/001074.html
-
--- Olivier Berger
diff --git a/src/templates/config.ini b/src/etc/config.ini
similarity index 100%
rename from src/templates/config.ini
rename to src/etc/config.ini

commit 1cec82a8d95618ff658c011531984d323a9f4c4c
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Tue Aug 12 18:29:56 2014 +0200

    install: tidy httpd.vhosts location

diff --git a/src/cronjobs/create_vhosts.php b/src/cronjobs/create_vhosts.php
index 8a7c13e..014c357 100755
--- a/src/cronjobs/create_vhosts.php
+++ b/src/cronjobs/create_vhosts.php
@@ -40,7 +40,7 @@ if (!$res) {
 $enableRestart = false;
 $httpdRestartedMsg = _('httpd server not restarted');
 
-$inTemplateVhostFile = forge_get_config('source_path').'/etc/templates/httpd.vhosts';
+$inTemplateVhostFile = forge_get_config('source_path').'/templates/httpd.vhosts.tmpl';
 $outVhostsFile = forge_get_config('config_path').'/httpd.conf.d/httpd.vhosts';
 $logPath = forge_get_config('log_path');
 $groupdirPrefix = forge_get_config('groupdir_prefix');
diff --git a/src/post-install.d/httpd-configure.sh b/src/post-install.d/httpd-configure.sh
index 39da66b..8360f9a 100755
--- a/src/post-install.d/httpd-configure.sh
+++ b/src/post-install.d/httpd-configure.sh
@@ -14,9 +14,6 @@ for i in httpd.conf httpd.conf.d/*; do
 	*secrets*) chmod 600 $i;;
     esac
 done
-# Ensure vhosts file exists - cf. 40-vhosts-extra.conf
-mkdir -p -m 755 $data_path/etc/
-touch $data_path/etc/httpd.vhosts
 
 # Hard-coded detection of distro-specific Apache conf layout
 httpd_service=$(if [ -e /etc/redhat-release ]; then echo 'httpd'; else echo 'apache2'; fi)
diff --git a/src/templates/httpd.conf.d/40-vhosts-extra.conf b/src/templates/httpd.conf.d/40-vhosts-extra.conf
index b92cb18..4611474 100644
--- a/src/templates/httpd.conf.d/40-vhosts-extra.conf
+++ b/src/templates/httpd.conf.d/40-vhosts-extra.conf
@@ -1,2 +1,2 @@
 # Other virtual hosts, as requested by users
-Include {core/data_path}/etc/httpd.vhosts
+Include {core/config_path}/httpd.conf.d/httpd.vhosts
diff --git a/src/templates/httpd.conf.d/httpd.vhosts b/src/templates/httpd.conf.d/httpd.vhosts
new file mode 100644
index 0000000..a069d78
--- /dev/null
+++ b/src/templates/httpd.conf.d/httpd.vhosts
@@ -0,0 +1 @@
+# Will be regenerated by create_vhosts.php
diff --git a/src/etc/templates/httpd.vhosts b/src/templates/httpd.vhosts.tmpl
similarity index 100%
rename from src/etc/templates/httpd.vhosts
rename to src/templates/httpd.vhosts.tmpl

commit dc3b23cc1b05091d6c7311ba70a405a6ef83b381
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Tue Aug 12 18:06:11 2014 +0200

    install: add pear and vendor to include_path

diff --git a/src/templates/httpd.conf.d/02-config-main.conf b/src/templates/httpd.conf.d/02-config-main.conf
index df53a48..0a81e0c 100644
--- a/src/templates/httpd.conf.d/02-config-main.conf
+++ b/src/templates/httpd.conf.d/02-config-main.conf
@@ -12,7 +12,7 @@
   # PHP settings
   #
   
-  php_admin_value include_path "{core/custom_path}:{core/config_path}:{core/source_path}:{core/source_path}/www/include:{core/source_path}/common/include:{core/source_path}/plugins:/usr/share/php:."
+  php_admin_value include_path "{core/source_path}:{core/source_path}/www/include:{core/source_path}/common/include:{core/source_path}/plugins:{core/source_path}/vendor:/usr/share/php:/usr/share/pear:."
   php_admin_value default_charset "UTF-8"
   php_flag register_globals "off"
   php_flag magic_quotes_gpc "off"

commit ae128c4db4e22b2d53f156a65e9105cf45616c44
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Tue Aug 12 17:49:34 2014 +0200

    install: Apache configuration installation and expansion

diff --git a/src/GNUmakefile b/src/GNUmakefile
index 6ed6d1d..d193000 100644
--- a/src/GNUmakefile
+++ b/src/GNUmakefile
@@ -47,6 +47,13 @@ install-config: install-base-dirs
 			-e 's, at session_key@,$(session_key),' \
 			> $(DESTDIR)$(config_path)/config.ini.d/secrets.ini; \
 	fi
+	chmod 600 $(DESTDIR)$(config_path)/config.ini.d/secrets.ini
+#	TODO: support 'db_get @PACKAGE@/shared/web_host' ?
+	if [ ! -e $(DESTDIR)$(config_path)/config.ini.d/post-install.ini ]; then \
+		sed templates/post-install.ini \
+			-e 's, at web_host@,$(hostname -f),' \
+			> $(DESTDIR)$(config_path)/config.ini.d/post-install.ini; \
+	fi
 
 install-core: install-base-dirs install-config
 	cp -a VERSION bin common cronjobs db post-install.d templates vendor www lib $(DESTDIR)$(pkgdatadir)/
diff --git a/src/bin/manage-apache-config.sh b/src/bin/manage-apache-config.sh
deleted file mode 100755
index a62abe6..0000000
--- a/src/bin/manage-apache-config.sh
+++ /dev/null
@@ -1,119 +0,0 @@
-#! /bin/bash -e
-
-# Generates contents of the apache configuration files based on the
-# sources in src/etc/httpd.conf.d/ for 3 different flavours :
-#  - src/etc/httpd.conf.d-fhs/ : for FHS like paths (/usr, ...)
-#  - src/etc/httpd.conf.d-opt/ : for /opt like paths
-#  - src/etc/httpd.conf.d-usrlocal/ : for /usr/local like paths
-#
-# See the thread at : http://lists.fusionforge.org/pipermail/fusionforge-general/2010-June/001067.html for some more details
-#
-
-# invoke with utils/manage-apache-config.sh build to regenerate the config files
-# or with utils/manage-apache-config.sh install to ...(TODO: document this)...
-
-case $1 in
-    build)
-	# Change to the script directory
-        cd $(dirname $0)
-	# Guess where is Apache config directory
-	if [ -e src/etc/httpd.conf.d ] ; then # We're in the parent dir
-	    cd src/etc
-	elif [ -e etc/httpd.conf.d ] ; then # probably in src/ (or a renamed gforge/)
-	    cd etc
-	elif [ -e ../etc/httpd.conf.d ] ; then # possibly in src/etc
-	    cd ../etc
-	else
-	    echo "Couldn't find Apache config directory..."
-	    exit 1
-	fi
-
-	for j in fhs fhsrh opt usrlocal ; do
-	    mkdir -p httpd.conf.d-$j
-	    for i in httpd.conf.d/*.inc httpd.conf.d/*.conf ; do
-		sed -e "s,{core/config_path},$(../utils/forge_get_config_basic $j config_path),g" \
-		    -e "s,{core/source_path},$(../utils/forge_get_config_basic $j source_path),g" \
-		    -e "s,{core/data_path},$(../utils/forge_get_config_basic $j data_path),g" \
-		    -e "s,{core/log_path},$(../utils/forge_get_config_basic $j log_path),g" \
-		    -e "s,{core/chroot},/var/l$(../utils/forge_get_config_basic $j chroot},/var),g" \
-		    -e "s,{core/custom_path},$(../utils/forge_get_config_basic $j custom_path),g" \
-		    -e "s,{core/url_prefix},$(../utils/forge_get_config_basic $j url_prefix),g" \
-		    -e "s,{core/mailman_path},$(../utils/forge_get_config_basic $j mailman_path),g" \
-		    -e "s,{core/groupdir_prefix},$(../utils/forge_get_config_basic $j groupdir_prefix),g" \
-		    -e 's,{mediawiki/src_path},/usr/share/mediawiki,g' \
-		$i > httpd.conf.d-$j/$(basename $i)
-	    done
-	    case $j in
-		fhs|fhsrh)
-		    message="FHS like paths"
-		    ;;
-		opt)
-		    message="/opt like paths"
-		    ;;
-		usrlocal)
-		    message="/usr/local like paths"
-		    ;;
-	    esac
-	    cat > httpd.conf.d-fhs/README.generated <<EOF
-Attention developers : contents of this directory are *generated
-files* for $message.
-
-See ../README.httpd-conf-d-flavours for more details
-
--- OlivierBerger
-EOF
-	done
-
-	message="/opt like paths"
-	cat > httpd.conf.d-opt/README.generated <<EOF
-Attention developers : contents of this directory are *generated
-files* for $message.
-
-See ../README.httpd-conf-d-flavours for more details
-
--- OlivierBerger
-EOF
-	;;
-	
-    install)
-	dir=$(forge_get_config config_path)/httpd.conf.d
-	[ -e $dir ] || mkdir -p $dir
-	cd $dir
-	if [ "$2" = "" ] ; then
-	    files=$(ls *.inc *.conf | xargs grep -l {[a-z_]*/[a-z_]*})
-	else
-	    files=$2
-	fi
-	vars=$(forge_get_config list-all-variables)
-	if [ $BASH_VERSINFO -ge 4 ] ; then
-	    # Use associative array if available
-	    declare -A var_cache
-	fi
-	for f in $files ; do
-	    ftmp=$(mktemp $f.generated.XXXXXX)
-	    cp -a $f $ftmp
-	    for v in $vars ; do
-		if [ $BASH_VERSINFO -ge 4 ] ; then
-		    # Fast version, with cache, for Bash >= 4
-		    if grep -q {$v} $ftmp ; then
-			var_cache[$v]="${var_cache[$v]:-$(forge_get_config ${v##*/} ${v%%/*})}"
-			sed -i -e "s,{$v},${var_cache[$v]},g" $ftmp
-		    fi
-		else
-		    # Bash 3... no cache, slower
-		    if grep -q {$v} $ftmp ; then
-			curvar="$(forge_get_config ${v##*/} ${v%%/*})"
-			sed -i -e "s,{$v},$curvar,g" $ftmp
-		    fi
-		fi
-	    done
-	    mv $ftmp $f.generated
-	done
-	;;
-    
-    *)
-	echo "Unknown operation"
-	echo "invoke with $0 [build|install]"
-	exit 1
-	;;
-esac
diff --git a/src/etc/httpd.conf-fhs b/src/etc/httpd.conf-fhs
deleted file mode 100644
index 38645cd..0000000
--- a/src/etc/httpd.conf-fhs
+++ /dev/null
@@ -1,5 +0,0 @@
-# Include all FusionForge-related configuration files
-#
-# TODO: add a pointer to documentation about the Apache configuration of FusionForge
-#
-Include /etc/gforge/httpd.conf.d/*.conf
diff --git a/src/etc/httpd.conf-fhsrh b/src/etc/httpd.conf-fhsrh
deleted file mode 100644
index 38645cd..0000000
--- a/src/etc/httpd.conf-fhsrh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Include all FusionForge-related configuration files
-#
-# TODO: add a pointer to documentation about the Apache configuration of FusionForge
-#
-Include /etc/gforge/httpd.conf.d/*.conf
diff --git a/src/etc/httpd.conf-usrlocal b/src/etc/httpd.conf-usrlocal
deleted file mode 100644
index 8a6e1b6..0000000
--- a/src/etc/httpd.conf-usrlocal
+++ /dev/null
@@ -1,2 +0,0 @@
-# Include all FusionForge-related configuration files
-Include /etc/gforge/httpd.conf.d/*.conf
diff --git a/src/post-install.d/core.sh b/src/post-install.d/core.sh
index 34505e9..069eff3 100755
--- a/src/post-install.d/core.sh
+++ b/src/post-install.d/core.sh
@@ -7,4 +7,4 @@ if ! getent passwd $user >/dev/null; then useradd $user -s /bin/false -d $data_p
 $source_path/post-install.d/db-configure.sh
 $source_path/post-install.d/db-populate.sh
 $source_path/bin/upgrade-db.php
-#	TODO: httpd.conf.d
+$source_path/post-install.d/httpd-configure.sh
diff --git a/src/post-install.d/httpd-configure.sh b/src/post-install.d/httpd-configure.sh
new file mode 100755
index 0000000..39da66b
--- /dev/null
+++ b/src/post-install.d/httpd-configure.sh
@@ -0,0 +1,30 @@
+#!/bin/bash -e
+# Configure Apache
+
+source_path=$(forge_get_config source_path)
+config_path=$(forge_get_config config_path)
+data_path=$(forge_get_config data_path)
+
+cd $source_path/templates/
+for i in httpd.conf httpd.conf.d/*; do
+    if ! [ -e $config_path/$i ]; then
+	$source_path/post-install.d/httpd-expand-conf.php $i $config_path/$i
+    fi
+    case $i in
+	*secrets*) chmod 600 $i;;
+    esac
+done
+# Ensure vhosts file exists - cf. 40-vhosts-extra.conf
+mkdir -p -m 755 $data_path/etc/
+touch $data_path/etc/httpd.vhosts
+
+# Hard-coded detection of distro-specific Apache conf layout
+httpd_service=$(if [ -e /etc/redhat-release ]; then echo 'httpd'; else echo 'apache2'; fi)
+if [ -e /etc/debian_version ]; then
+    ln -nfs $config_path/httpd.conf /etc/apache2/sites-available/fusionforge.conf
+    a2ensite fusionforge.conf
+fi
+if [ -e /etc/redhat-release ]; then
+    ln -nfs $config_path/httpd.conf /etc/httpd/conf.d/fusionforge.conf
+fi
+service $httpd_service restart
diff --git a/src/post-install.d/httpd-expand-conf.php b/src/post-install.d/httpd-expand-conf.php
new file mode 100755
index 0000000..f4963f2
--- /dev/null
+++ b/src/post-install.d/httpd-expand-conf.php
@@ -0,0 +1,41 @@
+#!/usr/bin/php -f
+<?php
+// Substitute {section/var} variables in Apache templates
+
+// Don't try to connect to the DB, just reading config files
+putenv('FUSIONFORGE_NO_DB=true');
+
+require (dirname(__FILE__).'/../common/include/env.inc.php');
+require_once $gfcommon.'include/pre.php';
+
+if (count($argv) != 3) {
+  echo "Usage: $argv[0] template.inc destination.inc\n";
+  echo "(Note: you can use php://stdin and php://stdout)\n";
+  exit(1);
+}
+
+// forge_get_config('source_path').'/etc/httpd.conf.d/'.
+$lines = file($argv[1]);
+if ($lines === FALSE) {
+  echo "$argv[0]: cannot open $argv[1]\n";
+  exit(1);
+}
+
+$out = fopen($argv[2], 'w');
+if ($out === FALSE) {
+  echo "$argv[0]: cannot write to $argv[2]\n";
+  exit(1);
+}
+
+
+// Replace the variable with the configuration value
+foreach($lines as $line) {
+  $line = preg_replace_callback(
+    ',{([a-z_]*)/([a-z_]*)},',
+    function ($matches) {
+      return forge_get_config($matches[2], $matches[1]);
+    },
+    $line);
+  fwrite($out, $line);
+}
+fclose($out);
diff --git a/src/etc/httpd.conf-opt b/src/templates/httpd.conf
similarity index 53%
rename from src/etc/httpd.conf-opt
rename to src/templates/httpd.conf
index 8a6e1b6..1824a2d 100644
--- a/src/etc/httpd.conf-opt
+++ b/src/templates/httpd.conf
@@ -1,2 +1,2 @@
 # Include all FusionForge-related configuration files
-Include /etc/gforge/httpd.conf.d/*.conf
+Include {core/config_path}/httpd.conf.d/*.conf
diff --git a/src/etc/httpd.conf.d/01-namevhost.conf b/src/templates/httpd.conf.d/01-namevhost.conf
similarity index 100%
rename from src/etc/httpd.conf.d/01-namevhost.conf
rename to src/templates/httpd.conf.d/01-namevhost.conf
diff --git a/src/etc/httpd.conf.d/02-config-main.conf b/src/templates/httpd.conf.d/02-config-main.conf
similarity index 100%
rename from src/etc/httpd.conf.d/02-config-main.conf
rename to src/templates/httpd.conf.d/02-config-main.conf
diff --git a/src/etc/httpd.conf.d/03-config-alias-plugin.conf b/src/templates/httpd.conf.d/03-config-alias-plugin.conf
similarity index 100%
rename from src/etc/httpd.conf.d/03-config-alias-plugin.conf
rename to src/templates/httpd.conf.d/03-config-alias-plugin.conf
diff --git a/src/etc/httpd.conf.d/04-config-vendor.conf b/src/templates/httpd.conf.d/04-config-vendor.conf
similarity index 100%
rename from src/etc/httpd.conf.d/04-config-vendor.conf
rename to src/templates/httpd.conf.d/04-config-vendor.conf
diff --git a/src/etc/httpd.conf.d/10-vhosts-main.conf b/src/templates/httpd.conf.d/10-vhosts-main.conf
similarity index 100%
rename from src/etc/httpd.conf.d/10-vhosts-main.conf
rename to src/templates/httpd.conf.d/10-vhosts-main.conf
diff --git a/src/etc/httpd.conf.d/20-vhosts-lists.conf b/src/templates/httpd.conf.d/20-vhosts-lists.conf
similarity index 100%
rename from src/etc/httpd.conf.d/20-vhosts-lists.conf
rename to src/templates/httpd.conf.d/20-vhosts-lists.conf
diff --git a/src/etc/httpd.conf.d/30-vhosts-projects.conf b/src/templates/httpd.conf.d/30-vhosts-projects.conf
similarity index 100%
rename from src/etc/httpd.conf.d/30-vhosts-projects.conf
rename to src/templates/httpd.conf.d/30-vhosts-projects.conf
diff --git a/src/etc/httpd.conf.d/40-vhosts-extra.conf b/src/templates/httpd.conf.d/40-vhosts-extra.conf
similarity index 100%
rename from src/etc/httpd.conf.d/40-vhosts-extra.conf
rename to src/templates/httpd.conf.d/40-vhosts-extra.conf
diff --git a/src/etc/httpd.conf.d/50-vhosts-scm.conf b/src/templates/httpd.conf.d/50-vhosts-scm.conf
similarity index 100%
rename from src/etc/httpd.conf.d/50-vhosts-scm.conf
rename to src/templates/httpd.conf.d/50-vhosts-scm.conf
diff --git a/src/etc/httpd.conf.d/50-wsgi-moinmoin.conf b/src/templates/httpd.conf.d/50-wsgi-moinmoin.conf
similarity index 100%
rename from src/etc/httpd.conf.d/50-wsgi-moinmoin.conf
rename to src/templates/httpd.conf.d/50-wsgi-moinmoin.conf
diff --git a/src/etc/httpd.conf.d/50-wsgi-scmbzr.conf b/src/templates/httpd.conf.d/50-wsgi-scmbzr.conf
similarity index 100%
rename from src/etc/httpd.conf.d/50-wsgi-scmbzr.conf
rename to src/templates/httpd.conf.d/50-wsgi-scmbzr.conf
diff --git a/src/etc/httpd.conf.d/auth-main.inc b/src/templates/httpd.conf.d/auth-main.inc
similarity index 100%
rename from src/etc/httpd.conf.d/auth-main.inc
rename to src/templates/httpd.conf.d/auth-main.inc
diff --git a/src/etc/httpd.conf.d/auth-projects.inc b/src/templates/httpd.conf.d/auth-projects.inc
similarity index 100%
rename from src/etc/httpd.conf.d/auth-projects.inc
rename to src/templates/httpd.conf.d/auth-projects.inc
diff --git a/src/etc/httpd.conf.d/block-trace.inc b/src/templates/httpd.conf.d/block-trace.inc
similarity index 100%
rename from src/etc/httpd.conf.d/block-trace.inc
rename to src/templates/httpd.conf.d/block-trace.inc
diff --git a/src/etc/httpd.conf.d/lists-vhost-plugin-mailman.inc b/src/templates/httpd.conf.d/lists-vhost-plugin-mailman.inc
similarity index 100%
rename from src/etc/httpd.conf.d/lists-vhost-plugin-mailman.inc
rename to src/templates/httpd.conf.d/lists-vhost-plugin-mailman.inc
diff --git a/src/etc/httpd.conf.d/log.inc b/src/templates/httpd.conf.d/log.inc
similarity index 100%
rename from src/etc/httpd.conf.d/log.inc
rename to src/templates/httpd.conf.d/log.inc
diff --git a/src/etc/httpd.conf.d/plugin-authhttpd.inc b/src/templates/httpd.conf.d/plugin-authhttpd.inc
similarity index 100%
rename from src/etc/httpd.conf.d/plugin-authhttpd.inc
rename to src/templates/httpd.conf.d/plugin-authhttpd.inc
diff --git a/src/etc/httpd.conf.d/plugin-generic.inc b/src/templates/httpd.conf.d/plugin-generic.inc
similarity index 100%
rename from src/etc/httpd.conf.d/plugin-generic.inc
rename to src/templates/httpd.conf.d/plugin-generic.inc
diff --git a/src/etc/httpd.conf.d/plugin-mediawiki.inc b/src/templates/httpd.conf.d/plugin-mediawiki.inc
similarity index 100%
rename from src/etc/httpd.conf.d/plugin-mediawiki.inc
rename to src/templates/httpd.conf.d/plugin-mediawiki.inc
diff --git a/src/etc/httpd.conf.d/plugin-moinmoin.inc b/src/templates/httpd.conf.d/plugin-moinmoin.inc
similarity index 100%
rename from src/etc/httpd.conf.d/plugin-moinmoin.inc
rename to src/templates/httpd.conf.d/plugin-moinmoin.inc
diff --git a/src/etc/httpd.conf.d/plugin-phpcaptcha.inc b/src/templates/httpd.conf.d/plugin-phpcaptcha.inc
similarity index 100%
rename from src/etc/httpd.conf.d/plugin-phpcaptcha.inc
rename to src/templates/httpd.conf.d/plugin-phpcaptcha.inc
diff --git a/src/etc/httpd.conf.d/plugin-scmbzr.inc b/src/templates/httpd.conf.d/plugin-scmbzr.inc
similarity index 100%
rename from src/etc/httpd.conf.d/plugin-scmbzr.inc
rename to src/templates/httpd.conf.d/plugin-scmbzr.inc
diff --git a/src/etc/httpd.conf.d/plugin-scmdarcs.inc b/src/templates/httpd.conf.d/plugin-scmdarcs.inc
similarity index 100%
rename from src/etc/httpd.conf.d/plugin-scmdarcs.inc
rename to src/templates/httpd.conf.d/plugin-scmdarcs.inc
diff --git a/src/etc/httpd.conf.d/plugin-scmgit.inc b/src/templates/httpd.conf.d/plugin-scmgit.inc
similarity index 100%
rename from src/etc/httpd.conf.d/plugin-scmgit.inc
rename to src/templates/httpd.conf.d/plugin-scmgit.inc
diff --git a/src/etc/httpd.conf.d/plugin-scmsvn.inc b/src/templates/httpd.conf.d/plugin-scmsvn.inc
similarity index 100%
rename from src/etc/httpd.conf.d/plugin-scmsvn.inc
rename to src/templates/httpd.conf.d/plugin-scmsvn.inc
diff --git a/src/etc/httpd.conf.d/plugin-sysauthldap-secrets.inc b/src/templates/httpd.conf.d/plugin-sysauthldap-secrets.inc
similarity index 100%
rename from src/etc/httpd.conf.d/plugin-sysauthldap-secrets.inc
rename to src/templates/httpd.conf.d/plugin-sysauthldap-secrets.inc
diff --git a/src/etc/httpd.conf.d/projects-in-mainvhost.inc b/src/templates/httpd.conf.d/projects-in-mainvhost.inc
similarity index 100%
rename from src/etc/httpd.conf.d/projects-in-mainvhost.inc
rename to src/templates/httpd.conf.d/projects-in-mainvhost.inc
diff --git a/src/etc/httpd.conf.d/secrets.inc b/src/templates/httpd.conf.d/secrets.inc
similarity index 100%
rename from src/etc/httpd.conf.d/secrets.inc
rename to src/templates/httpd.conf.d/secrets.inc
diff --git a/src/etc/httpd.conf.d/ssl-off.inc b/src/templates/httpd.conf.d/ssl-off.inc
similarity index 100%
rename from src/etc/httpd.conf.d/ssl-off.inc
rename to src/templates/httpd.conf.d/ssl-off.inc
diff --git a/src/etc/httpd.conf.d/ssl-on.inc b/src/templates/httpd.conf.d/ssl-on.inc
similarity index 100%
rename from src/etc/httpd.conf.d/ssl-on.inc
rename to src/templates/httpd.conf.d/ssl-on.inc
diff --git a/src/etc/httpd.conf.d/ssl-really-on.inc b/src/templates/httpd.conf.d/ssl-really-on.inc
similarity index 100%
rename from src/etc/httpd.conf.d/ssl-really-on.inc
rename to src/templates/httpd.conf.d/ssl-really-on.inc
diff --git a/src/etc/httpd.conf.d/vhost-list.inc b/src/templates/httpd.conf.d/vhost-list.inc
similarity index 100%
rename from src/etc/httpd.conf.d/vhost-list.inc
rename to src/templates/httpd.conf.d/vhost-list.inc
diff --git a/src/etc/httpd.conf.d/vhost-main.inc b/src/templates/httpd.conf.d/vhost-main.inc
similarity index 100%
rename from src/etc/httpd.conf.d/vhost-main.inc
rename to src/templates/httpd.conf.d/vhost-main.inc
diff --git a/src/etc/httpd.conf.d/vhost-projects.inc b/src/templates/httpd.conf.d/vhost-projects.inc
similarity index 100%
rename from src/etc/httpd.conf.d/vhost-projects.inc
rename to src/templates/httpd.conf.d/vhost-projects.inc
diff --git a/src/etc/httpd.conf.d/vhost-scm.inc b/src/templates/httpd.conf.d/vhost-scm.inc
similarity index 100%
rename from src/etc/httpd.conf.d/vhost-scm.inc
rename to src/templates/httpd.conf.d/vhost-scm.inc
diff --git a/src/templates/post-install.ini b/src/templates/post-install.ini
new file mode 100644
index 0000000..d185cac
--- /dev/null
+++ b/src/templates/post-install.ini
@@ -0,0 +1,4 @@
+; This file was generated by the FusionForge installation system.
+; You can edit the values here or move them to other files.
+[core]
+web_host=@web_host@

commit f88b50dec581a9653e5721f648a4c1184e24dea0
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Tue Aug 12 14:54:25 2014 +0200

    install: remove obsolete install-apache.sh

diff --git a/src/bin/install-apache.sh b/src/bin/install-apache.sh
deleted file mode 100755
index 086e838..0000000
--- a/src/bin/install-apache.sh
+++ /dev/null
@@ -1,269 +0,0 @@
-#! /bin/sh
-# 
-# Configure apache for GForge
-# Christian Bayle, Roland Mas, debian-sf (GForge for Debian)
-#
-# Reset fb color mode
-RESET="]R"
-# ANSI COLORS
-# Erase to end of line
-CRE="
-"
-# Clear and reset Screen
-CLEAR="c"
-# Normal color
-NORMAL=""
-# RED: Failure or error message
-RED=""
-# GREEN: Success message
-GREEN=""
-
-set -e
-
-ARG=$@
-if [ $(id -u) != 0 ] ; then
-    echo "You must be root to run this, please enter passwd"
-    exec su -c "$0 $1"
-fi
-
-remove_gforge_insert(){
-			cp -a $1 $1.gforge-new
-			echo "Removing Gforge inserted lines from $1.gforge-new"
-			set +e
-			vi -e $1.gforge-new > /dev/null 2>&1 <<-FIN
-/### Next line inserted by GForge install
-:d
-:d
-:w
-:x
-FIN
-set -e
-}
-
-search_conf_file(){
-CONFFILE=$1
-shift
-echo -n "Searching $CONFFILE config file	"
-RESULT=""
-for i in $*
-do
-	if [ -f "$i" ]
-	then
-		RESULT="$i $RESULT"
-	fi
-done
-if [ -z "$RESULT" ]
-then
-	echo "$RED[Failed]$NORMAL" 
-	echo "${CONFFILE} conf file not found at $*"
-	echo "Please set ${CONFFILE}_ETC_SEARCH" ; exit 1
-else
-	echo "$GREEN[OK]$NORMAL"
-fi
-}
-
-get_conf(){
-if [ "$HAVECONF" != "true" ]
-then
-if [ -z "$APACHE_ETC_SEARCH" ] 
-then 
-	APACHE_ETC_SEARCH="/etc/apache2/apache2.conf /etc/apache/httpd.conf /etc/apache-perl/httpd.conf /etc/apache-ssl/httpd.conf"
-fi
-if [ -z "$GFORGE_ETC_SEARCH" ] 
-then 
-	GFORGE_ETC_SEARCH="$(forge_get_config config_path)/httpd.conf"
-fi
-if [ -z "$PHP_ETC_SEARCH" ] 
-then 
-	PHP_ETC_SEARCH="/etc/php5/apache2/php.ini /etc/php5/cgi/php.ini"
-fi
-export APACHE_ETC_SEARCH GFORGE_ETC_SEARCH PHP_ETC_SEARCH
-
-search_conf_file APACHE "$APACHE_ETC_SEARCH"
-APACHE_ETC_LIST="$RESULT"
-search_conf_file GFORGE "$GFORGE_ETC_SEARCH"
-GFORGE_ETC_LIST="$RESULT"
-search_conf_file PHP "$PHP_ETC_SEARCH"
-PHP_ETC_LIST="$RESULT"
-export APACHE_ETC_LIST GFORGE_ETC_LIST PHP_ETC_LIST
-
-gforgebin=$(forge_get_config binary_path)
-set $GFORGE_ETC_LIST
-gforgeconffile=$1
-echo Using $gforgeconffile
-export gforgeconffile
-HAVECONF=true
-export HAVECONF
-fi
-}
-
-get_conf
-set $ARG
-case "$1" in
-    configure-files)
-	# Make sure Apache sees us
-	for apacheconffile in $APACHE_ETC_LIST
-	do
-		APACHE_ETC_DIR=`dirname $apacheconffile`
-		if [ -d "$APACHE_ETC_DIR/conf.d" ]
-		then
-			# New apache conf	
-			# Remove old hack to have Apache see us
-	    		if [ -e $apacheconffile ] && grep -q "Include $gforgeconffile" $apacheconffile ; then
-				remove_gforge_insert $apacheconffile
-	    		fi
-		else	
-			# Old fashion Apache
-			if [ -e $apacheconffile ] ; then
-	    			cp -a $apacheconffile $apacheconffile.gforge-new
-	    			perl -pi -e "s/# *LoadModule php5_module/LoadModule php5_module/gi" $apacheconffile.gforge-new
-	    			perl -pi -e "s/# *LoadModule ssl_module/LoadModule ssl_module/gi" $apacheconffile.gforge-new
-	    			perl -pi -e "s/# *LoadModule env_module/LoadModule env_module/gi" $apacheconffile.gforge-new
-	    			perl -pi -e "s/# *LoadModule vhost_alias_module/LoadModule vhost_alias_module/gi" $apacheconffile.gforge-new
-	    
-	    			if ! grep -q "^Include $gforgeconffile" $apacheconffile.gforge-new ; then
-					# File cleaning, just in case
-					remove_gforge_insert $apacheconffile
-					echo "### Next line inserted by GForge install" >> $apacheconffile.gforge-new
-					echo "Include $gforgeconffile" >> $apacheconffile.gforge-new
-				else
-					echo "Found Include $gforgeconffile in $apacheconffile"
-	    			fi
-			fi
-		fi
-	done
-	# Make sure pgsql, ldap and gd are enabled in the PHP config files
-	
-	for phpconffile in $PHP_ETC_LIST
-	do
-		cp -a $phpconffile $phpconffile.gforge-new
-		if [ -f $phpconffile.gforge-new ]; then
-	    		if ! grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*pgsql.so" $phpconffile.gforge-new; then
-				echo "Enabling pgsql in $phpconffile"
-				echo "extension=pgsql.so" >> $phpconffile.gforge-new
-	    		fi
-	    		if ! grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*gd.so" $phpconffile.gforge-new; then
-				echo "Enabling gd in $phpconffile"
-				echo "extension=gd.so" >> $phpconffile.gforge-new
-	    		fi
-		fi
-	done
-	;;
-	
-    configure)
-	[ -f $gforgebin/prepare-vhosts-file.pl ] && su -s /bin/sh gforge -c $gforgebin/prepare-vhosts-file.pl
-	if [ -f /usr/sbin/modules-config ] ; then
-		for flavour in apache apache-perl apache-ssl ; do
-			if [ -e /etc/$flavour/httpd.conf ] ; then
-				if [ "`/usr/sbin/modules-config $flavour query mod_php5`" == "" ] ; then
-	    				DEBIAN_FRONTEND=noninteractive /usr/sbin/modules-config $flavour enable mod_php5
-				fi
-				if [ $flavour != apache-ssl ] ; then
-					if [ "`/usr/sbin/modules-config $flavour query mod_ssl`" == "" ] ; then
-	    					DEBIAN_FRONTEND=noninteractive /usr/sbin/modules-config $flavour enable mod_ssl
-					fi
-				fi
-				if [ "`/usr/sbin/modules-config $flavour query mod_env`" == "" ] ; then
-	    				DEBIAN_FRONTEND=noninteractive /usr/sbin/modules-config $flavour enable mod_env
-				fi
-				if [ "`/usr/sbin/modules-config $flavour query mod_vhost_alias`" == "" ] ; then
-	    				DEBIAN_FRONTEND=noninteractive /usr/sbin/modules-config $flavour enable mod_vhost_alias
-				fi
-
-				LINK=`ls -l /etc/$flavour/conf.d/gforge.httpd.conf | sed 's/.*-> \(.*\)$/\1/'`
-				if [ "$LINK" != "$GFORGE_ETC_LIST" ] ; then 
-					echo Removing symlink
-					rm -f /etc/$flavour/conf.d/gforge.httpd.conf
-				fi
-				if [ -d /etc/$flavour/conf.d ] ; then
-					[ ! -e /etc/$flavour/conf.d/gforge.httpd.conf ] && ln -s $GFORGE_ETC_LIST /etc/$flavour/conf.d/gforge.httpd.conf
-				fi
-			fi
-		done
-	fi
-	# do configuring for apache2, loop through flavours not necessary
-	# but it's here in case other flavours of apache2 come along
-	if [ -f /usr/sbin/a2enmod ] ; then
-		for flavour in apache2 ;  do
-			if [ -e /etc/$flavour/httpd.conf ] ; then
-				DEBIAN_FRONTEND=noninteractive /usr/sbin/a2enmod php5 || true
-				DEBIAN_FRONTEND=noninteractive /usr/sbin/a2enmod ssl || true
-				DEBIAN_FRONTEND=noninteractive /usr/sbin/a2enmod suexec || true
-				DEBIAN_FRONTEND=noninteractive /usr/sbin/a2enmod vhost_alias || true
-				DEBIAN_FRONTEND=noninteractive /usr/sbin/a2enmod headers || true
-				DEBIAN_FRONTEND=noninteractive /usr/sbin/a2enmod rewrite || true
-				DEBIAN_FRONTEND=noninteractive /usr/sbin/a2enmod proxy || true
-				DEBIAN_FRONTEND=noninteractive /usr/sbin/a2enmod proxy_http || true
-
-				LINK=`ls -l /etc/$flavour/conf.d/gforge.httpd.conf | sed 's/.*-> \(.*\)$/\1/'`
-				if [ "$LINK" != "$GFORGE_ETC_LIST" ] ; then 
-					echo Removing symlink
-					rm -f /etc/$flavour/conf.d/gforge.httpd.conf
-				fi
-				if [ -d /etc/$flavour/conf.d ] ; then
-					[ ! -e /etc/$flavour/conf.d/gforge.httpd.conf ] && ln -s $GFORGE_ETC_LIST /etc/$flavour/conf.d/gforge.httpd.conf
-				fi
-			fi
-		done
-	fi
-	# Check apache 2 is running
-	test -f /etc/default/apache2 && . /etc/default/apache2
-	for flavour in apache2 ;  do
-	    if [ -x /usr/sbin/$flavour ]; then
-		invoke-rc.d $flavour restart || true
-	    fi
-	done
-	;;
-
-    purge-files)
-	for apacheconffile in $APACHE_ETC_LIST
-	do
-	echo "Looking at $apacheconffile"
-	    	#if [ -e $apacheconffile ] && grep -q "Include $gforgeconffile" $apacheconffile ; then
-	    	if [ -e $apacheconffile ] && grep -q "### Next line inserted by GForge install" $apacheconffile ; then
-			remove_gforge_insert $apacheconffile
-	    	fi
-	done
-	;;
-
-    purge)
-    	for flavour in apache apache-perl apache-ssl apache2; do
-		[ -e /etc/$flavour/conf.d/gforge.httpd.conf ] && rm -f /etc/$flavour/conf.d/gforge.httpd.conf
-		if [ -x /usr/sbin/$flavour ]; then
-			invoke-rc.d $flavour restart < /dev/null > /dev/null 2>&1 || true
-		fi
-	done
-	;;
-
-    setup)
-    	$0 configure-files
-	for conffile in $APACHE_ETC_LIST $PHP_ETC_LIST
-	do
-		if [ -f $conffile.gforge-new ] 
-		then
-			cp $conffile $conffile.gforge-old
-			mv $conffile.gforge-new $conffile
-		fi
-	done
-	$0 configure
-	;;
-
-    cleanup)
-    	$0 purge-files
-	for conffile in $APACHE_ETC_LIST $PHP_ETC_LIST
-	do
-		if [ -f $conffile.gforge-new ] 
-		then
-			cp $conffile $conffile.gforge-old
-			mv $conffile.gforge-new $conffile
-		fi
-	done
-	$0 purge
-	;;
-
-    *)
-	echo "Usage: $0 {configure|configure-files|purge|purge-files|setup|cleanup}"
-	exit 1
-	;;
-	
-esac

commit 4a66caab2c217eb492087312ea2e96c94c6ef3c2
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Tue Aug 12 11:40:02 2014 +0200

    project_default_page.html: unused (cf. templates/default_page.php)

diff --git a/src/etc/custom/project_default_page.html b/src/etc/custom/project_default_page.html
deleted file mode 100644
index 0cdc7c6..0000000
--- a/src/etc/custom/project_default_page.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<html>
-  <head>
-    <title>PROJECTNAME</title>
-    <meta http-equiv='refresh' content='1; url=PROJECTURL'> 
-  </head>
-  
-  <body>
-    
-    If your browser does not support automatic re-direct, please click
-    <a href="PROJECTURL">here</a>.
-    
-  </body>
-  
-</html>

commit 4e06af47c16c7a84d8a07e85be09e021df9f7191
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Tue Aug 12 11:39:15 2014 +0200

    install: config.ini is now generated, remove old templates

diff --git a/src/etc/config.ini-fhs b/src/etc/config.ini-fhs
deleted file mode 100644
index 7bc3b45..0000000
--- a/src/etc/config.ini-fhs
+++ /dev/null
@@ -1,20 +0,0 @@
-;
-; This is the main file that defines configuration of FusionForge (since 5.1)
-;
-; See the documentation in the wiki for more details :
-; https://fusionforge.org/plugins/mediawiki/wiki/fusionforge/index.php/Configuration#Configuration_files
-;
-
-[core]
-forge_name = FusionForge
-
-source_path = /usr/share/gforge
-binary_path = /usr/share/gforge/bin
-plugins_path = /usr/share/gforge/plugins
-data_path = /var/lib/gforge
-config_path = /etc/gforge
-log_path = /var/log/gforge
-
-
-; look at files in /etc/gforge/config.ini.d/ for more options
-extra_config_dirs = "$core/config_path/config.ini.d"
diff --git a/src/etc/config.ini-fhsrh b/src/etc/config.ini-fhsrh
deleted file mode 100644
index c47495a..0000000
--- a/src/etc/config.ini-fhsrh
+++ /dev/null
@@ -1,20 +0,0 @@
-;
-; This is the main file that defines configuration of FusionForge (since 5.1)
-;
-; See the documentation in the wiki for more details :
-; https://fusionforge.org/plugins/mediawiki/wiki/fusionforge/index.php/Configuration#Configuration_files
-;
-
-[core]
-forge_name = FusionForge
-
-source_path = /usr/share/gforge/src
-binary_path = /usr/share/gforge/bin
-plugins_path = /usr/share/gforge/src/plugins
-data_path = /var/lib/gforge
-config_path = /etc/gforge
-log_path = /var/log/gforge
-
-
-; look at files in /etc/gforge/config.ini.d/ for more options
-extra_config_dirs = "$core/config_path/config.ini.d"
diff --git a/src/etc/config.ini-opt b/src/etc/config.ini-opt
deleted file mode 100644
index 97605da..0000000
--- a/src/etc/config.ini-opt
+++ /dev/null
@@ -1,11 +0,0 @@
-[core]
-forge_name = FusionForge
-
-source_path = /opt/gforge
-binary_path = /opt/gforge/utils
-plugins_path = /opt/gforge/plugins
-data_path = /var/lib/gforge
-config_path = /etc/gforge
-log_path = /var/log/gforge
-
-extra_config_dirs = "$core/config_path/config.ini.d"
diff --git a/src/etc/config.ini-usrlocal b/src/etc/config.ini-usrlocal
deleted file mode 100644
index a0f8ee1..0000000
--- a/src/etc/config.ini-usrlocal
+++ /dev/null
@@ -1,11 +0,0 @@
-[core]
-forge_name = FusionForge
-
-source_path = /usr/local/share/gforge
-binary_path = /usr/local/share/gforge/src/utils
-plugins_path = /usr/local/share/gforge/plugins
-data_path = /var/local/lib/gforge
-config_path = /etc/gforge
-log_path = /var/log/gforge
-
-extra_config_dirs = "$core/config_path/config.ini.d"

commit 449c88df828e5774a19f8cbc6391ea5bdc7822c8
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Tue Aug 12 11:10:11 2014 +0200

    install: enable and upgrade only installed plugins

diff --git a/src/GNUmakefile b/src/GNUmakefile
index 0840440..6ed6d1d 100644
--- a/src/GNUmakefile
+++ b/src/GNUmakefile
@@ -56,7 +56,7 @@ install-core: install-base-dirs install-config
 	ln -nfs $(pkgdatadir)/bin/forge_run_jon $(DESTDIR)$(prefix)/bin/forge_run_job
 	ln -nfs $(pkgdatadir)/bin/forge_run_plugin_job $(DESTDIR)$(prefix)/bin/forge_run_plugin_job
 
-PLUGINS:=$(shell bin/list-enabled-plugins.sh)
+PLUGINS:=$(shell utils/list-valid-plugins.sh)
 PLUGINS_INSTALL_TARGETS=$(addprefix install-plugin-,$(PLUGINS))
 install-plugins: $(PLUGINS_INSTALL_TARGETS)
 
@@ -89,11 +89,10 @@ post-install: post-install-core post-install-plugins
 post-install-core:
 	$(pkgdatadir)/post-install.d/core.sh
 
-PLUGINS_POST_INSTALL_TARGETS=$(addprefix post-install-plugin-,$(PLUGINS))
-# TODO: some plugins require others to be installed first
-# e.g. admssw <- doaprdf
+PLUGINS_INSTALLED:=$(ls $(data_path)/plugins)
+PLUGINS_POST_INSTALL_TARGETS=$(addprefix post-install-plugin-,$(PLUGINS_INSTALLED))
 post-install-plugins: $(PLUGINS_POST_INSTALL_TARGETS)
-post-install-plugin-%:
+post-install-plugin-%: $(data_path)/plugins/%/
 	$(pkgdatadir)/post-install.d/plugin.sh $*
 
 clean:
diff --git a/src/post-install.d/plugin.sh b/src/post-install.d/plugin.sh
index ca6afdf..7906d9f 100755
--- a/src/post-install.d/plugin.sh
+++ b/src/post-install.d/plugin.sh
@@ -10,6 +10,7 @@ if [ -z "$1" ]; then
 fi
 
 # Run plugin-specific DB install/upgrade
+# TODO: don't automatically enable the plugin, esp. for non-packaged installs
 $source_path/bin/upgrade-db.php $1
 
 # Restart apache if there is some change in config
diff --git a/src/bin/list-enabled-plugins.sh b/src/utils/list-valid-plugins.sh
similarity index 100%
rename from src/bin/list-enabled-plugins.sh
rename to src/utils/list-valid-plugins.sh

-----------------------------------------------------------------------

Summary of changes:
 src/GNUmakefile                                    |   19 +-
 src/bin/install-apache.sh                          |  269 --------------------
 src/bin/manage-apache-config.sh                    |  119 ---------
 src/cronjobs/create_vhosts.php                     |    2 +-
 src/etc/README                                     |    7 +-
 src/etc/README.httpd-conf-d-flavours               |   16 --
 src/{templates => etc}/config.ini                  |    0
 src/etc/config.ini-fhs                             |   20 --
 src/etc/config.ini-fhsrh                           |   20 --
 src/etc/config.ini-opt                             |   11 -
 src/etc/config.ini-usrlocal                        |   11 -
 src/etc/custom/project_default_page.html           |   14 -
 src/etc/httpd.conf-fhs                             |    5 -
 src/etc/httpd.conf-fhsrh                           |    5 -
 src/etc/httpd.conf-usrlocal                        |    2 -
 src/etc/httpd.conf.d/40-vhosts-extra.conf          |    2 -
 src/post-install.d/core.sh                         |    2 +-
 src/post-install.d/httpd-configure.sh              |   27 ++
 src/post-install.d/httpd-expand-conf.php           |   41 +++
 src/post-install.d/plugin.sh                       |    1 +
 src/{etc/httpd.conf-opt => templates/httpd.conf}   |    2 +-
 .../httpd.conf.d/01-namevhost.conf                 |    0
 .../httpd.conf.d/02-config-main.conf               |    2 +-
 .../httpd.conf.d/03-config-alias-plugin.conf       |    0
 .../httpd.conf.d/04-config-vendor.conf             |    0
 .../httpd.conf.d/10-vhosts-main.conf               |    0
 .../httpd.conf.d/20-vhosts-lists.conf              |    0
 .../httpd.conf.d/30-vhosts-projects.conf           |    0
 src/templates/httpd.conf.d/40-vhosts-extra.conf    |    2 +
 .../httpd.conf.d/50-vhosts-scm.conf                |    0
 .../httpd.conf.d/50-wsgi-moinmoin.conf             |    0
 .../httpd.conf.d/50-wsgi-scmbzr.conf               |    0
 src/{etc => templates}/httpd.conf.d/auth-main.inc  |    0
 .../httpd.conf.d/auth-projects.inc                 |    0
 .../httpd.conf.d/block-trace.inc                   |    0
 src/templates/httpd.conf.d/httpd.vhosts            |    1 +
 .../httpd.conf.d/lists-vhost-plugin-mailman.inc    |    0
 src/{etc => templates}/httpd.conf.d/log.inc        |    0
 .../httpd.conf.d/plugin-authhttpd.inc              |    0
 .../httpd.conf.d/plugin-generic.inc                |    0
 .../httpd.conf.d/plugin-mediawiki.inc              |    0
 .../httpd.conf.d/plugin-moinmoin.inc               |    0
 .../httpd.conf.d/plugin-phpcaptcha.inc             |    0
 .../httpd.conf.d/plugin-scmbzr.inc                 |    0
 .../httpd.conf.d/plugin-scmdarcs.inc               |    0
 .../httpd.conf.d/plugin-scmgit.inc                 |    0
 .../httpd.conf.d/plugin-scmsvn.inc                 |    0
 .../httpd.conf.d/plugin-sysauthldap-secrets.inc    |    0
 .../httpd.conf.d/projects-in-mainvhost.inc         |    0
 src/{etc => templates}/httpd.conf.d/secrets.inc    |    0
 src/{etc => templates}/httpd.conf.d/ssl-off.inc    |    0
 src/{etc => templates}/httpd.conf.d/ssl-on.inc     |    0
 .../httpd.conf.d/ssl-really-on.inc                 |    0
 src/{etc => templates}/httpd.conf.d/vhost-list.inc |    0
 src/{etc => templates}/httpd.conf.d/vhost-main.inc |    0
 .../httpd.conf.d/vhost-projects.inc                |    0
 src/{etc => templates}/httpd.conf.d/vhost-scm.inc  |    0
 .../httpd.vhosts => templates/httpd.vhosts.tmpl}   |    0
 src/templates/post-install.ini                     |    4 +
 .../list-valid-plugins.sh}                         |    0
 60 files changed, 94 insertions(+), 510 deletions(-)
 delete mode 100755 src/bin/install-apache.sh
 delete mode 100755 src/bin/manage-apache-config.sh
 delete mode 100644 src/etc/README.httpd-conf-d-flavours
 rename src/{templates => etc}/config.ini (100%)
 delete mode 100644 src/etc/config.ini-fhs
 delete mode 100644 src/etc/config.ini-fhsrh
 delete mode 100644 src/etc/config.ini-opt
 delete mode 100644 src/etc/config.ini-usrlocal
 delete mode 100644 src/etc/custom/project_default_page.html
 delete mode 100644 src/etc/httpd.conf-fhs
 delete mode 100644 src/etc/httpd.conf-fhsrh
 delete mode 100644 src/etc/httpd.conf-usrlocal
 delete mode 100644 src/etc/httpd.conf.d/40-vhosts-extra.conf
 create mode 100755 src/post-install.d/httpd-configure.sh
 create mode 100755 src/post-install.d/httpd-expand-conf.php
 rename src/{etc/httpd.conf-opt => templates/httpd.conf} (53%)
 rename src/{etc => templates}/httpd.conf.d/01-namevhost.conf (100%)
 rename src/{etc => templates}/httpd.conf.d/02-config-main.conf (76%)
 rename src/{etc => templates}/httpd.conf.d/03-config-alias-plugin.conf (100%)
 rename src/{etc => templates}/httpd.conf.d/04-config-vendor.conf (100%)
 rename src/{etc => templates}/httpd.conf.d/10-vhosts-main.conf (100%)
 rename src/{etc => templates}/httpd.conf.d/20-vhosts-lists.conf (100%)
 rename src/{etc => templates}/httpd.conf.d/30-vhosts-projects.conf (100%)
 create mode 100644 src/templates/httpd.conf.d/40-vhosts-extra.conf
 rename src/{etc => templates}/httpd.conf.d/50-vhosts-scm.conf (100%)
 rename src/{etc => templates}/httpd.conf.d/50-wsgi-moinmoin.conf (100%)
 rename src/{etc => templates}/httpd.conf.d/50-wsgi-scmbzr.conf (100%)
 rename src/{etc => templates}/httpd.conf.d/auth-main.inc (100%)
 rename src/{etc => templates}/httpd.conf.d/auth-projects.inc (100%)
 rename src/{etc => templates}/httpd.conf.d/block-trace.inc (100%)
 create mode 100644 src/templates/httpd.conf.d/httpd.vhosts
 rename src/{etc => templates}/httpd.conf.d/lists-vhost-plugin-mailman.inc (100%)
 rename src/{etc => templates}/httpd.conf.d/log.inc (100%)
 rename src/{etc => templates}/httpd.conf.d/plugin-authhttpd.inc (100%)
 rename src/{etc => templates}/httpd.conf.d/plugin-generic.inc (100%)
 rename src/{etc => templates}/httpd.conf.d/plugin-mediawiki.inc (100%)
 rename src/{etc => templates}/httpd.conf.d/plugin-moinmoin.inc (100%)
 rename src/{etc => templates}/httpd.conf.d/plugin-phpcaptcha.inc (100%)
 rename src/{etc => templates}/httpd.conf.d/plugin-scmbzr.inc (100%)
 rename src/{etc => templates}/httpd.conf.d/plugin-scmdarcs.inc (100%)
 rename src/{etc => templates}/httpd.conf.d/plugin-scmgit.inc (100%)
 rename src/{etc => templates}/httpd.conf.d/plugin-scmsvn.inc (100%)
 rename src/{etc => templates}/httpd.conf.d/plugin-sysauthldap-secrets.inc (100%)
 rename src/{etc => templates}/httpd.conf.d/projects-in-mainvhost.inc (100%)
 rename src/{etc => templates}/httpd.conf.d/secrets.inc (100%)
 rename src/{etc => templates}/httpd.conf.d/ssl-off.inc (100%)
 rename src/{etc => templates}/httpd.conf.d/ssl-on.inc (100%)
 rename src/{etc => templates}/httpd.conf.d/ssl-really-on.inc (100%)
 rename src/{etc => templates}/httpd.conf.d/vhost-list.inc (100%)
 rename src/{etc => templates}/httpd.conf.d/vhost-main.inc (100%)
 rename src/{etc => templates}/httpd.conf.d/vhost-projects.inc (100%)
 rename src/{etc => templates}/httpd.conf.d/vhost-scm.inc (100%)
 rename src/{etc/templates/httpd.vhosts => templates/httpd.vhosts.tmpl} (100%)
 create mode 100644 src/templates/post-install.ini
 rename src/{bin/list-enabled-plugins.sh => utils/list-valid-plugins.sh} (100%)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list