Rush has submitted this change and it was merged. Change subject: bugzilla: switch svc_name to old-bugzilla ......................................................................
bugzilla: switch svc_name to old-bugzilla switch Bugzilla's svc_name config, used in Apache config template, over to old-bugzilla, for after the phab migration untested, also needs changes in BZ admin UI to go with it Change-Id: I3e7c3513fa94b11ec7979b785a5d6039f5dc3c0f --- M modules/bugzilla/manifests/apache.pp M modules/bugzilla/manifests/init.pp 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: Rush: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/bugzilla/manifests/apache.pp b/modules/bugzilla/manifests/apache.pp index 0da900d..a36876f 100644 --- a/modules/bugzilla/manifests/apache.pp +++ b/modules/bugzilla/manifests/apache.pp @@ -8,14 +8,14 @@ include ::apache::mod::env # separate cert and ServerName for attachments for security - install_certificate{ $svc_name: } + install_certificate{ 'bugzilla.wikimedia.org': } install_certificate{ $attach_svc_name: } $ssl_settings = ssl_ciphersuite('apache-2.2', 'compat', '365') # this includes them both, 80 and 443 apache::site { 'bugzilla.wikimedia.org': - content => template("bugzilla/apache/${svc_name}.erb"), + content => template("bugzilla/apache/bugzilla.wikimedia.org.erb"), priority => 10, } diff --git a/modules/bugzilla/manifests/init.pp b/modules/bugzilla/manifests/init.pp index af05425..e08cdbe 100644 --- a/modules/bugzilla/manifests/init.pp +++ b/modules/bugzilla/manifests/init.pp @@ -50,7 +50,7 @@ # basic apache site and certs class {'bugzilla::apache': - svc_name => 'bugzilla.wikimedia.org', + svc_name => 'old-bugzilla.wikimedia.org', attach_svc_name => 'bug-attachment.wikimedia.org', docroot => '/srv/org/wikimedia/bugzilla/', } -- To view, visit https://gerrit.wikimedia.org/r/175144 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3e7c3513fa94b11ec7979b785a5d6039f5dc3c0f Gerrit-PatchSet: 5 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn <dz...@wikimedia.org> Gerrit-Reviewer: 20after4 <mmod...@wikimedia.org> Gerrit-Reviewer: Aklapper <aklap...@wikimedia.org> Gerrit-Reviewer: Dzahn <dz...@wikimedia.org> Gerrit-Reviewer: John F. Lewis <johnflewi...@gmail.com> Gerrit-Reviewer: Qgil <q...@wikimedia.org> Gerrit-Reviewer: Rush <r...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits