From ffa4504f81c0abecc62b068951ec147741028128 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 24 Sep 2013 09:09:30 +0200
Subject: seperate cert and key deployment (#3918)

---
 puppet/modules/site_config/manifests/x509/cert.pp     | 10 ++++++++++
 puppet/modules/site_config/manifests/x509/cert_key.pp | 15 ---------------
 puppet/modules/site_config/manifests/x509/key.pp      |  9 +++++++++
 3 files changed, 19 insertions(+), 15 deletions(-)
 create mode 100644 puppet/modules/site_config/manifests/x509/cert.pp
 delete mode 100644 puppet/modules/site_config/manifests/x509/cert_key.pp
 create mode 100644 puppet/modules/site_config/manifests/x509/key.pp

(limited to 'puppet/modules/site_config/manifests/x509')

diff --git a/puppet/modules/site_config/manifests/x509/cert.pp b/puppet/modules/site_config/manifests/x509/cert.pp
new file mode 100644
index 00000000..7ed42959
--- /dev/null
+++ b/puppet/modules/site_config/manifests/x509/cert.pp
@@ -0,0 +1,10 @@
+class site_config::x509::cert {
+
+  $x509      = hiera('x509')
+  $cert      = $x509['cert']
+
+  x509::cert { $site_config::params::cert_name:
+    content => $cert
+  }
+
+}
diff --git a/puppet/modules/site_config/manifests/x509/cert_key.pp b/puppet/modules/site_config/manifests/x509/cert_key.pp
deleted file mode 100644
index d55c6cf2..00000000
--- a/puppet/modules/site_config/manifests/x509/cert_key.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-class site_config::x509::cert_key {
-
-  $x509      = hiera('x509')
-  $key       = $x509['key']
-  $cert      = $x509['cert']
-
-  x509::key { $site_config::params::cert_name:
-    content => $key
-  }
-
-  x509::cert { $site_config::params::cert_name:
-    content => $cert
-  }
-
-}
diff --git a/puppet/modules/site_config/manifests/x509/key.pp b/puppet/modules/site_config/manifests/x509/key.pp
new file mode 100644
index 00000000..32b59726
--- /dev/null
+++ b/puppet/modules/site_config/manifests/x509/key.pp
@@ -0,0 +1,9 @@
+class site_config::x509::key {
+
+  $x509      = hiera('x509')
+  $key       = $x509['key']
+
+  x509::key { $site_config::params::cert_name:
+    content => $key
+  }
+}
-- 
cgit v1.2.3