BryanDavis has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/404399 )
Change subject: Merge remote-tracking branch 'origin/stretch-migration' ...................................................................... Merge remote-tracking branch 'origin/stretch-migration' Merge the feature branch which has been used to perform the initial migration from Debian Jessie to Debian Stretch to master. Bug: T181353 Change-Id: Id44c34f25ad1ceb5a2b5fff0ee34f13eb8b6e539 --- M Gemfile.lock M Rakefile M puppet/hieradata/common.yaml M puppet/modules/apt/files/wikimedia-pubkey.asc M puppet/modules/crm/manifests/tools.pp M puppet/modules/mediawiki/manifests/apache.pp D puppet/modules/mediawiki/templates/mediawiki-php5-site.erb M puppet/modules/mediawiki/templates/mwrepl/mwrepl.erb M puppet/modules/mediawiki/templates/systemd/jobchron.erb M puppet/modules/mediawiki/templates/systemd/jobrunner.erb M puppet/modules/php/manifests/composer.pp M puppet/modules/role/manifests/commons.pp M puppet/modules/role/manifests/ldapauth.pp M puppet/modules/role/manifests/ores.pp M puppet/modules/role/manifests/wikidata.pp D puppet/modules/role/manifests/zend.pp M puppet/modules/role/templates/elk/apache.conf.erb M puppet/modules/swift/manifests/init.pp M puppet/modules/thumbor/manifests/init.pp 19 files changed, 3 insertions(+), 251 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/99/404399/1 diff --git a/Gemfile.lock b/Gemfile.lock index a717be2..a600c41 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -193,12 +193,8 @@ puppetlabs_spec_helper (< 2.0.0) rake (~> 10.4.2) rspec (~> 3.1, >= 3.1.0) -<<<<<<< HEAD (c9374b scholarships: Add OAuth provisioning) - rubocop (~> 0.51.0) -======= rspec-puppet (~> 2.6.5) rubocop (~> 0.51) ->>>>>>> BRANCH (256c4a analytics: remove cdh modules and roles) safe_yaml (~> 1.0.4) vagrant! yard (~> 0.8, >= 0.8.7.6) diff --git a/Rakefile b/Rakefile index fe4f012..6bb1eff 100644 --- a/Rakefile +++ b/Rakefile @@ -31,12 +31,8 @@ } config.ignore_paths += ['puppet/modules/stdlib/**/*.pp'] config.ignore_paths += ['tmp/**/*.pp'] - config.log_format = '%{path}:%{linenumber} %{KIND}: %{message}' + config.log_format = '%{path}:%{line} %{KIND}: %{message}' end -<<<<<<< HEAD (c9374b scholarships: Add OAuth provisioning) -Cucumber::Rake::Task.new(:cucumber) -RSpec::Core::RakeTask.new(:spec) -======= Cucumber::Rake::Task.new(:cucumber) do |t| t.cucumber_opts = '-r tests/features tests/features' end @@ -56,7 +52,6 @@ desc 'Compile puppet catalogs' task compile: [:compile_host, :compile_roles] ->>>>>>> BRANCH (256c4a analytics: remove cdh modules and roles) RuboCop::RakeTask.new(:rubocop) task default: [:test] diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml index aeda12e..a01a531 100644 --- a/puppet/hieradata/common.yaml +++ b/puppet/hieradata/common.yaml @@ -148,12 +148,6 @@ hhvm::logroot: /vagrant/logs hhvm::admin_site_name: "hhvm-admin%{hiera('mwv::tld')}" -<<<<<<< HEAD (c9374b scholarships: Add OAuth provisioning) -kibana::deploy_dir: /usr/share/kibana -kibana::default_route: /dashboard/elasticsearch/default - -======= ->>>>>>> BRANCH (256c4a analytics: remove cdh modules and roles) logstash::heap_memory_mb: 192 logstash::pipeline_workers: 1 logstash::output::elasticsearch::host: 127.0.0.1 @@ -222,10 +216,6 @@ mediawiki::branch: master mediawiki::apache::docroot: "%{hiera('apache::docroot')}" -<<<<<<< HEAD (c9374b scholarships: Add OAuth provisioning) -mediawiki::apache::php5_site_name: "php5%{hiera('mwv::tld')}" -======= ->>>>>>> BRANCH (256c4a analytics: remove cdh modules and roles) mediawiki::jobrunner::enable: true mediawiki::jobrunner::dir: "%{hiera('mwv::services_dir')}/jobrunner" diff --git a/puppet/modules/apt/files/wikimedia-pubkey.asc b/puppet/modules/apt/files/wikimedia-pubkey.asc index 3e433b4..76d7aba 100644 --- a/puppet/modules/apt/files/wikimedia-pubkey.asc +++ b/puppet/modules/apt/files/wikimedia-pubkey.asc @@ -1,35 +1,6 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v1.4.11 (GNU/Linux) -<<<<<<< HEAD (c9374b scholarships: Add OAuth provisioning) -mQGiBEUtBY8RBACJTZdWEBZHlibArWM1HrX5rcPCb+o2nmeTfNrtMpmVbkmi9vBE -VmIDnjc+VQlJNoiBOKMhAhRSO0rIwEbOTewiQSPERfsClGpv0ikb3kQVFls5HpfZ -49u9EAERRez+P2VJUH7CBmigKdxtKRGM5aLI+eOLUl+lZUn4NU6BsQOUGwCgtLiL -I+8DSNkoiV40UR3uFsS9KLMD/30Lth9A9JgwrDTFl8rlNxq3Eluulv0+2MYoDutW -2p384vJ8Vil+x1GPzZXT1NVHCPdJMXqfnUl33XkPJEFSJ3B1WhwU3muItPoM+GKM -cnJMn2rYJa6Fae7UZy8iRJwSuqSg4mGNa900m/izyYoijJzl1u4HtZhbV++lgubO -j+YfA/4sz68H/ZQZwG+d8X/xTgZ3+9qekqGFgxdGTICtiD7IRPPaQ7EUWOBml6tn -SHfd0TBkCKtfFkr6+rA3ZJ5pyo3OwO2yUAvlBOPeaX4ZKTl7+8lG9kqqGIBm/iZy -bHC75DF506Zm4IiesAXRmRqfB8gReOHEJybZkaCg8FZqhdGErLQ8V2lraW1lZGlh -IEFyY2hpdmUgQXV0b21hdGljIFNpZ25pbmcgS2V5IDxyb290QHdpa2ltZWRpYS5v -cmc+iF8EExECACAFAkUtBY8CGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRAJ -29n5P2zUSmaGAJjipA+xkWInJJHCCcoJrf7rBzqEAJ9OEsJuxbBOvOJBovwpWtNh -goMcubkCDQRFLQWdEAgAvEAe6PnzhGdOC3ZYIeJalQyBEelRZiEdzjtdojTNEf29 -6J75O8QqjQt/pyOZ9w/DCiy81dym3GlXeS61tcfNdSBMXqGtgXAskLV1djz0U7SU -89MiwjrSiYhYRYNSQcrshVDjzpHkj8HY0gwNyN5yZ1xnZ9/WG46Kay6quHQbfKn7 -Egxs6ONJJaW7H1MM2cPzsJuzk1aXq4PJOFHgDo9J2j+nGVgk8XdGqgk5t0we69Oh -YXlxUTjgOE+XMxk4PEOFDjk0pTmxOUMP0b08dpvJf652O4jpnylBIiT9ZxRadENM -zmeBT//sJJIleYDh2a1xeDDQwzRig1swFnfYeuEugwADBQf/b7xdqYrLZYqtJVLO -fgh3HOJ605KNYlyreKj67x04fy8lIhrkp3wraVTN74+jObNhJTq3VesUoPPgJqRi -sABCwbGQeKriz7NUAflBliVapPjSd7qD696zO+wQd03z8wJecdxAcmw89+8jyHWV -bgSf3Thy0pfCDBOZL5ApDzPp/zveTAJJdl9xJ+kQA9g4kXIbqdsv0ytqfT56CAOC -vBIJ7JuzIz8eKZ5LlPoGosU5C6TPwlHwfrh1ttD5/LdoSbcz1ThCM3Q9nasvmQjQ -EGZteBiJH8UogRLTsqbJCtQM6aQL8J/+bWjSrmPdCp2z/dzFTgtga4DKcXiSYo+U -JVwilYhJBBgRAgAJBQJFLQWdAhsMAAoJEAnb2fk/bNRK/HEAn0ud2S4zsHv4Ayzp -QqdXQFnLYQ6mAJ9LlSuxDwXm+ln+7o++xUBMQCKJ7g== -=XekF ------END PGP PUBLIC KEY BLOCK----- -======= mQINBFieKQEBEACZXCSJEwJnXsEofPUIunQTqF8p1IipjkDF4sNSgyuA17AD235h EEll1Czzd13bajM4D9dO+Yz4q9lWcrdoaHXklTEnA1Dhjk0wgTRqEqa37PBxjm7p xTuSOEFAHnQfjM9ZzV6Bd3kzIlfxnTguiYbN1pf4KQ7u4TQSchKr8V4p+mf4Y+Xg @@ -57,4 +28,3 @@ grWsU8i35fI= =ib96 -----END PGP PUBLIC KEY BLOCK----- ->>>>>>> BRANCH (256c4a analytics: remove cdh modules and roles) diff --git a/puppet/modules/crm/manifests/tools.pp b/puppet/modules/crm/manifests/tools.pp index a608163..f2620eb 100644 --- a/puppet/modules/crm/manifests/tools.pp +++ b/puppet/modules/crm/manifests/tools.pp @@ -15,14 +15,9 @@ $audit_base = '/var/spool/audit' require_package( -<<<<<<< HEAD (c9374b scholarships: Add OAuth provisioning) - 'libmysqlclient-dev', - 'libyaml-dev', - 'libffi-dev' -======= 'default-libmysqlclient-dev', + 'libffi-dev' 'libyaml-dev' ->>>>>>> BRANCH (256c4a analytics: remove cdh modules and roles) ) git::clone { 'wikimedia/fundraising/tools': diff --git a/puppet/modules/mediawiki/manifests/apache.pp b/puppet/modules/mediawiki/manifests/apache.pp index 152866c..fa71bca 100644 --- a/puppet/modules/mediawiki/manifests/apache.pp +++ b/puppet/modules/mediawiki/manifests/apache.pp @@ -7,18 +7,8 @@ # [*docroot*] # Document root for Apache vhost serving MediaWiki. # -<<<<<<< HEAD (c9374b scholarships: Add OAuth provisioning) -# [*php5_site_name*] -# Hostname for php5 runtime Apache vhost -# -======= ->>>>>>> BRANCH (256c4a analytics: remove cdh modules and roles) class mediawiki::apache( $docroot, -<<<<<<< HEAD (c9374b scholarships: Add OAuth provisioning) - $php5_site_name, -======= ->>>>>>> BRANCH (256c4a analytics: remove cdh modules and roles) ) { include ::mediawiki include ::mediawiki::multiwiki @@ -41,18 +31,6 @@ Class['::apache::mod::alias'], Class['::apache::mod::rewrite'], Class['::apache::mod::proxy_fcgi'], -<<<<<<< HEAD (c9374b scholarships: Add OAuth provisioning) - ], - } - - apache::site { "php5-${mediawiki::wiki_name}": - ensure => present, - content => template('mediawiki/mediawiki-php5-site.erb'), - require => [ - Class['::apache::mod::alias'], - Class['::apache::mod::rewrite'], -======= ->>>>>>> BRANCH (256c4a analytics: remove cdh modules and roles) ], } diff --git a/puppet/modules/mediawiki/templates/mediawiki-php5-site.erb b/puppet/modules/mediawiki/templates/mediawiki-php5-site.erb deleted file mode 100644 index e4237b5..0000000 --- a/puppet/modules/mediawiki/templates/mediawiki-php5-site.erb +++ /dev/null @@ -1,36 +0,0 @@ -# vim: filetype=apache sts=4 sw=4 autoindent -# -# PHP5 Apache site configuration for MediaWiki -# This file is managed by Puppet. -# -ServerName php5 -ServerAlias <%= @php5_site_name %> - -ServerAdmin http://www.mediawiki.org/wiki/Vagrant -DocumentRoot <%= @docroot %> -LogLevel error - -<Directory /> - Options FollowSymLinks - AllowOverride None -</Directory> - -<Directory <%= @docroot %>> - Require all granted -</Directory> - -<Directory <%= scope['mediawiki::dir'] %>> - Require all granted -</Directory> - -<Directory <%= scope['mediawiki::upload_dir'] %>> - Require all granted -</Directory> - -AllowEncodedSlashes on -RewriteEngine On - -Alias /images "<%= scope['mediawiki::upload_dir'] %>" - -RewriteRule ^/$ /w/index.php [R=301] -Alias /wiki <%= @docroot %>/w/index.php diff --git a/puppet/modules/mediawiki/templates/mwrepl/mwrepl.erb b/puppet/modules/mediawiki/templates/mwrepl/mwrepl.erb index 435cb00..a96137b 100755 --- a/puppet/modules/mediawiki/templates/mwrepl/mwrepl.erb +++ b/puppet/modules/mediawiki/templates/mwrepl/mwrepl.erb @@ -41,11 +41,7 @@ case "$2" in zend|php) # "php" is not documented but let's be liberal with what we accept -<<<<<<< HEAD (c9374b scholarships: Add OAuth provisioning) - ENGINE=php5 -======= ENGINE=php ->>>>>>> BRANCH (256c4a analytics: remove cdh modules and roles) ;; hhvm) ENGINE=hhvm diff --git a/puppet/modules/mediawiki/templates/systemd/jobchron.erb b/puppet/modules/mediawiki/templates/systemd/jobchron.erb index 6ad66a0..97d31f0 100644 --- a/puppet/modules/mediawiki/templates/systemd/jobchron.erb +++ b/puppet/modules/mediawiki/templates/systemd/jobchron.erb @@ -8,11 +8,7 @@ User=www-data Group=www-data SyslogIdentifier=jobchron -<<<<<<< HEAD (c9374b scholarships: Add OAuth provisioning) -ExecStart=/usr/bin/php5 <%= @dir %>/redisJobChronService --config-file=/etc/jobrunner.json ${DAEMON_OPTS} -======= ExecStart=/usr/bin/php <%= scope['::mediawiki::jobrunner::dir'] %>/redisJobChronService --config-file=/etc/jobrunner.json ${DAEMON_OPTS} ->>>>>>> BRANCH (256c4a analytics: remove cdh modules and roles) Restart=always [Install] diff --git a/puppet/modules/mediawiki/templates/systemd/jobrunner.erb b/puppet/modules/mediawiki/templates/systemd/jobrunner.erb index 1403a04..65d1603 100644 --- a/puppet/modules/mediawiki/templates/systemd/jobrunner.erb +++ b/puppet/modules/mediawiki/templates/systemd/jobrunner.erb @@ -8,11 +8,7 @@ User=www-data Group=www-data SyslogIdentifier=jobrunner -<<<<<<< HEAD (c9374b scholarships: Add OAuth provisioning) -ExecStart=/usr/bin/php5 <%= @dir %>/redisJobRunnerService --config-file=/etc/jobrunner.json ${DAEMON_OPTS} -======= ExecStart=/usr/bin/php <%= scope['::mediawiki::jobrunner::dir'] %>/redisJobRunnerService --config-file=/etc/jobrunner.json ${DAEMON_OPTS} ->>>>>>> BRANCH (256c4a analytics: remove cdh modules and roles) Restart=always [Install] diff --git a/puppet/modules/php/manifests/composer.pp b/puppet/modules/php/manifests/composer.pp index 14dd612..03eba84 100644 --- a/puppet/modules/php/manifests/composer.pp +++ b/puppet/modules/php/manifests/composer.pp @@ -19,13 +19,8 @@ exec { 'download_composer': command => "curl https://getcomposer.org/composer.phar -o ${bin}", -<<<<<<< HEAD (c9374b scholarships: Add OAuth provisioning) - unless => "php5 -r 'try { Phar::loadPhar(\"${bin}\"); exit(0); } catch(Exception \$e) { exit(1); }'", - require => Package['curl', 'php5-cli'], -======= unless => "php -r 'try { Phar::loadPhar(\"${bin}\"); exit(0); } catch(Exception \$e) { exit(1); }'", require => Package['curl', 'php-cli'], ->>>>>>> BRANCH (256c4a analytics: remove cdh modules and roles) } file { '/usr/local/bin/composer': diff --git a/puppet/modules/role/manifests/commons.pp b/puppet/modules/role/manifests/commons.pp index b364b8b..2c51c6e 100644 --- a/puppet/modules/role/manifests/commons.pp +++ b/puppet/modules/role/manifests/commons.pp @@ -33,17 +33,6 @@ mediawiki::settings { 'commons_GlobalUsage': values => { wgGlobalUsageDatabase => 'commonswiki', -<<<<<<< HEAD (c9374b scholarships: Add OAuth provisioning) - }, - require => Mediawiki::Wiki['commons'], - } - - mediawiki::maintenance { 'refresh globalusage table': - command => '/usr/local/bin/foreachwikiwithextension GlobalUsage extensions/GlobalUsage/maintenance/refreshGlobalimagelinks.php --pages existing,nonexisting', - cwd => $::mediawiki::dir, - require => Mediawiki::Extension['GlobalUsage'], -======= } ->>>>>>> BRANCH (256c4a analytics: remove cdh modules and roles) } } diff --git a/puppet/modules/role/manifests/ldapauth.pp b/puppet/modules/role/manifests/ldapauth.pp index 32d4e83..2a7011c 100644 --- a/puppet/modules/role/manifests/ldapauth.pp +++ b/puppet/modules/role/manifests/ldapauth.pp @@ -17,12 +17,7 @@ $writer_password, $admin_password, ) { -<<<<<<< HEAD (c9374b scholarships: Add OAuth provisioning) - # Needed for php5 maintenance scripts and if the VM is using role::zend - require_package('php5-ldap') -======= require_package('php-ldap') ->>>>>>> BRANCH (256c4a analytics: remove cdh modules and roles) # This is a lazy short cut so we don't have to pass a bazillion options to # create the initial LDIF data. diff --git a/puppet/modules/role/manifests/ores.pp b/puppet/modules/role/manifests/ores.pp index a69333e..c6ea753 100644 --- a/puppet/modules/role/manifests/ores.pp +++ b/puppet/modules/role/manifests/ores.pp @@ -23,19 +23,4 @@ }, }, } -<<<<<<< HEAD (c9374b scholarships: Add OAuth provisioning) -======= - - mediawiki::maintenance { 'check ORES model versions': - command => '/usr/local/bin/mwscript extensions/ORES/maintenance/CheckModelVersions.php --wiki=wiki', - unless => "/usr/bin/mysql -e 'select * from ores_model' wiki | /bin/grep -q 'damaging'", - require => Mediawiki::Extension['ORES'], - } - - # Ensure that the maintenance script does not run before the API is alive, - # when ORES is installed locally via role::ores_service. - # This is pretty horrible but seems to be the only way of avoiding cycles. - Systemd::Service<| title == 'ores-wsgi' or title == 'ores-celery' |> - -> Mediawiki::Maintenance['check ORES model versions'] ->>>>>>> BRANCH (256c4a analytics: remove cdh modules and roles) } diff --git a/puppet/modules/role/manifests/wikidata.pp b/puppet/modules/role/manifests/wikidata.pp index 75cf7b9..2904533 100644 --- a/puppet/modules/role/manifests/wikidata.pp +++ b/puppet/modules/role/manifests/wikidata.pp @@ -87,35 +87,4 @@ wiki => 'wikidata', db_name => 'wikidatawiki', } -<<<<<<< HEAD (c9374b scholarships: Add OAuth provisioning) - - mediawiki::extension { 'WikidataBuildResources': - remote => 'https://gerrit.wikimedia.org/r/wikidata/build-resources', - entrypoint => 'Wikidata.php', - composer => true, - needs_update => true, - settings => template('role/wikidata/shared.php.erb'), - } - - mediawiki::settings { 'WikiData-Init': - priority => $::LOAD_EARLY, - values => template('role/wikidata/init.php.erb'), - } - - exec { 'wikidata-update-git-remote': - command => '/usr/bin/git remote set-url origin https://gerrit.wikimedia.org/r/wikidata/build-resources', - unless => "/usr/bin/git remote -v | grep -q 'https://gerrit.wikimedia.org/r/wikidata/build-resources'", - cwd => "${::mediawiki::dir}/extensions/WikidataBuildResources", - require => Mediawiki::Extension['WikidataBuildResources'], - } - - mediawiki::maintenance { 'wikidata-populate-site-tables': - command => "/usr/local/bin/foreachwikiwithextension WikidataBuildResources extensions/WikidataBuildResources/extensions/Wikibase/lib/maintenance/populateSitesTable.php --load-from http://en${mediawiki::multiwiki::base_domain}${::port_fragment}/w/api.php", - refreshonly => true, - } - - Mediawiki::Wiki<| |> ~> Mediawiki::Maintenance['wikidata-populate-site-tables'] - -======= ->>>>>>> BRANCH (256c4a analytics: remove cdh modules and roles) } diff --git a/puppet/modules/role/manifests/zend.pp b/puppet/modules/role/manifests/zend.pp deleted file mode 100644 index 23a5b22..0000000 --- a/puppet/modules/role/manifests/zend.pp +++ /dev/null @@ -1,16 +0,0 @@ -<<<<<<< HEAD (c9374b scholarships: Add OAuth provisioning) -# == Class: role::zend -# This role will configure your MediaWiki instance to run using -# Zend PHP. -class role::zend { - # Define a 'ZEND' parameter for Apache <IfDefine> checks. - apache::def { 'ZEND': } - - env::alternative { 'zend_as_default_php': - alternative => 'php', - target => '/usr/bin/php5', - priority => 25, - } -} -======= ->>>>>>> BRANCH (256c4a analytics: remove cdh modules and roles) diff --git a/puppet/modules/role/templates/elk/apache.conf.erb b/puppet/modules/role/templates/elk/apache.conf.erb index c9ae872..42e3ebc 100644 --- a/puppet/modules/role/templates/elk/apache.conf.erb +++ b/puppet/modules/role/templates/elk/apache.conf.erb @@ -10,37 +10,10 @@ <Location /> ProxyPass "http://localhost:5601/" Require all granted -<<<<<<< HEAD (c9374b scholarships: Add OAuth provisioning) -</Directory> - -<Directory <%= scope['::kibana::deploy_dir'] %>/src> - Require all granted -</Directory> - -<Location /> - ProxyPass "http://localhost:5601/" -======= ->>>>>>> BRANCH (256c4a analytics: remove cdh modules and roles) </Location> ProxyRequests Off -<<<<<<< HEAD (c9374b scholarships: Add OAuth provisioning) -<Proxy http://localhost:5601> -======= <Proxy http://127.0.0.1:5601> ->>>>>>> BRANCH (256c4a analytics: remove cdh modules and roles) ProxySet connectiontimeout=5 timeout=90 retry=0 </Proxy> -<<<<<<< HEAD (c9374b scholarships: Add OAuth provisioning) - -Header set Cache-Control "public, must-revalidate, max-age=3600" - -# Expose the status api without authenticating -# Due to varnish frontend, all requests are seen by Apache as being internal -# so using IP ranges is not any more restrictive than "all" -<Location /api/status> - Require all granted -</Location> -======= ->>>>>>> BRANCH (256c4a analytics: remove cdh modules and roles) diff --git a/puppet/modules/swift/manifests/init.pp b/puppet/modules/swift/manifests/init.pp index 29ccd3d..3f98f88 100644 --- a/puppet/modules/swift/manifests/init.pp +++ b/puppet/modules/swift/manifests/init.pp @@ -33,13 +33,7 @@ include ::apache::mod::proxy include ::apache::mod::proxy_http - apt::pin { 'swift-python-backports': - package => join(sort($packages), ' '), - pin => 'release a=jessie-backports', - priority => '1000', - } - - package { ['swift', 'swift-account', 'swift-container', 'swift-object', 'swift-proxy', 'python-webob']: + package { ['swift', 'swift-account', 'swift-container', 'swift-object', 'swift-proxy', 'python-webob', 'python-swiftclient']: ensure => 'present', require => [ Apt::Pin['swift-python-backports'], diff --git a/puppet/modules/thumbor/manifests/init.pp b/puppet/modules/thumbor/manifests/init.pp index 2db9a7d..ad0716a 100644 --- a/puppet/modules/thumbor/manifests/init.pp +++ b/puppet/modules/thumbor/manifests/init.pp @@ -43,16 +43,8 @@ } package { 'python-thumbor-wikimedia': -<<<<<<< HEAD (c9374b scholarships: Add OAuth provisioning) - ensure => 'present', - notify => Exec['stop-and-disable-default-thumbor-service'], - require => [ - Apt::Pin['thumbor-python-backports'], - ] -======= ensure => 'present', notify => Exec['stop-and-disable-default-thumbor-service'], ->>>>>>> BRANCH (256c4a analytics: remove cdh modules and roles) } exec { 'stop-and-disable-default-thumbor-service': -- To view, visit https://gerrit.wikimedia.org/r/404399 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id44c34f25ad1ceb5a2b5fff0ee34f13eb8b6e539 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: BryanDavis <bda...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits