Dzahn has uploaded a new change for review.

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

Change subject: icinga: move ssl cert install to role
......................................................................

icinga: move ssl cert install to role

Change-Id: Id3b526b16ff73156f76ed9849d9e54c0fa2efac8
---
M manifests/role/icinga.pp
M modules/icinga/manifests/web.pp
2 files changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/70/247570/1

diff --git a/manifests/role/icinga.pp b/manifests/role/icinga.pp
index b7de3f5..3f69b5e 100644
--- a/manifests/role/icinga.pp
+++ b/manifests/role/icinga.pp
@@ -32,6 +32,7 @@
     }
 
     $ssl_settings = ssl_ciphersuite('apache-2.2', 'compat', '365')
+    sslcert::certificate { 'icinga.wikimedia.org': }
 
     class { '::icinga':            }
     class { '::icinga::web':       }
diff --git a/modules/icinga/manifests/web.pp b/modules/icinga/manifests/web.pp
index 4556497..102cddf 100644
--- a/modules/icinga/manifests/web.pp
+++ b/modules/icinga/manifests/web.pp
@@ -48,6 +48,4 @@
         ensure => absent,
     }
 
-    sslcert::certificate { 'icinga.wikimedia.org': }
-
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id3b526b16ff73156f76ed9849d9e54c0fa2efac8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>

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

Reply via email to