[D-community-commits] r78 - in trunk/fai-config-dir: files/etc/apache2 files/etc/apache2/sites-available files/etc/apache2/sites-available/debian-community.org scripts/WEBSERVER

[Holger Levsen]

Author: h01ger-guest
Date: 2007-03-25 13:05:40 +0000 (Sun, 25 Mar 2007)
New Revision: 78

Added:
   trunk/fai-config-dir/files/etc/apache2/sites-available/
   trunk/fai-config-dir/files/etc/apache2/sites-available/debian-community.org/
   trunk/fai-config-dir/files/etc/apache2/sites-available/debian-community.org/WEBSERVER
   trunk/fai-config-dir/scripts/WEBSERVER/10-ikiwiki
   trunk/fai-config-dir/scripts/WEBSERVER/30-apache
Removed:
   trunk/fai-config-dir/scripts/WEBSERVER/10-apache
Log:
setup vhost bikeshed.debian-community.org

Added: trunk/fai-config-dir/files/etc/apache2/sites-available/debian-community.org/WEBSERVER
===================================================================
--- trunk/fai-config-dir/files/etc/apache2/sites-available/debian-community.org/WEBSERVER	2007-03-25 12:56:11 UTC (rev 77)
+++ trunk/fai-config-dir/files/etc/apache2/sites-available/debian-community.org/WEBSERVER	2007-03-25 13:05:40 UTC (rev 78)
@@ -0,0 +1,34 @@
+NameVirtualHost *
+<VirtualHost bikeshed.debian-community.org>
+	ServerAdmin webmaster at debian-community.org
+	
+	DocumentRoot /srv/www/
+	<Directory />
+		Options FollowSymLinks
+		AllowOverride None
+	</Directory>
+	<Directory /srv/www/>
+		Options Indexes FollowSymLinks MultiViews
+		AllowOverride None
+		Order allow,deny
+		allow from all
+	</Directory>
+
+	ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
+	<Directory "/usr/lib/cgi-bin">
+		AllowOverride None
+		Options ExecCGI -MultiViews +SymLinksIfOwnerMatch
+		Order allow,deny
+		Allow from all
+	</Directory>
+
+	ErrorLog /var/log/apache2/error.log
+
+	# Possible values include: debug, info, notice, warn, error, crit,
+	# alert, emerg.
+	LogLevel warn
+
+	CustomLog /var/log/apache2/access.log combined
+	ServerSignature On
+
+</VirtualHost>

Deleted: trunk/fai-config-dir/scripts/WEBSERVER/10-apache
===================================================================
--- trunk/fai-config-dir/scripts/WEBSERVER/10-apache	2007-03-25 12:56:11 UTC (rev 77)
+++ trunk/fai-config-dir/scripts/WEBSERVER/10-apache	2007-03-25 13:05:40 UTC (rev 78)
@@ -1,9 +0,0 @@
-#! /bin/sh
-
-#
-#        (c) 2007 Holger Levsen         holger at layer-acht.org
-#        GPL2 licenced
-#
-
-fcopy -r -M /etc/apache2/
-$ROOTCMD /etc/init.d/apache2 restart

Added: trunk/fai-config-dir/scripts/WEBSERVER/10-ikiwiki
===================================================================
--- trunk/fai-config-dir/scripts/WEBSERVER/10-ikiwiki	2007-03-25 12:56:11 UTC (rev 77)
+++ trunk/fai-config-dir/scripts/WEBSERVER/10-ikiwiki	2007-03-25 13:05:40 UTC (rev 78)
@@ -0,0 +1,8 @@
+#! /bin/sh
+
+#
+#        (c) 2007 Holger Levsen         holger at layer-acht.org
+#        GPL2 licenced
+#
+
+mkdir -p $target/srv/www


Property changes on: trunk/fai-config-dir/scripts/WEBSERVER/10-ikiwiki
___________________________________________________________________
Name: svn:executable
   + *

Copied: trunk/fai-config-dir/scripts/WEBSERVER/30-apache (from rev 73, trunk/fai-config-dir/scripts/WEBSERVER/10-apache)
===================================================================
--- trunk/fai-config-dir/scripts/WEBSERVER/10-apache	2007-03-24 17:08:57 UTC (rev 73)
+++ trunk/fai-config-dir/scripts/WEBSERVER/30-apache	2007-03-25 13:05:40 UTC (rev 78)
@@ -0,0 +1,12 @@
+#! /bin/sh
+
+#
+#        (c) 2007 Holger Levsen         holger at layer-acht.org
+#        GPL2 licenced
+#
+
+fcopy -r -M /etc/apache2/
+
+$ROOTCMD ln -sf /etc/apache2/sites-available/debian-community.org $target/etc/apache2/sites-enabled/010-debian-community.org
+
+$ROOTCMD /etc/init.d/apache2 restart