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

[holger at alioth.debian.org]

Author: holger
Date: 2008-01-20 19:35:28 +0000 (Sun, 20 Jan 2008)
New Revision: 235

Added:
   trunk/fai-config-dir/doc/services-howto-admin.txt
   trunk/fai-config-dir/files/etc/logrotate.d/
   trunk/fai-config-dir/files/etc/logrotate.d/apache2/
   trunk/fai-config-dir/files/etc/logrotate.d/apache2/WEBSERVER
   trunk/fai-config-dir/scripts/WEBSERVER/20-apache
   trunk/fai-config-dir/scripts/WEBSERVER/30-logrotate
Removed:
   trunk/fai-config-dir/scripts/WEBSERVER/30-apache
Modified:
   trunk/fai-config-dir/files/etc/apache2/sites-available/debian-community.org/WEBSERVER
Log:
- get ACLs right, awstats is only accessable via ssh tunnels for now
- run awstats before rotating the apache log
- add a .txt file to briefly document service administration - should go in the wiki instead?! now that I think of it... :)


Added: trunk/fai-config-dir/doc/services-howto-admin.txt
===================================================================
--- trunk/fai-config-dir/doc/services-howto-admin.txt	                        (rev 0)
+++ trunk/fai-config-dir/doc/services-howto-admin.txt	2008-01-20 19:35:28 UTC (rev 235)
@@ -0,0 +1,23 @@
+ikiwiki
+-------
+
+ikiwiki is administrated with config files via fai.
+
+
+email
+-----
+
+to be written
+
+
+jabber
+------
+
+to be written
+
+
+awstats
+-------
+
+ssh -L 16666:bikeshed:80 bikeshed.debian-community.org 
+point your browser to http://localhost:16666/cgi-bin/awstats.pl

Modified: 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	2008-01-20 19:02:24 UTC (rev 234)
+++ trunk/fai-config-dir/files/etc/apache2/sites-available/debian-community.org/WEBSERVER	2008-01-20 19:35:28 UTC (rev 235)
@@ -44,11 +44,16 @@
 	ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
 	ScriptAlias /awstats/ /usr/lib/cgi-bin/
 	Options ExecCGI -MultiViews +SymLinksIfOwnerMatch
+        Options ExecCGI -MultiViews +SymLinksIfOwnerMatch
+	<Location /cgi-bin/awstats.pl>
+	Order allow,deny
+	allow from 127.0.0.1
+	allow from 157.193.39.172
+	</Location>
 	<Location /awstats/>
 	Order allow,deny
 	allow from 127.0.0.1
 	allow from 157.193.39.172
 	</Location>
 
-
 </VirtualHost>

Added: trunk/fai-config-dir/files/etc/logrotate.d/apache2/WEBSERVER
===================================================================
--- trunk/fai-config-dir/files/etc/logrotate.d/apache2/WEBSERVER	                        (rev 0)
+++ trunk/fai-config-dir/files/etc/logrotate.d/apache2/WEBSERVER	2008-01-20 19:35:28 UTC (rev 235)
@@ -0,0 +1,18 @@
+/var/log/apache2/*.log {
+	weekly
+	missingok
+	rotate 52
+	compress
+	delaycompress
+	notifempty
+	create 640 root adm
+	sharedscripts
+	prerotate
+		/usr/lib/cgi-bin/awstats.pl -config=debian-community.org -update
+	endscript
+	postrotate
+		if [ -f /var/run/apache2.pid ]; then
+			/etc/init.d/apache2 restart > /dev/null
+		fi
+	endscript
+}

Copied: trunk/fai-config-dir/scripts/WEBSERVER/20-apache (from rev 227, trunk/fai-config-dir/scripts/WEBSERVER/30-apache)
===================================================================
--- trunk/fai-config-dir/scripts/WEBSERVER/20-apache	                        (rev 0)
+++ trunk/fai-config-dir/scripts/WEBSERVER/20-apache	2008-01-20 19:35:28 UTC (rev 235)
@@ -0,0 +1,19 @@
+#! /bin/sh
+
+#
+#        (c) 2007 Holger Levsen         holger at layer-acht.org
+#        GPL2 licenced
+#
+
+fcopy -r -M /etc/apache2/
+echo "# 0 = start on boot; 1 = don't start on boot
+NO_START=0
+" > $target/etc/default/apache2
+[ -f $target/etc/apache2/httpd.conf ] || touch $target/etc/apache2/httpd.conf
+
+$ROOTCMD ln -sf /etc/apache2/sites-available/debian-community.org $target/etc/apache2/sites-enabled/010-debian-community.org
+
+# extra apache mods
+$ROOTCMD ln -sf /etc/apache2/mods-available/rewrite.load $target/etc/apache2/mods-enabled/rewrite.load
+
+$ROOTCMD /etc/init.d/apache2 restart

Deleted: trunk/fai-config-dir/scripts/WEBSERVER/30-apache
===================================================================
--- trunk/fai-config-dir/scripts/WEBSERVER/30-apache	2008-01-20 19:02:24 UTC (rev 234)
+++ trunk/fai-config-dir/scripts/WEBSERVER/30-apache	2008-01-20 19:35:28 UTC (rev 235)
@@ -1,19 +0,0 @@
-#! /bin/sh
-
-#
-#        (c) 2007 Holger Levsen         holger at layer-acht.org
-#        GPL2 licenced
-#
-
-fcopy -r -M /etc/apache2/
-echo "# 0 = start on boot; 1 = don't start on boot
-NO_START=0
-" > $target/etc/default/apache2
-[ -f $target/etc/apache2/httpd.conf ] || touch $target/etc/apache2/httpd.conf
-
-$ROOTCMD ln -sf /etc/apache2/sites-available/debian-community.org $target/etc/apache2/sites-enabled/010-debian-community.org
-
-# extra apache mods
-$ROOTCMD ln -sf /etc/apache2/mods-available/rewrite.load $target/etc/apache2/mods-enabled/rewrite.load
-
-$ROOTCMD /etc/init.d/apache2 restart

Added: trunk/fai-config-dir/scripts/WEBSERVER/30-logrotate
===================================================================
--- trunk/fai-config-dir/scripts/WEBSERVER/30-logrotate	                        (rev 0)
+++ trunk/fai-config-dir/scripts/WEBSERVER/30-logrotate	2008-01-20 19:35:28 UTC (rev 235)
@@ -0,0 +1,9 @@
+#! /bin/sh
+
+#
+#        (c) 2008 Holger Levsen         holger at layer-acht.org
+#        GPL2 licenced
+#
+
+fcopy -M /etc/logrotate.d/apache2
+


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