[MediaWiki-commits] [Gerrit] RT#5011 bugzilla to use own certificate - change (operations/puppet)

[RobH (Code Review)]

RobH has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/82879


Change subject: RT#5011 bugzilla to use own certificate
......................................................................

RT#5011 bugzilla to use own certificate

Change-Id: I3e163570feecab48809d86b5c8c7ddaa629babbe
---
M files/apache/sites/bugzilla.wikimedia.org
M manifests/misc/bugzilla.pp
M manifests/site.pp
3 files changed, 9 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/79/82879/1

diff --git a/files/apache/sites/bugzilla.wikimedia.org 
b/files/apache/sites/bugzilla.wikimedia.org
index 5bf88db..f7634d1 100644
--- a/files/apache/sites/bugzilla.wikimedia.org
+++ b/files/apache/sites/bugzilla.wikimedia.org
@@ -45,8 +45,8 @@
        SSLProtocol -ALL +SSLv3 +TLSv1
        SSLCipherSuite 
AES128-GCM-SHA256:RC4-SHA:RC4-MD5:DES-CBC3-SHA:AES128-SHA:AES256-SHA
        SSLHonorCipherOrder on
-       SSLCertificateFile /etc/ssl/certs/star.wikimedia.org.pem
-       SSLCertificateKeyFile /etc/ssl/private/star.wikimedia.org.key
+       SSLCertificateFile /etc/ssl/certs/bugzilla.wikimedia.org.pem
+       SSLCertificateKeyFile /etc/ssl/private/bugzilla.wikimedia.org.key
        SSLCACertificatePath /etc/ssl/certs/
 
        RewriteEngine On
@@ -61,8 +61,8 @@
        SSLProtocol -ALL +SSLv3 +TLSv1
        SSLCipherSuite 
AES128-GCM-SHA256:RC4-SHA:RC4-MD5:DES-CBC3-SHA:AES128-SHA:AES256-SHA
        SSLHonorCipherOrder on
-       SSLCertificateFile /etc/ssl/certs/star.wikimedia.org.pem
-       SSLCertificateKeyFile /etc/ssl/private/star.wikimedia.org.key
+       SSLCertificateFile /etc/ssl/certs/bugzilla.wikimedia.org.pem
+       SSLCertificateKeyFile /etc/ssl/private/bugzilla.wikimedia.org.key
        SSLCACertificatePath /etc/ssl/certs/
 
        <Directory />
@@ -141,8 +141,8 @@
        SSLProtocol -ALL +SSLv3 +TLSv1
        SSLCipherSuite 
AES128-GCM-SHA256:RC4-SHA:RC4-MD5:DES-CBC3-SHA:AES128-SHA:AES256-SHA
        SSLHonorCipherOrder on
-       SSLCertificateFile /etc/ssl/certs/star.wikimedia.org.pem
-       SSLCertificateKeyFile /etc/ssl/private/star.wikimedia.org.key
+       SSLCertificateFile /etc/ssl/certs/bugzilla.wikimedia.org.pem
+       SSLCertificateKeyFile /etc/ssl/private/bugzilla.wikimedia.org.key
        SSLCACertificatePath /etc/ssl/certs/
 
        <Directory />
diff --git a/manifests/misc/bugzilla.pp b/manifests/misc/bugzilla.pp
index ffeaadd..283b3ec 100644
--- a/manifests/misc/bugzilla.pp
+++ b/manifests/misc/bugzilla.pp
@@ -4,7 +4,9 @@
 
        system_role { "misc::bugzilla::server": description => "Bugzilla 
server" }
 
-       class {'webserver::php5': ssl => true; }
+    class {'webserver::php5': ssl => true; }
+    install_certificate{ "bugzilla.wikimedia.org": }
+
 
        apache_site { bugzilla: name => "bugzilla.wikimedia.org" }
        file {
diff --git a/manifests/site.pp b/manifests/site.pp
index aa0acb2..437833b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1210,8 +1210,6 @@
             role::bugzilla,
             admins::roots
 
-    install_certificate{ "star.wikimedia.org": }
-
 }
 
 ## labsdb dbs

-- 
To view, visit https://gerrit.wikimedia.org/r/82879
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e163570feecab48809d86b5c8c7ddaa629babbe
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH <r...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits