summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorguido <guido@bruo.org>2014-12-19 12:51:40 -0300
committerguido <guido@bruo.org>2014-12-19 12:51:40 -0300
commit6ccce65c46f36dba8f8d572e31558b6963d48b41 (patch)
treed483bcefc72a579d0fcbe4ffc409769f279622c1 /puppet
parent784cc8dcc03f63587206d62b5d49843eb974dbe1 (diff)
Add x509 files to static node allowing postfix to work (solves #6577) + minor lint.
https://leap.se/code/issues/6577 Change-Id: Iefefbf3e8fc5c13cdd7e302627504a76b856e725
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_static/manifests/init.pp7
1 files changed, 6 insertions, 1 deletions
diff --git a/puppet/modules/site_static/manifests/init.pp b/puppet/modules/site_static/manifests/init.pp
index 6e347d35..aed9775e 100644
--- a/puppet/modules/site_static/manifests/init.pp
+++ b/puppet/modules/site_static/manifests/init.pp
@@ -1,5 +1,10 @@
class site_static {
tag 'leap_service'
+
+ include site_config::x509::cert
+ include site_config::x509::key
+ include site_config::x509::ca_bundle
+
$static = hiera('static')
$domains = $static['domains']
$formats = $static['formats']
@@ -33,7 +38,7 @@ class site_static {
include site_apt::preferences::passenger
class { 'passenger':
use_munin => false,
- require => Class['site_apt::preferences::passenger']
+ require => Class['site_apt::preferences::passenger']
}
}