summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2015-04-14 15:26:54 +0200
committervarac <varacanero@zeromail.org>2016-01-22 09:50:38 +0100
commit8d8a64348df0dcca044316f85ee1757cfceb13b4 (patch)
tree5462dd7f9cc71b43a31b5cdb41d1d4d07bf06b9a /puppet
parent150579fb14716892cc3e4d7d9c0f81b30d56f03a (diff)
Include site_config::params in all x509 subclasses (#6851)
After restructuring site.pp to only include site_config::default and the service-specific classes, we got this: Duplicate declaration: X509::Cert[undef] is already declared in file /srv/leap/puppet/modules/site_config/manifests/x509/commercial/cert.pp at line 8; cannot redeclare at /srv/leap/puppet/modules/site_config/manifests/x509/cert.pp:8 on node rewcitestweb1.rewire.org So i included site_config::params in all site_config::x509 clases. Change-Id: Ib8387abfdc68b36c73a45fd2dd1f3a159eaec4a5
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_config/manifests/x509/ca.pp2
-rw-r--r--puppet/modules/site_config/manifests/x509/ca_bundle.pp1
-rw-r--r--puppet/modules/site_config/manifests/x509/cert.pp2
-rw-r--r--puppet/modules/site_config/manifests/x509/client_ca/ca.pp2
-rw-r--r--puppet/modules/site_config/manifests/x509/client_ca/key.pp2
-rw-r--r--puppet/modules/site_config/manifests/x509/commercial/ca.pp2
-rw-r--r--puppet/modules/site_config/manifests/x509/commercial/cert.pp2
-rw-r--r--puppet/modules/site_config/manifests/x509/commercial/key.pp2
-rw-r--r--puppet/modules/site_config/manifests/x509/key.pp2
9 files changed, 17 insertions, 0 deletions
diff --git a/puppet/modules/site_config/manifests/x509/ca.pp b/puppet/modules/site_config/manifests/x509/ca.pp
index b16d0eeb..2880ecaf 100644
--- a/puppet/modules/site_config/manifests/x509/ca.pp
+++ b/puppet/modules/site_config/manifests/x509/ca.pp
@@ -1,5 +1,7 @@
class site_config::x509::ca {
+ include ::site_config::params
+
$x509 = hiera('x509')
$ca = $x509['ca_cert']
diff --git a/puppet/modules/site_config/manifests/x509/ca_bundle.pp b/puppet/modules/site_config/manifests/x509/ca_bundle.pp
index 4cbe574a..5808e29e 100644
--- a/puppet/modules/site_config/manifests/x509/ca_bundle.pp
+++ b/puppet/modules/site_config/manifests/x509/ca_bundle.pp
@@ -5,6 +5,7 @@ class site_config::x509::ca_bundle {
# we will want to be able to smoothly phase out one CA and phase in another.
# I tried "--capath" for this, but it did not work.
+ include ::site_config::params
$x509 = hiera('x509')
$ca = $x509['ca_cert']
diff --git a/puppet/modules/site_config/manifests/x509/cert.pp b/puppet/modules/site_config/manifests/x509/cert.pp
index 7ed42959..7e5a36b9 100644
--- a/puppet/modules/site_config/manifests/x509/cert.pp
+++ b/puppet/modules/site_config/manifests/x509/cert.pp
@@ -1,5 +1,7 @@
class site_config::x509::cert {
+ include ::site_config::params
+
$x509 = hiera('x509')
$cert = $x509['cert']
diff --git a/puppet/modules/site_config/manifests/x509/client_ca/ca.pp b/puppet/modules/site_config/manifests/x509/client_ca/ca.pp
index 0f313898..3fbafa98 100644
--- a/puppet/modules/site_config/manifests/x509/client_ca/ca.pp
+++ b/puppet/modules/site_config/manifests/x509/client_ca/ca.pp
@@ -5,6 +5,8 @@ class site_config::x509::client_ca::ca {
## client certificates by the webapp.
##
+ include ::site_config::params
+
$x509 = hiera('x509')
$cert = $x509['client_ca_cert']
diff --git a/puppet/modules/site_config/manifests/x509/client_ca/key.pp b/puppet/modules/site_config/manifests/x509/client_ca/key.pp
index f9ef3f52..0b537e76 100644
--- a/puppet/modules/site_config/manifests/x509/client_ca/key.pp
+++ b/puppet/modules/site_config/manifests/x509/client_ca/key.pp
@@ -5,6 +5,8 @@ class site_config::x509::client_ca::key {
## client certificates by the webapp.
##
+ include ::site_config::params
+
$x509 = hiera('x509')
$key = $x509['client_ca_key']
diff --git a/puppet/modules/site_config/manifests/x509/commercial/ca.pp b/puppet/modules/site_config/manifests/x509/commercial/ca.pp
index 8f35759f..c76a9dbb 100644
--- a/puppet/modules/site_config/manifests/x509/commercial/ca.pp
+++ b/puppet/modules/site_config/manifests/x509/commercial/ca.pp
@@ -1,5 +1,7 @@
class site_config::x509::commercial::ca {
+ include ::site_config::params
+
$x509 = hiera('x509')
$ca = $x509['commercial_ca_cert']
diff --git a/puppet/modules/site_config/manifests/x509/commercial/cert.pp b/puppet/modules/site_config/manifests/x509/commercial/cert.pp
index 0c71a705..d71d9838 100644
--- a/puppet/modules/site_config/manifests/x509/commercial/cert.pp
+++ b/puppet/modules/site_config/manifests/x509/commercial/cert.pp
@@ -1,5 +1,7 @@
class site_config::x509::commercial::cert {
+ include ::site_config::params
+
$x509 = hiera('x509')
$cert = $x509['commercial_cert']
diff --git a/puppet/modules/site_config/manifests/x509/commercial/key.pp b/puppet/modules/site_config/manifests/x509/commercial/key.pp
index d32e85ef..2be439fd 100644
--- a/puppet/modules/site_config/manifests/x509/commercial/key.pp
+++ b/puppet/modules/site_config/manifests/x509/commercial/key.pp
@@ -1,5 +1,7 @@
class site_config::x509::commercial::key {
+ include ::site_config::params
+
$x509 = hiera('x509')
$key = $x509['commercial_key']
diff --git a/puppet/modules/site_config/manifests/x509/key.pp b/puppet/modules/site_config/manifests/x509/key.pp
index 32b59726..448dc6a6 100644
--- a/puppet/modules/site_config/manifests/x509/key.pp
+++ b/puppet/modules/site_config/manifests/x509/key.pp
@@ -1,5 +1,7 @@
class site_config::x509::key {
+ include ::site_config::params
+
$x509 = hiera('x509')
$key = $x509['key']