diff options
| author | Micah Anderson <micah@leap.se> | 2015-06-11 12:10:09 -0400 | 
|---|---|---|
| committer | Micah Anderson <micah@leap.se> | 2015-06-11 12:10:09 -0400 | 
| commit | b429b30bda4dafc78cb02f6ece5d82f08e35de1f (patch) | |
| tree | 37efc30a4fcb642dec583c3accea76f7a7de9c39 /puppet/modules/site_static/manifests | |
| parent | 67b2bea2dfcfb06191bf5ed562309f264c6aed8c (diff) | |
| parent | d9146415db0e6b7dd0c945039c0a4ed4fd054a7d (diff) | |
Merge tag '0.7.0'
Releasing 0.7.0
Diffstat (limited to 'puppet/modules/site_static/manifests')
| -rw-r--r-- | puppet/modules/site_static/manifests/domain.pp | 15 | ||||
| -rw-r--r-- | puppet/modules/site_static/manifests/init.pp | 2 | 
2 files changed, 13 insertions, 4 deletions
diff --git a/puppet/modules/site_static/manifests/domain.pp b/puppet/modules/site_static/manifests/domain.pp index 6941b1a3..b9177f25 100644 --- a/puppet/modules/site_static/manifests/domain.pp +++ b/puppet/modules/site_static/manifests/domain.pp @@ -12,9 +12,18 @@ define site_static::domain (    create_resources(site_static::location, $locations) -  x509::cert { $domain: content => $cert } -  x509::key  { $domain: content => $key } -  x509::ca   { "${domain}_ca": content => $ca_cert } +  x509::cert { $domain: +    content => $cert, +    notify => Service[apache] +  } +  x509::key { $domain: +    content => $key, +    notify => Service[apache] +  } +  x509::ca { "${domain}_ca": +    content => $ca_cert, +    notify => Service[apache] +  }    apache::vhost::file { $domain:      content => template('site_static/apache.conf.erb') diff --git a/puppet/modules/site_static/manifests/init.pp b/puppet/modules/site_static/manifests/init.pp index aed9775e..ce79c00f 100644 --- a/puppet/modules/site_static/manifests/init.pp +++ b/puppet/modules/site_static/manifests/init.pp @@ -44,7 +44,7 @@ class site_static {    if (member($formats, 'amber')) {      include site_config::ruby::dev -    rubygems::gem{'amber-0.3.0': } +    rubygems::gem{'amber-0.3.4': }    }    create_resources(site_static::domain, $domains)  | 
