Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/251224
Change subject: mediawiki: extract php config from web::modules, use in noc
......................................................................
mediawiki: extract php config from web::modules, use in noc
As we want to make ::noc compatible with trusty, we need to include the
relevant configuration in the module. We abstract this common config to
a separate class that we can include here as well.
Change-Id: Ifeacd1610660085979f33c036463124f1eaee287
---
M modules/mediawiki/manifests/web/modules.pp
A modules/mediawiki/manifests/web/php_engine.pp
M modules/noc/manifests/init.pp
3 files changed, 48 insertions(+), 34 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/24/251224/1
diff --git a/modules/mediawiki/manifests/web/modules.pp
b/modules/mediawiki/manifests/web/modules.pp
index 86c2f26..bbb3136 100644
--- a/modules/mediawiki/manifests/web/modules.pp
+++ b/modules/mediawiki/manifests/web/modules.pp
@@ -10,35 +10,8 @@
include ::apache::mod::setenvif
include ::apache::mod::status
- if os_version('ubuntu >= trusty') {
- include ::apache::mod::proxy_fcgi
-
- apache::mod_conf { 'mod_php5':
- ensure => absent,
- }
-
- # HHVM catchall, and removal of mod_php
- apache::conf { 'hhvm_catchall':
- source =>
'puppet:///modules/mediawiki/apache/configs/hhvm_catchall.conf',
- priority => 50,
- }
-
- # Mark static assets as coming from an HHVM appserver as well. Needed
for Varnish
- apache::conf { 'mark_engine':
- source =>
'puppet:///modules/mediawiki/apache/configs/hhvm_mark_engine.conf',
- priority => 49,
- }
-
- # Add headers lost by mod_proxy_fastcgi
- apache::conf { 'fcgi_headers':
- source =>
'puppet:///modules/mediawiki/apache/configs/fcgi_headers.conf',
- priority => 0,
- }
-
-
- } else {
- include ::apache::mod::php5
- }
+ # Include the apache configurations for php
+ include ::mediawiki::web::php_engine
# Modules we don't enable.
# Note that deflate and filter are activated deep down in the
diff --git a/modules/mediawiki/manifests/web/php_engine.pp
b/modules/mediawiki/manifests/web/php_engine.pp
new file mode 100644
index 0000000..7f3dfcb
--- /dev/null
+++ b/modules/mediawiki/manifests/web/php_engine.pp
@@ -0,0 +1,34 @@
+# === Class mediawiki::web::php_engine
+# Selects to run web requests via mod_php or HHVM depending on the OS version.
+class mediawiki::web::php_engine {
+ if os_version('ubuntu >= trusty') {
+ include ::apache::mod::proxy_fcgi
+
+ apache::mod_conf { 'mod_php5':
+ ensure => absent,
+ }
+
+ # HHVM catchall, and removal of mod_php
+ apache::conf { 'hhvm_catchall':
+ source =>
'puppet:///modules/mediawiki/apache/configs/hhvm_catchall.conf',
+ priority => 50,
+ }
+
+ # Mark static assets as coming from an HHVM appserver as well. Needed
for Varnish
+ apache::conf { 'mark_engine':
+ source =>
'puppet:///modules/mediawiki/apache/configs/hhvm_mark_engine.conf',
+ priority => 49,
+ }
+
+ # Add headers lost by mod_proxy_fastcgi
+ apache::conf { 'fcgi_headers':
+ source =>
'puppet:///modules/mediawiki/apache/configs/fcgi_headers.conf',
+ priority => 0,
+ }
+
+
+ } else {
+ include ::apache::mod::php5
+ }
+
+}
diff --git a/modules/noc/manifests/init.pp b/modules/noc/manifests/init.pp
index 5642faa..a441297 100644
--- a/modules/noc/manifests/init.pp
+++ b/modules/noc/manifests/init.pp
@@ -2,7 +2,19 @@
# https://dbtree.wikimedia.org/
class noc {
+ # NOC needs a working mediawiki installation at the moment
+ include ::mediawiki
+
include ::apache
+
+ if os_version('ubuntu >= trusty') {
+ apache::def { 'HHVM': }
+ }
+
+ include ::mediawiki::web::php_engine
+
+ include ::apache::mod::rewrite
+ include ::apache::mod::headers
apache::site { 'noc.wikimedia.org':
content => template('noc/noc.wikimedia.org.erb'),
@@ -11,11 +23,6 @@
apache::site { 'dbtree.wikimedia.org':
content => template('noc/dbtree.wikimedia.org.erb'),
}
-
- include ::apache::mod::php5
-
- include ::apache::mod::rewrite
- include ::apache::mod::headers
# dbtree config
include passwords::tendril
--
To view, visit https://gerrit.wikimedia.org/r/251224
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifeacd1610660085979f33c036463124f1eaee287
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
