[Webapps-common-discuss] [commit] r112 - in webapps-common/trunk: debian dpkg templates

[seanius at alioth.debian.org]

Author: seanius
Date: 2007-06-19 13:42:00 +0000 (Tue, 19 Jun 2007)
New Revision: 112

Modified:
   webapps-common/trunk/debian/changelog
   webapps-common/trunk/debian/webapps-common.dirs
   webapps-common/trunk/dpkg/common
   webapps-common/trunk/templates/apache-virtualhost.conf
   webapps-common/trunk/templates/apache2-wc-master.conf
Log:
merge in a few changes

Modified: webapps-common/trunk/debian/changelog
===================================================================
--- webapps-common/trunk/debian/changelog	2007-05-14 00:00:35 UTC (rev 111)
+++ webapps-common/trunk/debian/changelog	2007-06-19 13:42:00 UTC (rev 112)
@@ -2,9 +2,12 @@
 
   [sean finney]
   * the "oh yeah, *that* project" release.
+  * fix for some required directories not previously being created.
   * take a first shot at the final obstacle for experimental, dbconfig-common
     support on a per-instance basis.  requires a versioned dependency on
     dbconfig-common.  still a little rough around the edges...
+  * updates to the templated virtualhost configuration, including a fix
+    from Jan-Pascal van Best.
 
  -- sean finney <seanius at debian.org>  Mon, 14 May 2007 01:21:56 +0200
 

Modified: webapps-common/trunk/debian/webapps-common.dirs
===================================================================
--- webapps-common/trunk/debian/webapps-common.dirs	2007-05-14 00:00:35 UTC (rev 111)
+++ webapps-common/trunk/debian/webapps-common.dirs	2007-06-19 13:42:00 UTC (rev 112)
@@ -1,13 +1,13 @@
 usr/share/webapps-common/internal
 usr/share/webapps-common/install
-etc/webapps-common/apps-available/apache
-etc/webapps-common/apps-available/apache2
-etc/webapps-common/apps-available/apache-ssl
-etc/webapps-common/apps-available/apache-perl
-etc/webapps-common/apps-enabled/apache
-etc/webapps-common/apps-enabled/apache2
-etc/webapps-common/apps-enabled/apache-ssl
-etc/webapps-common/apps-enabled/apache-perl
+etc/webapps-common/apps-available/apache/=global=
+etc/webapps-common/apps-available/apache2/=global=
+etc/webapps-common/apps-available/apache-ssl/=global=
+etc/webapps-common/apps-available/apache-perl/=global=
+etc/webapps-common/apps-enabled/apache/=global=
+etc/webapps-common/apps-enabled/apache2/=global=
+etc/webapps-common/apps-enabled/apache-ssl/=global=
+etc/webapps-common/apps-enabled/apache-perl/=global=
 etc/apache2/conf.d
 etc/apache/conf.d
 etc/apache-ssl/conf.d

Modified: webapps-common/trunk/dpkg/common
===================================================================
--- webapps-common/trunk/dpkg/common	2007-05-14 00:00:35 UTC (rev 111)
+++ webapps-common/trunk/dpkg/common	2007-06-19 13:42:00 UTC (rev 112)
@@ -433,6 +433,25 @@
 }
 
 ###
+###	map an instance name to a filename
+##
+##	usage: _wc_instance_to_filename instance basedir extension
+###
+_wc_instance_to_filename(){
+	local instance base ext site dir
+	instance=$1
+	base=$2
+	ext=$3
+	if [ "$ext" ]; then
+		ext=".$ext"
+	fi
+	site=`echo $instance | cut -d/ -f1`
+	dir=`echo $instance | cut -sd/ -f2- | sed -e 's,/,%2f,g'`
+	echo "$base/${wc_package}_${site}_${dir}${ext}"
+}
+
+
+###
 ###	output the name of a configuration file for a particular instance
 ##
 ##	usage: _wc_instance_cfg_file instance httpd

Modified: webapps-common/trunk/templates/apache-virtualhost.conf
===================================================================
--- webapps-common/trunk/templates/apache-virtualhost.conf	2007-05-14 00:00:35 UTC (rev 111)
+++ webapps-common/trunk/templates/apache-virtualhost.conf	2007-06-19 13:42:00 UTC (rev 112)
@@ -1,3 +1,5 @@
+NameVirtualHost _WC_VHOST_
 <VirtualHost _WC_VHOST_>
+	ServerName _WC_VHOST_
 	Include /etc/webapps-common/apps-enabled/_WC_HTTPD_/_WC_VHOST_/*.conf
 </VirtualHost>

Modified: webapps-common/trunk/templates/apache2-wc-master.conf
===================================================================
--- webapps-common/trunk/templates/apache2-wc-master.conf	2007-05-14 00:00:35 UTC (rev 111)
+++ webapps-common/trunk/templates/apache2-wc-master.conf	2007-06-19 13:42:00 UTC (rev 112)
@@ -2,5 +2,4 @@
 # this file is responsible for instructing HTTPD to load all
 # application configuration files for packages configured via
 # webapps-common.
-NameVirtualHost *
 Include /etc/webapps-common/apps-enabled/HTTPD/=global=/*.conf