ArielGlenn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/394977 )
Change subject: [WIP] php7 manifests for mediawiki on stretch
......................................................................
[WIP] php7 manifests for mediawiki on stretch
Did I say [WIP]? Let me say it again:
[WIP] Draft of first bits, probably entirely wrong, placeholder, etc.
But we need somewhere to put this stuff.
Change-Id: Ib7e60fcd98efca8bca749139836125216996a4b9
---
M modules/mediawiki/manifests/packages.pp
A modules/mediawiki/manifests/packages/php7.pp
A modules/mediawiki/manifests/php7.pp
3 files changed, 79 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/77/394977/1
diff --git a/modules/mediawiki/manifests/packages.pp
b/modules/mediawiki/manifests/packages.pp
index 1136abb..097669a 100644
--- a/modules/mediawiki/manifests/packages.pp
+++ b/modules/mediawiki/manifests/packages.pp
@@ -5,6 +5,9 @@
if os_version('ubuntu == trusty') {
include ::mediawiki::packages::php5
}
+ if os_version('debian == stretch') {
+ include ::mediawiki::packages::php7
+ }
include ::mediawiki::packages::math
include ::mediawiki::packages::tex
diff --git a/modules/mediawiki/manifests/packages/php7.pp
b/modules/mediawiki/manifests/packages/php7.pp
new file mode 100644
index 0000000..541ac94
--- /dev/null
+++ b/modules/mediawiki/manifests/packages/php7.pp
@@ -0,0 +1,43 @@
+# === Class mediawiki::packages::php7
+#
+# This class declares packages that make up Wikimedia's PHP7-based
+# MediaWiki deployment stack. We'll be moving to this by mid-2018.
+# See T172165
+#
+class mediawiki::packages::php7 {
+ # We don't need php-apc on php > 5.3
+ package { 'php-apc':
+ ensure => absent,
+ }
+
+ # Run-time
+ package { [
+ 'php7.0-cli',
+ 'php7.0-common',
+ 'php-dbg',
+ ]:
+ ensure => present,
+ }
+
+ # Wikimedia PHP extensions
+ # THESE NEED TO BE BUILT AND TESTED
+ package { [
+ 'php7-luasandbox',
+ 'php7-wikidiff2',
+ ]:
+ ensure => present,
+ }
+
+ # Third-party PHP extensions
+ package { [
+ 'php7.0-curl',
+ 'php-geoip',
+ 'php7.0-intl',
+ 'php-memcached',
+ 'php7.0-mysql',
+ 'php-redis',
+ 'php7.0-xmlrpc',
+ ]:
+ ensure => present,
+ }
+}
diff --git a/modules/mediawiki/manifests/php7.pp
b/modules/mediawiki/manifests/php7.pp
new file mode 100644
index 0000000..e6d3a18
--- /dev/null
+++ b/modules/mediawiki/manifests/php7.pp
@@ -0,0 +1,33 @@
+# == Class: mediawiki::php
+#
+# Packages and .ini files for PHP7 extensions.
+#
+class mediawiki::php {
+ include ::mediawiki::packages
+
+ $php_module_conf_dir = '/etc/php7/mods-available'
+ mediawiki::php_enmod { ['mail']: }
+
+ file { '/etc/php7/apache2/php.ini':
+ source => 'puppet:///modules/mediawiki/php7/php.ini',
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ # libapache2-mod-php7 actually provides the /etc/php7/apache2
+ # directory, but we only install it as a side effect of php-dbg.
+ require => Package['php-dbg'],
+ }
+
+ file { '/etc/php7/cli/php.ini':
+ source => 'puppet:///modules/mediawiki/php/php.ini.cli',
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ require => Package['php7.0-cli'],
+ }
+
+ file { "${php_module_conf_dir}/mail.ini":
+ ensure => absent,
+ require => Package['php-mail'],
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/394977
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib7e60fcd98efca8bca749139836125216996a4b9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <ar...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
