saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index 3ab3aa16d914feafbb7f70d02b759e3d75329df7..3a61d39679205f2ede0593bdc699688f8eb32abe 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -291,6 +291,8 @@ maybe chmod 0600 'apache2/ssl/webmail-2006-01-cert.pem'
 maybe chmod 0644 'apache2/ssl/webmail-2015-01-cert.pem'
 maybe chmod 0644 'apache2/ssl/www-2015-01-cert.pem'
 maybe chmod 0644 'apache2/svnusers'
+maybe chmod 0755 'apache2/unused_vhosts'
+maybe chmod 0644 'apache2/unused_vhosts/06_webmail.conf'
 maybe chmod 0755 'apache2/vhosts.d'
 maybe chmod 0755 'apache2/vhosts.d/.original'
 maybe chmod 0644 'apache2/vhosts.d/.original/00_default_ssl_vhost.conf'
@@ -302,7 +304,6 @@ maybe chmod 0644 'apache2/vhosts.d/01_myadmin.conf'
 maybe chmod 0644 'apache2/vhosts.d/03_gitweb.conf'
 maybe chmod 0644 'apache2/vhosts.d/04_fotoalbum.conf'
 maybe chmod 0644 'apache2/vhosts.d/05_bautagebuch.conf'
-maybe chmod 0644 'apache2/vhosts.d/06_webmail.conf'
 maybe chmod 0644 'apache2/vhosts.d/09_ldap.conf'
 maybe chmod 0644 'apache2/vhosts.d/10_kfz-dlb.conf'
 maybe chmod 0644 'apache2/vhosts.d/11-books-nossl.conf'

diff --git a/apache2/unused_vhosts/06_webmail.conf b/apache2/unused_vhosts/06_webmail.conf
new file mode 100644 (file)
index 0000000..cdfe75a
--- /dev/null
+++ b/apache2/unused_vhosts/06_webmail.conf
@@ -0,0 +1,134 @@
+<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/webmail-cert.pem
+    #SSLCertificateKeyFile /etc/apache2/ssl/myadmin-cert.pem
+    SSLCertificateKeyFile /etc/apache2/ssl/apache-key.pem
+    SSLCertificateChainFile /etc/apache2/ssl/root_ca_fbrehm.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  webmail.brehm-online.com
+#    ServerAlias webmail
+#    ServerAlias webmail.brehm-online.eu
+#    ServerAlias webmail.brehm-berlin.de
+#    ServerAlias webmail.hennig-berlin.org
+#    ServerAlias webmail.uhu-banane.de
+#    ServerAlias webmail.uhu-banane.com
+
+#    DocumentRoot /var/www/webmail/htdocs/horde/imp
+    DocumentRoot /var/www/webmail/htdocs/horde
+
+    Alias /horde/     /var/www/webmail/htdocs/horde/
+#    Alias /js/        /var/www/webmail/htdocs/horde/js/
+    Alias /gollem/    /var/www/webmail/htdocs/horde/gollem/
+    Alias /imp/       /var/www/webmail/htdocs/horde/imp/
+    Alias /ingo/      /var/www/webmail/htdocs/horde/ingo/
+    Alias /kronolith/ /var/www/webmail/htdocs/horde/kronolith/
+    Alias /mnemo/     /var/www/webmail/htdocs/horde/mnemo/
+    Alias /nag/       /var/www/webmail/htdocs/horde/nag/
+    Alias /passwd/    /var/www/webmail/htdocs/horde/passwd/
+    Alias /turba/     /var/www/webmail/htdocs/horde/turba/
+
+    ErrorLog /var/log/apache2/webmail-error.log
+    LogLevel warn
+    CustomLog /var/log/apache2/webmail-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/webmail/htdocs">
+        Options Indexes FollowSymLinks
+        AllowOverride All
+        Order allow,deny
+        Allow from all
+        # AuthType Basic
+        # AuthName "phpMyadmin brehm-online.com"
+        # AuthUserFile /etc/apache2/myadmin.passwd
+        # Require valid-user
+    </Directory>
+
+</VirtualHost>
+
+<VirtualHost *:443>
+
+    SSLEngine on
+    SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
+    SSLCertificateFile /etc/apache2/ssl/webmail-cert.pem
+    #SSLCertificateKeyFile /etc/apache2/ssl/myadmin-cert.pem
+    SSLCertificateKeyFile /etc/apache2/ssl/apache-key.pem
+    SSLCertificateChainFile /etc/apache2/ssl/root_ca_fbrehm.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  webmail.brehm-online.eu
+    ServerAlias webmail
+    ServerAlias webmail.brehm-berlin.de
+    ServerAlias webmail.hennig-berlin.org
+    ServerAlias webmail.uhu-banane.de
+    ServerAlias webmail.uhu-banane.com
+
+    DocumentRoot /var/www/webmail/htdocs/horde/imp
+
+    Redirect permanent / https://webmail.brehm-online.com/
+
+    ErrorLog /var/log/apache2/webmail-error.log
+    LogLevel warn
+    CustomLog /var/log/apache2/webmail-access-redirect.log full
+
+</VirtualHost>
+
+</IfModule>
+</IfDefine>
+</IfDefine>
+
+<VirtualHost *:80>
+
+    ServerName  webmail.brehm-online.com
+    ServerAlias webmail
+    ServerAlias webmail.brehm-online.eu
+    ServerAlias webmail.brehm-berlin.de
+    ServerAlias webmail.hennig-berlin.org
+    ServerAlias webmail.uhu-banane.de
+    ServerAlias webmail.uhu-banane.com
+
+    DocumentRoot /var/www/webmail/htdocs/horde/imp
+
+    Redirect permanent / https://webmail.brehm-online.com/
+
+    ErrorLog /var/log/apache2/webmail-error.log
+    LogLevel warn
+    CustomLog /var/log/apache2/webmail-access-redirect.log full
+
+</VirtualHost>
+
+

