From 14826e31b3e8851456d9a6494290d74a07169068 Mon Sep 17 00:00:00 2001
From: Theo Chatzimichos <tampakrap@opensuse.org>
Date: Sep 15 2017 09:15:14 +0000
Subject: Merge branch 'cboltz-wiki-apparmor' into 'production'


More write access for the wiki

See merge request !59
---

diff --git a/salt/profile/wiki/files/httpd2-prefork.apparmor b/salt/profile/wiki/files/httpd2-prefork.apparmor
index 69ddd2d..2c27c4a 100644
--- a/salt/profile/wiki/files/httpd2-prefork.apparmor
+++ b/salt/profile/wiki/files/httpd2-prefork.apparmor
@@ -147,12 +147,14 @@ profile httpd2-prefork /usr/sbin/httpd{,2}-prefork flags=(complain,attach_discon
     /srv/www/{{wiki}}.opensuse.org/public/images/**/ rw,
     /srv/www/{{wiki}}.opensuse.org/public/images/**.@{wiki_upload_extensions} rw,
     /srv/www/{{wiki}}.opensuse.org/public/images/deleted/**/index.html rw,
+    /srv/www/{{wiki}}.opensuse.org/public/images/deleted/.htaccess rw,
     /srv/www/{{wiki}}.opensuse.org/public/images/lockdir/*.lock rwk,
     /srv/www/{{wiki}}.opensuse.org/public/images/temp/*/*/*\!localcopy_*. rw,
     /srv/www/{{wiki}}.opensuse.org/public/images/temp/*/*/*\!php??????. rw,
     /srv/www/{{wiki}}.opensuse.org/public/images/temp/**/index.html rw,
     /srv/www/{{wiki}}.opensuse.org/public/images/temp/.htaccess rw,
     /srv/www/{{wiki}}.opensuse.org/public/images/temp/localcopy_* rw,
+    /srv/www/{{wiki}}.opensuse.org/public/images/temp/mw-runJobs-backoffs.json rwk,
     /srv/www/{{wiki}}.opensuse.org/public/images/temp/ResourceLoaderImage?????? rw,
     /srv/www/{{wiki}}.opensuse.org/public/images/temp/svg_*/ rw,
     /srv/www/{{wiki}}.opensuse.org/tmp/php* rw,