From 43c76694387ef750bf838ccaec577746f31b825a Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Thu, 31 Jul 2014 13:59:33 +0100 Subject: 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) --- deployment/websites/manifests/nav.pp | 7 +++++++ deployment/websites/manifests/www.pp | 14 +++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) (limited to 'deployment') 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: -- cgit v1.2.1