From 9db043a32c148193cef6d59a90eff7ee2857200c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= <viktor@szepe.net>
Date: Fri, 5 May 2017 02:35:19 +0000
Subject: [PATCH] daily

---
 .gitignore                                    |  4 +-
 security/cert-update.sh                       | 14 ++---
 virtualization/.gitignore                     |  1 -
 .../apache-sites-available/Prg-site.conf      |  9 ++-
 webserver/wordpress.gitignore                 | 55 ++++++++++---------
 5 files changed, 42 insertions(+), 41 deletions(-)
 delete mode 100644 virtualization/.gitignore

diff --git a/.gitignore b/.gitignore
index a2188130..e2599f4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 .bzr
 token_store.txt
-security/fail2ban-conf/filter.d/apache-common.conf
-TODO.md
+/security/fail2ban-conf/filter.d/apache-common.conf
+/TODO.md
diff --git a/security/cert-update.sh b/security/cert-update.sh
index 7be275c2..2c0f6369 100755
--- a/security/cert-update.sh
+++ b/security/cert-update.sh
@@ -2,7 +2,7 @@
 #
 # Set up certificate for use.
 #
-# VERSION       :0.12.1
+# VERSION       :0.12.2
 # DATE          :2016-05-03
 # URL           :https://github.com/szepeviktor/debian-server-tools
 # AUTHOR        :Viktor Szépe <viktor@szepe.net>
@@ -303,16 +303,16 @@ Webmin() {
 Check_requirements
 Protect_certs
 
-Courier_mta; Readkey
+Courier_mta && Readkey
 
-Proftpd; Readkey
+Proftpd && Readkey
 
-Apache2; Readkey
+Apache2 && Readkey
 
-Nginx; Readkey
+Nginx && Readkey
 
-Dovecot; Readkey
+Dovecot && Readkey
 
-Webmin
+Webmin && Readkey
 
 echo "OK."
diff --git a/virtualization/.gitignore b/virtualization/.gitignore
deleted file mode 100644
index 622669e1..00000000
--- a/virtualization/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-_data
diff --git a/webserver/apache-sites-available/Prg-site.conf b/webserver/apache-sites-available/Prg-site.conf
index d472a947..17230129 100644
--- a/webserver/apache-sites-available/Prg-site.conf
+++ b/webserver/apache-sites-available/Prg-site.conf
@@ -15,14 +15,13 @@
     # Off for self-signed certificates
     SSLUseStapling Off
     # Public key + "include intermediate CA certificates, sorted from leaf to root"
-    # Pub-key.pem + sub.classX.server.ca.pem
     SSLCertificateFile /etc/ssl/localcerts/@@CN@@-public.pem
     # Private key
     SSLCertificateKeyFile /etc/ssl/private/@@CN@@-private.key
     <FilesMatch "\.(cgi|shtml|phtml|php)$">
         SSLOptions +StdEnvVars
     </FilesMatch>
-    <Directory /usr/lib/cgi-bin>
+    <Directory "/usr/lib/cgi-bin">
         SSLOptions +StdEnvVars
     </Directory>
 
@@ -58,11 +57,11 @@
         AuthUserFile /home/${SITE_USER}/website/htpasswords
         Require valid-user
     </Proxy>
-    <Location /robots.txt>
+    <Location "/robots.txt">
         Require all granted
     </Location>
 
-    <Directory /home/${SITE_USER}/website/>
+    <Directory "/home/${SITE_USER}/website">
         Options FollowSymLinks
         #AllowOverride All
         AllowOverride None
@@ -79,7 +78,7 @@
     # See ProxyPassMatch above
 
     # Missing images
-    <Directory ${DOCUMENT_ROOT}>
+    <Directory "${DOCUMENT_ROOT}">
         RewriteEngine On
         RewriteCond "%{REQUEST_FILENAME}" !-f
         RewriteRule "^.+\.(jpe?g|png|gif)$" "/default-image-38FC48.jpg" [END]
diff --git a/webserver/wordpress.gitignore b/webserver/wordpress.gitignore
index 2608a4f9..662f189b 100644
--- a/webserver/wordpress.gitignore
+++ b/webserver/wordpress.gitignore
@@ -1,31 +1,34 @@
 # Core
-wp-admin/
-wp-includes/
-index.php
-licenc.txt
-license.txt
-olvasdel.html
-readme.html
-wp-activate.php
-wp-blog-header.php
-wp-comments-post.php
-wp-config-sample.php
-wp-cron.php
-wp-links-opml.php
-wp-load.php
-wp-login.php
-wp-mail.php
-wp-settings.php
-wp-signup.php
-wp-trackback.php
-xmlrpc.php
+/wp-admin/
+/wp-includes/
+/index.php
+/licenc.txt
+/license.txt
+/olvasdel.html
+/readme.html
+/wp-activate.php
+/wp-blog-header.php
+/wp-comments-post.php
+/wp-config-sample.php
+/wp-cron.php
+/wp-links-opml.php
+/wp-load.php
+/wp-login.php
+/wp-mail.php
+/wp-settings.php
+/wp-signup.php
+/wp-trackback.php
+/xmlrpc.php
 
 # Theme under git
-wp-content/themes/THEME-NAME/
+/wp-content/themes/THEME-NAME/
 
 # Content
-wp-content/uploads/**/*.jpg
-wp-content/uploads/**/*.png
-wp-content/cache/
-!wp-content/cache/**/*.php
-!wp-content/cache/**/.htaccess
+/wp-content/uploads/**/*.jpg
+/wp-content/uploads/**/*.png
+/wp-content/cache/**/*.html
+/wp-content/cache/**/*.html.gz
+/wp-content/cache/**/*.css
+/wp-content/cache/**/*.css.gz
+/wp-content/cache/**/*.js
+/wp-content/cache/**/*.js.gz