Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/151036
Change subject: Fix the envvars file to our specifications
......................................................................
Fix the envvars file to our specifications
In WMF, apache runs as user 'apache' instead of 'www-data' and we ought
to change this.
Change-Id: I226a35886f610854751fcf5fd94d440e873e89d4
Signed-off-by: Giuseppe Lavagetto <glavage...@wikimedia.org>
---
M modules/mediawiki/manifests/web.pp
1 file changed, 15 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/36/151036/1
diff --git a/modules/mediawiki/manifests/web.pp
b/modules/mediawiki/manifests/web.pp
index d56ef46..8f11bda 100644
--- a/modules/mediawiki/manifests/web.pp
+++ b/modules/mediawiki/manifests/web.pp
@@ -39,12 +39,22 @@
require => Package['apache2'],
}
- file { '/etc/apache2/envvars':
+ file_line { 'fix_apache_user':
ensure => present,
- owner => root,
- group => root,
- mode => '0444',
- source =>
"puppet:///modules/mediawiki/apache/envvars.${::lsbdistcodename}"
+ path => '/etc/apache2/envvars',
+ line => 'export APACHE_RUN_USER=apache',
+ match => 'export APACHE_RUN_USER=www-data'
+ }
+
+ file_line { 'fix_apache_group':
+ ensure => present,
+ path => '/etc/apache2/envvars',
+ line => 'export APACHE_RUN_GROUP=apache',
+ match => 'export APACHE_RUN_GROUP=www-data'
+ }
+
+ if ubuntu_version('>= trusty') {
+ apache::def{ 'HHVM': }
}
# do not erase this for now, it may come handy soon...
--
To view, visit https://gerrit.wikimedia.org/r/151036
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I226a35886f610854751fcf5fd94d440e873e89d4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
