Current state

diff --git a/.etckeeper b/.etckeeper
index bd83c9a3499fcee86b2e4a221db27bfd7a5f04d0..f0b4e154a0ba3b06c4dc7f2212447e9a1165cbeb 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -95,6 +95,7 @@ maybe chmod 0644 './apache2/vhosts.d/.keep_www-servers_apache-2'
 maybe chmod 0644 './apache2/vhosts.d/00_default_ssl_vhost.conf'
 maybe chmod 0644 './apache2/vhosts.d/00_default_vhost.conf'
 maybe chmod 0644 './apache2/vhosts.d/01_egroupware.conf'
+maybe chmod 0644 './apache2/vhosts.d/02_bilder.conf'
 maybe chmod 0644 './apache2/vhosts.d/default_vhost.include'
 maybe chmod 0755 './at'
 maybe chgrp at './at/at.deny'

diff --git a/apache2/vhosts.d/02_bilder.conf b/apache2/vhosts.d/02_bilder.conf
new file mode 100644 (file)
index 0000000..50f04dc
--- /dev/null
+++ b/apache2/vhosts.d/02_bilder.conf
@@ -0,0 +1,132 @@
+<IfDefine SSL>
+<IfDefine SSL_DEFAULT_VHOST>
+<IfModule ssl_module>
+
+<VirtualHost *:443>
+
+    SSLEngine on
+    SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
+    SSLCertificateFile /etc/apache2/ssl/egroupware-cert.pem
+    SSLCertificateKeyFile /etc/apache2/ssl/egroupware-cert.pem
+    <FilesMatch "\.(cgi|shtml|phtml|php)$">
+            SSLOptions +StdEnvVars
+    </FilesMatch>
+
+    <Directory "/var/www/localhost/cgi-bin">
+            SSLOptions +StdEnvVars
+    </Directory>
+
+    <IfModule setenvif_module>
+        BrowserMatch ".*MSIE.*" nokeepalive ssl-unclean-shutdown downgrade-1.0 force-response-1.0
+    </IfModule>
+
+    ServerName  bilder.uhu-banane.de
+
+    DocumentRoot /var/www/bilder/htdocs
+
+    ErrorLog /var/log/apache2/bilder-error.log
+    LogLevel info
+    CustomLog /var/log/apache2/bilder-access.log full
+
+    <IfModule mod_php5.c>
+        php_admin_flag  engine on
+        php_admin_flag  magic_quotes_gpc off
+        php_admin_flag  safe_mode off
+        php_admin_flag  display_errors off
+        php_admin_flag  log_errors on
+        php_admin_value error_reporting "E_ALL & ~E_NOTICE"
+               php_admin_value upload_max_filesize 10M
+    </IfModule>
+
+    <Directory "/var/www/bilder/htdocs">
+        Options Indexes FollowSymLinks
+        AllowOverride All
+        Order allow,deny
+        Allow from all
+    </Directory>
+
+</VirtualHost>
+
+<VirtualHost *:443>
+
+    SSLEngine on
+    SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
+    SSLCertificateFile /etc/apache2/ssl/egroupware-cert.pem
+    SSLCertificateKeyFile /etc/apache2/ssl/egroupware-cert.pem
+    <FilesMatch "\.(cgi|shtml|phtml|php)$">
+            SSLOptions +StdEnvVars
+    </FilesMatch>
+
+    <Directory "/var/www/localhost/cgi-bin">
+            SSLOptions +StdEnvVars
+    </Directory>
+
+    <IfModule setenvif_module>
+        BrowserMatch ".*MSIE.*" nokeepalive ssl-unclean-shutdown downgrade-1.0 force-response-1.0
+    </IfModule>
+
+    ServerName  bilder.brehm-online.com
+    ServerAlias bilder
+    ServerAlias bilder.hennig-berlin.org
+    ServerAlias bilder.uhu-banane.com
+
+    DocumentRoot /var/www/bilder/htdocs
+
+    Redirect permanent / https://bilder.uhu-banane.de/
+
+    ErrorLog /var/log/apache2/bilder-error.log
+    LogLevel info
+    CustomLog /var/log/apache2/bilder-access-redirect.log full
+
+</VirtualHost>
+
+</IfModule>
+</IfDefine>
+</IfDefine>
+
+<VirtualHost *:80>
+
+    ServerName  bilder.uhu-banane.de
+
+    DocumentRoot /var/www/bilder/htdocs
+
+    ErrorLog /var/log/apache2/bilder-error.log
+    LogLevel info
+    CustomLog /var/log/apache2/bilder-access.log full
+
+    <IfModule mod_php5.c>
+        php_admin_flag  engine on
+        php_admin_flag  magic_quotes_gpc off
+        php_admin_flag  safe_mode off
+        php_admin_flag  display_errors off
+        php_admin_flag  log_errors on
+        php_admin_value error_reporting "E_ALL & ~E_NOTICE"
+               php_admin_value upload_max_filesize 10M
+    </IfModule>
+
+    <Directory "/var/www/bilder/htdocs">
+        Options Indexes FollowSymLinks
+        AllowOverride All
+        Order allow,deny
+        Allow from all
+    </Directory>
+
+</VirtualHost>
+
+<VirtualHost *:80>
+    ServerName bilder.brehm-online.com
+    ServerAlias bilder
+    ServerAlias bilder.hennig-berlin.org
+    ServerAlias bilder.uhu-banane.com
+
+    DocumentRoot /var/www/bilder/htdocs
+
+    Redirect permanent / http://bilder.uhu-banane.de/
+
+    ErrorLog /var/log/apache2/bilder-error.log
+    LogLevel info
+    CustomLog /var/log/apache2/bilder-access-redirect.log full
+
+</VirtualHost>
+
+# vim: ts=4 filetype=apache