diff --git a/salt/profile/countdown/files/httpd2-prefork.apparmor b/salt/profile/countdown/files/httpd2-prefork.apparmor index 38045ac..61a53da 100644 --- a/salt/profile/countdown/files/httpd2-prefork.apparmor +++ b/salt/profile/countdown/files/httpd2-prefork.apparmor @@ -101,6 +101,7 @@ profile httpd2-prefork /usr/sbin/httpd{,2}-prefork flags=(complain,attach_discon # strange, but happens in practise /var/log/apache2/countdown-access_log w, + /var/log/apache2/doc-access_log w, } @@ -121,6 +122,23 @@ profile httpd2-prefork /usr/sbin/httpd{,2}-prefork flags=(complain,attach_discon /srv/www/countdown.opensuse.org/** r, } + ^vhost_doc flags=(complain,attach_disconnected) { + #include + #include + + / r, +# /bin/bash rix, +# /dev/tty rw, +# /proc/meminfo r, +# /usr/bin/timeout rix, + /var/log/apache2/doc-access_log w, + /var/log/apache2/doc-access_log-21[12][0-9][01][0-9][0-3][0-9] w, + /var/log/apache2/error_log w, + + /srv/www/vhosts/doc.opensuse.org/ r, + /srv/www/vhosts/doc.opensuse.org/** r, + } + } # vim: ft=apparmor expandtab diff --git a/salt/profile/documentation/files/002-doc.conf b/salt/profile/documentation/files/002-doc.conf index 499115b..abe6437 100644 --- a/salt/profile/documentation/files/002-doc.conf +++ b/salt/profile/documentation/files/002-doc.conf @@ -2,6 +2,8 @@ ServerName doc.opensuse.org ServerAlias doc.opensuse.org + AADefaultHatName vhost_doc + DocumentRoot /srv/www/vhosts/doc.opensuse.org/ RewriteEngine On @@ -12,4 +14,7 @@ Order allow,deny Allow from all + + LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" \"%{X-Forwarded-For}i\"" combinedproxy + CustomLog "/var/log/apache2/doc-access_log" combinedproxy