diff --git a/apache2/vhosts.d/06_webmail.conf b/apache2/vhosts.d/06_webmail.conf
deleted file mode 100644 (file)
index cdfe75a..0000000
--- a/apache2/vhosts.d/06_webmail.conf
+++ /dev/null
@@ -1,134 +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/webmail-cert.pem
-    #SSLCertificateKeyFile /etc/apache2/ssl/myadmin-cert.pem
-    SSLCertificateKeyFile /etc/apache2/ssl/apache-key.pem
-    SSLCertificateChainFile /etc/apache2/ssl/root_ca_fbrehm.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  webmail.brehm-online.com
-#    ServerAlias webmail
-#    ServerAlias webmail.brehm-online.eu
-#    ServerAlias webmail.brehm-berlin.de
-#    ServerAlias webmail.hennig-berlin.org
-#    ServerAlias webmail.uhu-banane.de
-#    ServerAlias webmail.uhu-banane.com
-
-#    DocumentRoot /var/www/webmail/htdocs/horde/imp
-    DocumentRoot /var/www/webmail/htdocs/horde
-
-    Alias /horde/     /var/www/webmail/htdocs/horde/
-#    Alias /js/        /var/www/webmail/htdocs/horde/js/
-    Alias /gollem/    /var/www/webmail/htdocs/horde/gollem/
-    Alias /imp/       /var/www/webmail/htdocs/horde/imp/
-    Alias /ingo/      /var/www/webmail/htdocs/horde/ingo/
-    Alias /kronolith/ /var/www/webmail/htdocs/horde/kronolith/
-    Alias /mnemo/     /var/www/webmail/htdocs/horde/mnemo/
-    Alias /nag/       /var/www/webmail/htdocs/horde/nag/
-    Alias /passwd/    /var/www/webmail/htdocs/horde/passwd/
-    Alias /turba/     /var/www/webmail/htdocs/horde/turba/
-
-    ErrorLog /var/log/apache2/webmail-error.log
-    LogLevel warn
-    CustomLog /var/log/apache2/webmail-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/webmail/htdocs">
-        Options Indexes FollowSymLinks
-        AllowOverride All
-        Order allow,deny
-        Allow from all
-        # AuthType Basic
-        # AuthName "phpMyadmin brehm-online.com"
-        # AuthUserFile /etc/apache2/myadmin.passwd
-        # Require valid-user
-    </Directory>
-
-</VirtualHost>
-
-<VirtualHost *:443>
-
-    SSLEngine on
-    SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
-    SSLCertificateFile /etc/apache2/ssl/webmail-cert.pem
-    #SSLCertificateKeyFile /etc/apache2/ssl/myadmin-cert.pem
-    SSLCertificateKeyFile /etc/apache2/ssl/apache-key.pem
-    SSLCertificateChainFile /etc/apache2/ssl/root_ca_fbrehm.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  webmail.brehm-online.eu
-    ServerAlias webmail
-    ServerAlias webmail.brehm-berlin.de
-    ServerAlias webmail.hennig-berlin.org
-    ServerAlias webmail.uhu-banane.de
-    ServerAlias webmail.uhu-banane.com
-
-    DocumentRoot /var/www/webmail/htdocs/horde/imp
-
-    Redirect permanent / https://webmail.brehm-online.com/
-
-    ErrorLog /var/log/apache2/webmail-error.log
-    LogLevel warn
-    CustomLog /var/log/apache2/webmail-access-redirect.log full
-
-</VirtualHost>
-
-</IfModule>
-</IfDefine>
-</IfDefine>
-
-<VirtualHost *:80>
-
-    ServerName  webmail.brehm-online.com
-    ServerAlias webmail
-    ServerAlias webmail.brehm-online.eu
-    ServerAlias webmail.brehm-berlin.de
-    ServerAlias webmail.hennig-berlin.org
-    ServerAlias webmail.uhu-banane.de
-    ServerAlias webmail.uhu-banane.com
-
-    DocumentRoot /var/www/webmail/htdocs/horde/imp
-
-    Redirect permanent / https://webmail.brehm-online.com/
-
-    ErrorLog /var/log/apache2/webmail-error.log
-    LogLevel warn
-    CustomLog /var/log/apache2/webmail-access-redirect.log full
-
-</VirtualHost>
-
-