Paladox has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/362292 )
Change subject: Retrying mutante php 7.0 change part 2
......................................................................
Retrying mutante php 7.0 change part 2
Change-Id: I874e791bb1c010ce6b36aa2cfc1429572e0d36ca
---
M manifests/web.pp
1 file changed, 7 insertions(+), 4 deletions(-)
Approvals:
Paladox: Verified; Looks good to me, approved
diff --git a/manifests/web.pp b/manifests/web.pp
index 3d0690c..f7587db 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.0
+ }
include ::apache::mod::ssl
include ::apache::mod::headers
include ::apache::mod::cgi
@@ -142,12 +148,9 @@
content => template('icinga2/icinga.wmflabs.org.erb'),
}
- if os_version('debian >= stretch') {
- require_package('libapache2-mod-php')
- }
-
file { '/etc/apache2/conf.d/icinga2.conf':
ensure => absent,
}
}
+
--
To view, visit https://gerrit.wikimedia.org/r/362292
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I874e791bb1c010ce6b36aa2cfc1429572e0d36ca
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
