diff --git a/salt/profile/wiki/files/httpd2-prefork.apparmor b/salt/profile/wiki/files/httpd2-prefork.apparmor index 6731ae7..4a2704e 100644 --- a/salt/profile/wiki/files/httpd2-prefork.apparmor +++ b/salt/profile/wiki/files/httpd2-prefork.apparmor @@ -35,7 +35,7 @@ profile httpd2-prefork /usr/sbin/httpd{,2}-prefork flags=(complain,attach_discon capability sys_ptrace, capability sys_tty_config, - signal send set=usr1 peer=httpd2-prefork//*, + signal send set=(usr1 term) peer=httpd2-prefork//*, / rw, /bin/bash rix, @@ -57,6 +57,7 @@ profile httpd2-prefork /usr/sbin/httpd{,2}-prefork flags=(complain,attach_discon /proc/*/attr/current rw, /proc/meminfo r, /proc/sys/kernel/ngroups_max r, + /run/httpd.pid.* rw, /run/httpd.pid rw, /tmp/magic* rw, /usr/apache2/error/* r, @@ -99,7 +100,7 @@ profile httpd2-prefork /usr/sbin/httpd{,2}-prefork flags=(complain,attach_discon ^HANDLING_UNTRUSTED_INPUT flags=(complain,attach_disconnected) { #include - signal receive set=usr1 peer=httpd2-prefork, + signal receive set=(usr1 term) peer=httpd2-prefork, /**/.htaccess r, /dev/urandom r, @@ -125,7 +126,7 @@ profile httpd2-prefork /usr/sbin/httpd{,2}-prefork flags=(complain,attach_discon ^vhost_files flags=(attach_disconnected) { #include - signal receive set=usr1 peer=httpd2-prefork, + signal receive set=(usr1 term) peer=httpd2-prefork, /var/log/apache2/files-access_log w, /var/log/apache2/files-access_log-20[12][0-9][01][0-9][0-3][0-9] w, @@ -140,7 +141,7 @@ profile httpd2-prefork /usr/sbin/httpd{,2}-prefork flags=(complain,attach_discon #include #include - signal receive set=usr1 peer=httpd2-prefork, + signal receive set=(usr1 term) peer=httpd2-prefork, / r, /{usr/,}bin/bash rix, diff --git a/salt/profile/wiki/files/magick.apparmor b/salt/profile/wiki/files/magick.apparmor index 3f342c3..b79b17b 100644 --- a/salt/profile/wiki/files/magick.apparmor +++ b/salt/profile/wiki/files/magick.apparmor @@ -10,7 +10,7 @@ profile magick-{{wiki}} flags=(complain) { deny /var/cache/fontconfig/ w, - /bin/bash mrix, + /{usr/,}bin/bash mrix, /dev/tty rw, /etc/ImageMagick-7-SUSE/*.xml r, /etc/nsswitch.conf r, diff --git a/salt/profile/wiki/files/pygmentize.apparmor b/salt/profile/wiki/files/pygmentize.apparmor index 8daaf5e..6ca917d 100644 --- a/salt/profile/wiki/files/pygmentize.apparmor +++ b/salt/profile/wiki/files/pygmentize.apparmor @@ -28,7 +28,7 @@ profile pygmentize /usr/share/mediawiki_*/extensions/SyntaxHighlight_GeSHi/pygme /usr/bin/env rix, /usr/bin/python r, /usr/bin/python2.7 rix, - /usr/bin/python3.6 rix, + /usr/bin/python3.6 mrix, /usr/lib/ r, /usr/local/lib/ r, /usr/local/lib64/ r,