[Fusionforge-commits] r10063 - in trunk/src: etc etc/httpd.conf.d-fhs etc/httpd.conf.d-opt etc/httpd.conf.d-usrlocal utils

Roland Mas lolando at libremir.placard.fr.eu.org
Thu Jun 17 12:01:28 CEST 2010


Author: lolando
Date: 2010-06-17 12:01:27 +0200 (Thu, 17 Jun 2010)
New Revision: 10063

Added:
   trunk/src/etc/httpd.conf.d-fhs/plugin-scmsvn.inc
   trunk/src/etc/httpd.conf.d-opt/plugin-scmsvn.inc
   trunk/src/etc/httpd.conf.d-usrlocal/plugin-scmsvn.inc
Modified:
   trunk/src/etc/config.ini-opt
   trunk/src/etc/httpd.conf.d-opt/log.inc
   trunk/src/etc/httpd.conf.d-opt/plugin-generic.inc
   trunk/src/etc/httpd.conf.d-opt/plugin-mediawiki.inc
   trunk/src/utils/manage-apache-config.sh
Log:
The -opt installation scheme really isn't that different from the others

Modified: trunk/src/etc/config.ini-opt
===================================================================
--- trunk/src/etc/config.ini-opt	2010-06-17 09:50:32 UTC (rev 10062)
+++ trunk/src/etc/config.ini-opt	2010-06-17 10:01:27 UTC (rev 10063)
@@ -3,9 +3,9 @@
 user_registration_restricted = false
 
 source_path = /opt/fusionforge
-data_path = /opt/fusionforge/data
+data_path = /var/lib/gforge
 config_path = /etc/gforge
-log_path = /opt/fusionforge/log
+log_path = /var/log/gforge
 chroot = "$core/data_path/chroot"
 
 homedir_prefix = "$core/chroot/home/users"

Added: trunk/src/etc/httpd.conf.d-fhs/plugin-scmsvn.inc
===================================================================
--- trunk/src/etc/httpd.conf.d-fhs/plugin-scmsvn.inc	                        (rev 0)
+++ trunk/src/etc/httpd.conf.d-fhs/plugin-scmsvn.inc	2010-06-17 10:01:27 UTC (rev 10063)
@@ -0,0 +1,14 @@
+<Location /svn>
+  DAV svn
+  SVNParentPath /var/lib/gforge/chroot/scmrepos/svn
+  
+  # how to authenticate a user
+  AuthzSVNAccessFile /var/lib/gforge/svnroot-access
+  AuthType Basic
+  AuthName "Document repository"
+  AuthUserFile /var/lib/gforge/svnroot-authfile
+  SVNIndexXSLT "/svnindex.xsl"
+  
+  # only authenticated users may access the repository
+  Require valid-user
+</Location>

Modified: trunk/src/etc/httpd.conf.d-opt/log.inc
===================================================================
--- trunk/src/etc/httpd.conf.d-opt/log.inc	2010-06-17 09:50:32 UTC (rev 10062)
+++ trunk/src/etc/httpd.conf.d-opt/log.inc	2010-06-17 10:01:27 UTC (rev 10063)
@@ -1,6 +1,6 @@
 # Custom logging
 
 LogFormat "%h %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" fusionforge
-CustomLog /opt/fusionforge/log/access.log fusionforge
+CustomLog /var/log/gforge/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 /opt/fusionforge/log/awstats.log combinedvhssl
+CustomLog /var/log/gforge/awstats.log combinedvhssl

Modified: trunk/src/etc/httpd.conf.d-opt/plugin-generic.inc
===================================================================
--- trunk/src/etc/httpd.conf.d-opt/plugin-generic.inc	2010-06-17 09:50:32 UTC (rev 10062)
+++ trunk/src/etc/httpd.conf.d-opt/plugin-generic.inc	2010-06-17 10:01:27 UTC (rev 10063)
@@ -1,10 +1,10 @@
 ScriptAliasMatch ^/plugins/([^/]*)/cgi-bin/(.*) /opt/fusionforge/plugins/$1/cgi-bin/$2
 
-Alias /anonscm/ /opt/fusionforge/data/chroot/scmrepos/
+Alias /anonscm/ /var/lib/gforge/chroot/scmrepos/
 
-<DirectoryMatch /opt/fusionforge/data/chroot/scmrepos/[^/]*>
+<DirectoryMatch /var/lib/gforge/chroot/scmrepos/[^/]*>
   Options -Indexes
 </DirectoryMatch>
-<DirectoryMatch /opt/fusionforge/data/chroot/scmrepos/[^/]*/.*>
+<DirectoryMatch /var/lib/gforge/chroot/scmrepos/[^/]*/.*>
   Options +Indexes
 </DirectoryMatch>

