Merge with master and rename MIAB to Mail-in-a-Box Management Daemon

conf/fail2ban/filter.d/miab-management-daemon.conf

@@ -8,5 +8,5 @@ before = common.conf
 
 _daemon = mailinabox
 
-failregex = MIAB: Failed login attempt from ip <HOST> - timestamp .*
+failregex = Mail-in-a-Box Management Daemon: Failed login attempt from ip <HOST> - timestamp .*
 ignoreregex =

conf/fail2ban/jail.d/recidive.conf

@@ -1,4 +1,14 @@
 [recidive]
 enabled  = true
 maxretry = 10
-
+action   = iptables-allports[name=recidive]
+# In the recidive section of jail.conf the action contains:
+#
+# action   = iptables-allports[name=recidive]
+#            sendmail-whois-lines[name=recidive, logpath=/var/log/fail2ban.log]
+#
+# The last line on the action will sent an email to the configured address. This mail will
+# notify the administrator that someone has been repeatedly triggering one of the other jails.
+# By default we don't configure this address and no action is required from the admin anyway.
+# So the notification is ommited. This will prevent message appearing in the mail.log that mail
+# can't be delivered to fail2ban@$HOSTNAME.

conf/fail2ban/jail.local

@@ -5,4 +5,3 @@
 # ping services over the public interface so we should whitelist that address of
 # ours too. The string is substituted during installation.
 ignoreip = 127.0.0.1/8 PUBLIC_IP
-

conf/nginx-primaryonly.conf

@@ -18,8 +18,11 @@
 	rewrite ^(/cloud/core/doc/[^\/]+/)$ $1/index.html;
 	location /cloud/ {
 		alias /usr/local/lib/owncloud/;
-		location ~ ^/(data|config|\.ht|db_structure\.xml|README) {
-			deny all;
+	 	location ~ ^/cloud/(build|tests|config|lib|3rdparty|templates|data|README)/ {
+	 		deny all;
+	 	}
+	 	location ~ ^/cloud/(?:\.|autotest|occ|issue|indie|db_|console) {
+	 		deny all;
 	 	}
 	}
 	location ~ ^(/cloud)((?:/ocs)?/[^/]+\.php)(/.*)?$ {