pf-tools/pf-tools: Adding files for test

parmelan-guest at users.alioth.debian.org parmelan-guest at users.alioth.debian.org
Fri Jul 19 12:19:41 UTC 2013


details:   http://hg.debian.org/hg/pf-tools/pf-tools/rev/e417224c1d61
changeset: 1193:e417224c1d61
user:      Richard Phan
date:      Fri Jul 19 14:05:58 2013 +0200
description:
Adding files for test

diffstat:

 t/13.conf.cfg1/config-export/SITE/cbv4-pfds/CONFIG/update-cbv4-spawn   |   4 +-
 t/13.conf.cfg1/config-export/spawn/etc/apache2/ports.conf              |  23 ++++++++++
 t/13.conf.cfg1/config-export/spawn/etc/apache2/sites-available/default |  14 ++++++
 3 files changed, 39 insertions(+), 2 deletions(-)

diffs (66 lines):

diff -r 73b117bcb2ca -r e417224c1d61 t/13.conf.cfg1/config-export/SITE/cbv4-pfds/CONFIG/update-cbv4-spawn
--- a/t/13.conf.cfg1/config-export/SITE/cbv4-pfds/CONFIG/update-cbv4-spawn	Thu Jul 18 11:17:23 2013 +0200
+++ b/t/13.conf.cfg1/config-export/SITE/cbv4-pfds/CONFIG/update-cbv4-spawn	Fri Jul 19 14:05:58 2013 +0200
@@ -29,7 +29,7 @@
 [/etc/apache2/ports.conf]
         action          = addfile
         source          = CONFIG:spawn%SECTIONNAME%
-        filter          = filter_privateresolve %SOURCE% %HOSTNAME% %DESTINATION%
+        filter          = filter_privateresolve -i %SOURCE% -h %HOSTNAME% -o %DESTINATION%
         mode            = 0644
         owner           = root
         group           = root
@@ -40,7 +40,7 @@
         depends         = /etc/apache2/ports.conf
         action          = addfile
         source          = CONFIG:spawn%SECTIONNAME%
-        filter          = filter_privateresolve %SOURCE% %HOSTNAME% %DESTINATION%
+        filter          = filter_privateresolve -i %SOURCE% -h %HOSTNAME% -o %DESTINATION%
         mode            = 0644
         owner           = root
         group           = root
diff -r 73b117bcb2ca -r e417224c1d61 t/13.conf.cfg1/config-export/spawn/etc/apache2/ports.conf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/t/13.conf.cfg1/config-export/spawn/etc/apache2/ports.conf	Fri Jul 19 14:05:58 2013 +0200
@@ -0,0 +1,23 @@
+# If you just change the port or add more ports here, you will likely also
+# have to change the VirtualHost statement in
+# /etc/apache2/sites-enabled/000-default
+# This is also true if you have upgraded from before 2.2.9-3 (i.e. from
+# Debian etch). See /usr/share/doc/apache2.2-common/NEWS.Debian.gz and
+# README.Debian.gz
+
+NameVirtualHost *:80
+Listen 80
+
+<IfModule mod_ssl.c>
+    # If you add NameVirtualHost *:443 here, you will also have to change
+    # the VirtualHost statement in /etc/apache2/sites-available/default-ssl
+    # to <VirtualHost *:443>
+    # Server Name Indication for SSL named virtual hosts is currently not
+    # supported by MSIE on Windows XP.
+    Listen 443
+</IfModule>
+
+<IfModule mod_gnutls.c>
+    Listen 443
+</IfModule>
+
diff -r 73b117bcb2ca -r e417224c1d61 t/13.conf.cfg1/config-export/spawn/etc/apache2/sites-available/default
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/t/13.conf.cfg1/config-export/spawn/etc/apache2/sites-available/default	Fri Jul 19 14:05:58 2013 +0200
@@ -0,0 +1,14 @@
+<VirtualHost *:80>
+	ServerAdmin webmaster at localhost
+
+	ErrorLog ${APACHE_LOG_DIR}/error.log
+
+	# Possible values include: debug, info, notice, warn, error, crit,
+	# alert, emerg.
+	LogLevel warn
+
+	CustomLog ${APACHE_LOG_DIR}/access.log combined
+
+	WSGIScriptAliasMatch ^(.*)$ /var/www/vhosts/hg/cgi-bin/hgwebdir.wsgi/$1
+
+</VirtualHost>



More information about the pf-tools-commits mailing list