diff options
| author | varac <varacanero@zeromail.org> | 2016-04-25 16:41:34 -0300 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2016-04-25 16:41:34 -0300 |
| commit | 07f8cf9c307471128eef1ded3a77633869c89bcd (patch) | |
| tree | 22705e582bb300936db0fb343402011b704f9596 /puppet/modules/site_static/manifests | |
| parent | 2c5d27327bc1a90f5813e55a40d0acac644a13eb (diff) | |
| parent | f2f2c7391056c252523730cd76ab759db9117c9c (diff) | |
Merge branch 'linting' into develop
Diffstat (limited to 'puppet/modules/site_static/manifests')
| -rw-r--r-- | puppet/modules/site_static/manifests/domain.pp | 7 | ||||
| -rw-r--r-- | puppet/modules/site_static/manifests/init.pp | 5 | ||||
| -rw-r--r-- | puppet/modules/site_static/manifests/location.pp | 9 |
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] } } |