Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/106755
Change subject: webserver::apache: misc adjustments ...................................................................... webserver::apache: misc adjustments - Change default log location for virtualhosts into /var/log/$name.{access,error}.log. This does the right thing on servers with multiple sites. - AllowOverride All on the main docroot. Since the config for that is static, being able to use .htaccess can prove handy, and is in fact what LibreNMS does. Change-Id: I17e66c874194457675a7a5347961c953b867c4bc --- M manifests/webserver.pp M templates/apache/generic_vhost.erb 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/55/106755/1 diff --git a/manifests/webserver.pp b/manifests/webserver.pp index 4361f3e..ce2d674 100644 --- a/manifests/webserver.pp +++ b/manifests/webserver.pp @@ -305,8 +305,8 @@ $custom=[], $includes=[], $server_admin="r...@wikimedia.org", - $access_log="/var/log/apache2/access.log", - $error_log="/var/log/apache2/error.log", + $access_log="/var/log/apache2/${title}.access.log", + $error_log="/var/log/apache2/${title}.error.log", $ensure=present ) { diff --git a/templates/apache/generic_vhost.erb b/templates/apache/generic_vhost.erb index 215d31e..27a2afb 100644 --- a/templates/apache/generic_vhost.erb +++ b/templates/apache/generic_vhost.erb @@ -12,7 +12,7 @@ DocumentRoot <%= docroot %> <Directory <%= docroot %>> Options Indexes FollowSymLinks MultiViews - AllowOverride None + AllowOverride All Order allow,deny allow from all </Directory> -- To view, visit https://gerrit.wikimedia.org/r/106755 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I17e66c874194457675a7a5347961c953b867c4bc Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits