rebuild patch queue from patch-queue branch

Added apache2-config-set-apparmor-hat-name.patch, which sets the apparmor hat name if the apparmor apache module is enabled.
roelvanmeer · Jan 3, 2018 · 2477d28 · 2477d28
1 parent bbbbf0b
commit 2477d28
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/debian/patches/apache2-config-set-apparmor-hat-name.patch b/debian/patches/apache2-config-set-apparmor-hat-name.patch
@@ -0,0 +1,23 @@
+From: Roel van Meer <roel@1afa.com>
+Date: Wed, 3 Jan 2018 23:53:44 +0100
+Subject: apache2 config: set apparmor hat name
+
+---
+ config/apache2/z-push.conf | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/config/apache2/z-push.conf b/config/apache2/z-push.conf
+index e16660d..721ab69 100644
+--- a/config/apache2/z-push.conf
++++ b/config/apache2/z-push.conf
+@@ -8,6 +8,10 @@
+     DirectoryIndex index.php
+     Options -Indexes +FollowSymLinks
+
++    <IfModule apparmor_module>
++        AAHatName z-push
++    </IfModule>
++
+     # Security
+     # Don't allow .htaccess Overrides, disallow access to files
+     AllowOverride none
diff --git a/debian/patches/series b/debian/patches/series
@@ -1,3 +1,4 @@
 adapt-path-variable-in-migration-tool.patch
 Set-absolute-path-to-z-push-in-gab2contacts.patch
 apache2-config-remove-deprecated-auth-options.patch
+apache2-config-set-apparmor-hat-name.patch