Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/308918
Change subject: contint: Add PHP 7 packages from packages.sury.org ...................................................................... contint: Add PHP 7 packages from packages.sury.org This uses the packages.sury.org Debian repository to provide and install packages for PHP 7 on jessie contint machines in labs. Bug: T144872 Change-Id: I14e1b61f38082c8a0ae859dbb9939682515588ca --- A modules/contint/files/sury-php.gpg M modules/contint/manifests/packages/apt.pp M modules/contint/manifests/packages/php.pp 3 files changed, 43 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/18/308918/1 diff --git a/modules/contint/files/sury-php.gpg b/modules/contint/files/sury-php.gpg new file mode 100644 index 0000000..dc4d282 --- /dev/null +++ b/modules/contint/files/sury-php.gpg Binary files differ diff --git a/modules/contint/manifests/packages/apt.pp b/modules/contint/manifests/packages/apt.pp index ea422b5..d632dde 100644 --- a/modules/contint/manifests/packages/apt.pp +++ b/modules/contint/manifests/packages/apt.pp @@ -14,4 +14,18 @@ # lint:endignore } + if os_version('debian == jessie') { + # Sanity check: only enable in labs + requires_realm('labs') + # Enable deb.sury.org PHP packages for jessie only + apt::repository { 'sury-php': + uri => 'https://packages.sury.org/php/', + dist => $::lsbdistcodename, + components => 'main', + source => false, + keyfile => 'puppet:///modules/contint/sury-php.gpg', + } + } + + } diff --git a/modules/contint/manifests/packages/php.pp b/modules/contint/manifests/packages/php.pp index d84ad82..99b6f64 100644 --- a/modules/contint/manifests/packages/php.pp +++ b/modules/contint/manifests/packages/php.pp @@ -16,6 +16,35 @@ ensure => absent, } + if os_version('debian == jessie') { + package { [ + // PHP 7.0 version of packages in mediawiki::packages::php5 + 'php7.0-cli', + 'php7.0-cli-dbgsym', + 'php7.0-common', + 'php7.0-common-dbgsym', + // Note: Missing luasandbox and wikidiff2 + // PHP extensions + 'php7.0-curl', + // missing geoip + 'php7.0-intl', + // missing memcached + 'php7.0-mysql', + // missing redis + 'php7.0-xmlrpc', + // CI packages from above + 'php7.0-dev', + 'php7.0-ldap', + 'php7.0-gd', + 'php7.0-pgsql', + 'php7.0-sqlite3', + 'php7.0-tidy', + // missing xdebug + ]: + ensure => latest, + require => Apt::Repository['sury-php'], + } + if os_version('ubuntu < trusty') { # Disable APC entirely it gets confused when files changes often file { '/etc/php5/conf.d/apc.ini': -- To view, visit https://gerrit.wikimedia.org/r/308918 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I14e1b61f38082c8a0ae859dbb9939682515588ca Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits