summaryrefslogtreecommitdiff
path: root/puppet/modules/site_static/manifests
diff options
context:
space:
mode:
authorMicah <micah@riseup.net>2014-12-19 17:13:26 +0000
committerMicah <micah@riseup.net>2014-12-19 17:13:26 +0000
commit50424b752f844305494686afbb1c73995ebfaf39 (patch)
treed483bcefc72a579d0fcbe4ffc409769f279622c1 /puppet/modules/site_static/manifests
parent3d6ede7a695c7dadaf573213e8805df4300c7305 (diff)
parent6ccce65c46f36dba8f8d572e31558b6963d48b41 (diff)
Merge branch 'develop' into 'develop'
Add x509 files to static node allowing postfix to work (solves #6577) See merge request !22
Diffstat (limited to 'puppet/modules/site_static/manifests')
-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']
}
}