Paladox has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/362281 )
Change subject: Testing mutante php 7 apache change
......................................................................
Testing mutante php 7 apache change
Change-Id: I600f1421aea4a12b34d630d6aefbbf8125f0c973
---
M manifests/web.pp
1 file changed, 6 insertions(+), 4 deletions(-)
Approvals:
Paladox: Verified; Looks good to me, approved
diff --git a/manifests/web.pp b/manifests/web.pp
index 3d0690c..8125ad4 100644
--- a/manifests/web.pp
+++ b/manifests/web.pp
@@ -25,6 +25,12 @@
}
include ::apache
+ if os_version('debian == jessie') {
+ include ::apache::mod::php5
+ }
+ if os_version('debian >= stretch') {
+ include ::apache::mod::php7
+ }
include ::apache::mod::ssl
include ::apache::mod::headers
include ::apache::mod::cgi
@@ -140,10 +146,6 @@
apache::site { 'gerrit-icinga.wmflabs.org':
content => template('icinga2/icinga.wmflabs.org.erb'),
- }
-
- if os_version('debian >= stretch') {
- require_package('libapache2-mod-php')
}
file { '/etc/apache2/conf.d/icinga2.conf':
--
To view, visit https://gerrit.wikimedia.org/r/362281
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I600f1421aea4a12b34d630d6aefbbf8125f0c973
Gerrit-PatchSet: 2
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
