Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: mediawiki: install extension config files in the correct path
......................................................................
mediawiki: install extension config files in the correct path
On trusty/jessie, install the config files in the
'/etc/php5/mods-available/conf.d' directory; also activate
them. Finally, do not install apc.ini on newer PHP version as it's
unstable/unsupported.
Change-Id: Ib5734bb834b63145337d1ef3adce2975b201dd4e
---
M modules/contint/manifests/packages.pp
M modules/mediawiki/manifests/php.pp
A modules/mediawiki/manifests/php_enmod.pp
3 files changed, 41 insertions(+), 18 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/contint/manifests/packages.pp
b/modules/contint/manifests/packages.pp
index 29a8193..5b3ed0b 100644
--- a/modules/contint/manifests/packages.pp
+++ b/modules/contint/manifests/packages.pp
@@ -8,15 +8,16 @@
include ::mediawiki::packages
include ::mediawiki::packages::multimedia # T76661
- # Disable APC entirely it gets confused when files changes often
- file { '/etc/php5/conf.d/apc.ini':
- owner => 'root',
- group => 'root',
- mode => '0444',
- source => 'puppet:///modules/contint/disable-apc.ini',
- require => Package['php-apc'],
+ if os_version('ubuntu < trusty') {
+ # Disable APC entirely it gets confused when files changes often
+ file { '/etc/php5/conf.d/apc.ini':
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ source => 'puppet:///modules/contint/disable-apc.ini',
+ require => Package['php-apc'],
+ }
}
-
# Get several OpenJDK packages including the jdk to build mobile
# applications.
# (openjdk is the default distribution for the java define.
diff --git a/modules/mediawiki/manifests/php.pp
b/modules/mediawiki/manifests/php.pp
index 3924cbb..991f2b7 100644
--- a/modules/mediawiki/manifests/php.pp
+++ b/modules/mediawiki/manifests/php.pp
@@ -5,6 +5,13 @@
class mediawiki::php {
include ::mediawiki::packages
+ if os_version('ubuntu >= trusty || debian >= Jessie') {
+ $php_module_conf_dir = '/etc/php5/mods-available'
+ mediawiki::php_enmod { ['fss', 'mail']: }
+ } else {
+ $php_module_conf_dir = '/etc/php5/conf.d'
+ }
+
file { '/etc/php5/apache2/php.ini':
source => 'puppet:///modules/mediawiki/php/php.ini',
owner => 'root',
@@ -21,7 +28,7 @@
require => Package['php5-cli'],
}
- file { '/etc/php5/conf.d/fss.ini':
+ file { "${php_module_conf_dir}/fss.ini":
source => 'puppet:///modules/mediawiki/php/fss.ini',
owner => 'root',
group => 'root',
@@ -29,15 +36,7 @@
require => Package['php5-fss'],
}
- file { '/etc/php5/conf.d/apc.ini':
- source => 'puppet:///modules/mediawiki/php/apc.ini',
- owner => 'root',
- group => 'root',
- mode => '0444',
- require => Package['php-apc'],
- }
-
- file { '/etc/php5/conf.d/mail.ini':
+ file { "${php_module_conf_dir}/mail.ini":
ensure => absent,
require => Package['php-mail'],
}
@@ -58,5 +57,13 @@
mode => '0444',
require => Package['php5-wmerrors'],
}
+
+ file { '/etc/php5/conf.d/apc.ini':
+ source => 'puppet:///modules/mediawiki/php/apc.ini',
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ require => Package['php-apc'],
+ }
}
}
diff --git a/modules/mediawiki/manifests/php_enmod.pp
b/modules/mediawiki/manifests/php_enmod.pp
new file mode 100644
index 0000000..e9ab99c
--- /dev/null
+++ b/modules/mediawiki/manifests/php_enmod.pp
@@ -0,0 +1,15 @@
+# === Define mediawiki::php_enmod
+#
+# Enables a php config file in newer ubuntu/debian hosts.
+
+define mediawiki::php_enmod {
+ requires_os('ubuntu >= trusty || debian >= jessie')
+
+ exec { "PHP module ${title} enable":
+ command => "/usr/sbin/php5enmod -s ALL ${title}",
+ refreshonly => true,
+ user => 'root',
+ group => 'root',
+ subscribe => File["/etc/php5/mods-available/${title}.ini"]
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/191863
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib5734bb834b63145337d1ef3adce2975b201dd4e
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