Modified: trunk/src/etc/httpd.conf.d-opt/plugin-mediawiki.inc
===================================================================
--- trunk/src/etc/httpd.conf.d-opt/plugin-mediawiki.inc	2010-06-17 09:50:32 UTC (rev 10062)
+++ trunk/src/etc/httpd.conf.d-opt/plugin-mediawiki.inc	2010-06-17 10:01:27 UTC (rev 10063)
@@ -1,4 +1,4 @@
 RedirectMatch 301 ^(/plugins/mediawiki/wiki/[-a-zA-Z0-9_]*)/*$ $1/index.php
 AliasMatch ^/plugins/mediawiki/wiki/[-a-zA-Z0-9_]*/index.php /opt/fusionforge/www/plugins/mediawiki/index.php
-AliasMatch ^/plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/images/(.*) /opt/fusionforge/data/plugins/mediawiki/wikidata/$1/images/$2
+AliasMatch ^/plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/images/(.*) /var/lib/gforge/plugins/mediawiki/wikidata/$1/images/$2
 AliasMatch ^/plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/skins/(.*) /usr/share/mediawikiskins/$2

Added: trunk/src/etc/httpd.conf.d-opt/plugin-scmsvn.inc
===================================================================
--- trunk/src/etc/httpd.conf.d-opt/plugin-scmsvn.inc	                        (rev 0)
+++ trunk/src/etc/httpd.conf.d-opt/plugin-scmsvn.inc	2010-06-17 10:01:27 UTC (rev 10063)
@@ -0,0 +1,14 @@
+<Location /svn>
+  DAV svn
+  SVNParentPath /var/lib/gforge/svnroot
+  
+  # how to authenticate a user
+  AuthzSVNAccessFile /var/lib/gforge/svnroot-access
+  AuthType Basic
+  AuthName "Document repository"
+  AuthUserFile /var/lib/gforge/svnroot-authfile
+  SVNIndexXSLT "/svnindex.xsl"
+  
+  # only authenticated users may access the repository
+  Require valid-user
+</Location>

Added: trunk/src/etc/httpd.conf.d-usrlocal/plugin-scmsvn.inc
===================================================================
--- trunk/src/etc/httpd.conf.d-usrlocal/plugin-scmsvn.inc	                        (rev 0)
+++ trunk/src/etc/httpd.conf.d-usrlocal/plugin-scmsvn.inc	2010-06-17 10:01:27 UTC (rev 10063)
@@ -0,0 +1,14 @@
+<Location /svn>
+  DAV svn
+  SVNParentPath /var/lib/gforge/chroot/scmrepos/svn
+  
+  # how to authenticate a user
+  AuthzSVNAccessFile /var/local/lib/gforge/svnroot-access
+  AuthType Basic
+  AuthName "Document repository"
+  AuthUserFile /var/local/lib/gforge/svnroot-authfile
+  SVNIndexXSLT "/svnindex.xsl"
+  
+  # only authenticated users may access the repository
+  Require valid-user
+</Location>

Modified: trunk/src/utils/manage-apache-config.sh
===================================================================
--- trunk/src/utils/manage-apache-config.sh	2010-06-17 09:50:32 UTC (rev 10062)
+++ trunk/src/utils/manage-apache-config.sh	2010-06-17 10:01:27 UTC (rev 10063)
@@ -2,11 +2,11 @@
 
 case $1 in
     build)
-	if [ -e gforge/etc/httpd.conf.d ] ; then        # We're in the parent dir
-	    cd gforge/etc
-	elif [ -e etc/httpd.conf.d ] ; then             # probably in gforge/ (or a renamed gforge/)
+	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 gforge/etc
+	elif [ -e ../etc/httpd.conf.d ] ; then # possibly in src/etc
 	    cd ../etc
 	else
 	    echo "Couldn't find Apache config directory..."
@@ -32,8 +32,8 @@
 	for i in httpd.conf.d/*.inc httpd.conf.d/*.conf ; do
 	    sed -e 's,{core/config_path},/etc/gforge,g' \
 		-e 's,{core/source_path},/opt/fusionforge,g' \
-		-e 's,{core/data_path},/opt/fusionforge/data,g' \
-		-e 's,{core/log_path},/opt/fusionforge/log,g' \
+		-e 's,{core/data_path},/var/lib/gforge,g' \
+		-e 's,{core/log_path},/var/log/gforge,g' \
 		-e 's,{core/chroot},/opt/fusionforge/data/chroot,g' \
 		-e 's,{core/custom_path},/etc/gforge/custom,g' \
 		-e 's,{core/url_prefix},/,g' \




More information about the Fusionforge-commits mailing list