diff options
| author | Colin Guthrie <colin@mageia.org> | 2014-07-31 13:59:33 +0100 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2014-07-31 13:59:33 +0100 |
| commit | 43c76694387ef750bf838ccaec577746f31b825a (patch) | |
| tree | 47778831fc0beda11ad0b6d55f8ebac54deb82a6 /deployment | |
| parent | 14a471cd9fe6997d9ff3af1f10b0cd916678f30e (diff) | |
| download | puppet-43c76694387ef750bf838ccaec577746f31b825a.tar puppet-43c76694387ef750bf838ccaec577746f31b825a.tar.gz puppet-43c76694387ef750bf838ccaec577746f31b825a.tar.bz2 puppet-43c76694387ef750bf838ccaec577746f31b825a.tar.xz puppet-43c76694387ef750bf838ccaec577746f31b825a.zip | |
websites: Ensure cache dir is created for nav+www/_nav.
Also make sure proper deps are in place for a fresh setup
(this wasn't the case in www)
Diffstat (limited to 'deployment')
| -rw-r--r-- | deployment/websites/manifests/nav.pp | 7 | ||||
| -rw-r--r-- | deployment/websites/manifests/www.pp | 14 |
2 files changed, 18 insertions, 3 deletions
diff --git a/deployment/websites/manifests/nav.pp b/deployment/websites/manifests/nav.pp index b5da04de..c020f50b 100644 --- a/deployment/websites/manifests/nav.pp +++ b/deployment/websites/manifests/nav.pp @@ -17,4 +17,11 @@ class websites::nav { git::snapshot { $vhostdir: source => $git_location, } + + file { "$vhostdir/var/tmp/cache": + ensure => directory, + mode => '0660', + group => $apache::var::apache_group, + require => Git::Snapshot[$vhostdir], + } } diff --git a/deployment/websites/manifests/www.pp b/deployment/websites/manifests/www.pp index b08c97f5..e4ddfd69 100644 --- a/deployment/websites/manifests/www.pp +++ b/deployment/websites/manifests/www.pp @@ -16,9 +16,17 @@ class websites::www { } file { "$vhostdir/var/tmp/cache": - ensure => directory, - group => $apache::var::apache_group, - mode => '0660', + ensure => directory, + group => $apache::var::apache_group, + mode => '0660', + require => Git::Snapshot[$vhostdir], + } + + file { "$vhostdir/_nav/var/tmp/cache": + ensure => directory, + group => $apache::var::apache_group, + mode => '0660', + require => Git::Snapshot[$vhostdir], } apache::vhost::base { $vhost: |