summaryrefslogtreecommitdiff
path: root/puppet/modules/site_static
diff options
context:
space:
mode:
Diffstat (limited to 'puppet/modules/site_static')
-rw-r--r--puppet/modules/site_static/manifests/domain.pp7
-rw-r--r--puppet/modules/site_static/manifests/init.pp5
-rw-r--r--puppet/modules/site_static/manifests/location.pp9
3 files changed, 12 insertions, 9 deletions
diff --git a/puppet/modules/site_static/manifests/domain.pp b/puppet/modules/site_static/manifests/domain.pp
index 5537d247..8b9378f2 100644
--- a/puppet/modules/site_static/manifests/domain.pp
+++ b/puppet/modules/site_static/manifests/domain.pp
@@ -1,3 +1,4 @@
+# configure static service for domain
define site_static::domain (
$ca_cert,
$key,
@@ -16,15 +17,15 @@ define site_static::domain (
x509::cert { $domain:
content => $cert,
- notify => Service[apache]
+ notify => Service[apache]
}
x509::key { $domain:
content => $key,
- notify => Service[apache]
+ notify => Service[apache]
}
x509::ca { "${domain}_ca":
content => $ca_cert,
- notify => Service[apache]
+ notify => Service[apache]
}
apache::vhost::file { $domain:
diff --git a/puppet/modules/site_static/manifests/init.pp b/puppet/modules/site_static/manifests/init.pp
index 76ee6e19..4a722d62 100644
--- a/puppet/modules/site_static/manifests/init.pp
+++ b/puppet/modules/site_static/manifests/init.pp
@@ -1,3 +1,4 @@
+# deploy static service
class site_static {
tag 'leap_service'
@@ -48,8 +49,8 @@ class site_static {
if (member($formats, 'amber')) {
rubygems::gem{'amber-0.3.8':
- require => Package['zlib1g-dev']
- }
+ require => Package['zlib1g-dev']
+ }
package { 'zlib1g-dev':
ensure => installed
diff --git a/puppet/modules/site_static/manifests/location.pp b/puppet/modules/site_static/manifests/location.pp
index ce2af9af..d116de2f 100644
--- a/puppet/modules/site_static/manifests/location.pp
+++ b/puppet/modules/site_static/manifests/location.pp
@@ -1,3 +1,4 @@
+# configure static service for location
define site_static::location($path, $format, $source) {
$file_path = "/srv/static/${name}"
@@ -14,10 +15,10 @@ define site_static::location($path, $format, $source) {
if ($format == 'amber') {
exec {"amber_build_${name}":
- cwd => $file_path,
- command => 'amber rebuild',
- user => 'www-data',
- timeout => 600,
+ cwd => $file_path,
+ command => 'amber rebuild',
+ user => 'www-data',
+ timeout => 600,
subscribe => Vcsrepo[$file_path]
}
}