daily autocommit

diff --git a/.etckeeper b/.etckeeper
index b327d42574cebc63651531fc4ec3d64f80dede71..2191c8c1fa7376b5e61cd0560a325b4d9cc99347 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -95,8 +95,6 @@ maybe chmod 0755 'apache2/vhosts.d'
 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/01_egroupware.conf b/apache2/vhosts.d/01_egroupware.conf
deleted file mode 100644 (file)
index 1533dd7..0000000
--- a/apache2/vhosts.d/01_egroupware.conf
+++ /dev/null
@@ -1,110 +0,0 @@
-<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  egroupware.uhu-banane.de
-
-    DocumentRoot /var/www/egroupware/htdocs
-
-    ErrorLog /var/log/apache2/egroupware-error.log
-    LogLevel info
-    CustomLog /var/log/apache2/egroupware-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"
-    </IfModule>
-
-    <Directory "/var/www/egroupware/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  egroupware.brehm-online.com
-    ServerAlias egroupware
-    ServerAlias egroupware.brehm-berlin.eu
-    ServerAlias egroupware.brehm-berlin.de
-    ServerAlias egroupware.hennig-berlin.org
-    ServerAlias egroupware.uhu-banane.com
-
-    DocumentRoot /var/www/egroupware/htdocs
-
-    Redirect permanent / https://egroupware.uhu-banane.de/
-
-    ErrorLog /var/log/apache2/egroupware-error.log
-    LogLevel info
-    CustomLog /var/log/apache2/egroupware-access-redirect.log full
-
-</VirtualHost>
-
-</IfModule>
-</IfDefine>
-</IfDefine>
-
-<VirtualHost *:80>
-
-    ServerName  egroupware.uhu-banane.de
-    ServerAlias egroupware
-    ServerAlias egroupware.brehm-online.com
-    ServerAlias egroupware.brehm-berlin.eu
-    ServerAlias egroupware.brehm-berlin.de
-    ServerAlias egroupware.hennig-berlin.org
-    ServerAlias egroupware.uhu-banane.com
-
-    DocumentRoot /var/www/egroupware/htdocs
-
-    Redirect permanent / https://egroupware.uhu-banane.de/
-
-    ErrorLog /var/log/apache2/egroupware-error.log
-    LogLevel info
-    CustomLog /var/log/apache2/egroupware-access-redirect.log full
-
-</VirtualHost>
-
-
-
-# vim: ts=4 filetype=apache

diff --git a/apache2/vhosts.d/02_bilder.conf b/apache2/vhosts.d/02_bilder.conf
deleted file mode 100644 (file)
index 50f04dc..0000000
--- a/apache2/vhosts.d/02_bilder.conf
+++ /dev/null
@@ -1,132 +0,0 @@
-<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

diff --git a/fstab b/fstab
index 554b7f4054874e9d0155fa5341838db9260d64e3..07b424beeeff6ef28181e1537cba80351634a232 100644 (file)
--- a/fstab
+++ b/fstab
@@ -24,8 +24,6 @@
 /dev/vg00/srv          /srv                    ext4    acl,user_xattr          0 1
 /dev/vg00/tmp          /tmp                    ext4    noatime                 0 1
 /dev/vg00/vtmp         /var/tmp                ext4    noatime                 0 1
-/dev/vdb1              /srv/test1              ext4    noatime                 0 1
-/dev/vdc1              /srv/test2              ext4    noatime                 0 1
 
 # Bind mounts ...
 /srv/postgresql                /var/lib/postgresql     none    bind                    0 0