From 984a6d2e22ff3f11d9b772f9a86e6d75f5e14f4b Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 23 Jul 2013 17:29:51 +0200 Subject: /srv/leap/webapp/public/img: require => Vcsrepo['/srv/leap/webapp'] --- puppet/modules/site_webapp/manifests/init.pp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/puppet/modules/site_webapp/manifests/init.pp b/puppet/modules/site_webapp/manifests/init.pp index 103a0faf..f3c28f49 100644 --- a/puppet/modules/site_webapp/manifests/init.pp +++ b/puppet/modules/site_webapp/manifests/init.pp @@ -128,14 +128,15 @@ class site_webapp { source => $webapp['head_scss']; '/srv/leap/webapp/public/img': - ensure => directory, + ensure => directory, recurse => true, - purge => true, - force => true, - owner => leap-webapp, - group => leap-webapp, - mode => '0644', - source => $webapp['img_dir']; + purge => true, + force => true, + owner => leap-webapp, + group => leap-webapp, + mode => '0644', + require => Vcsrepo['/srv/leap/webapp'], + source => $webapp['img_dir']; } file { -- cgit v1.2.3 From 87959aa1cda7e942fd0db89857c79e09876006c0 Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 23 Jul 2013 17:59:41 +0200 Subject: not need for file { '/srv/leap/webapp': }, we have vcsrepo { '/srv/leap/webapp': } --- puppet/modules/site_webapp/manifests/init.pp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/puppet/modules/site_webapp/manifests/init.pp b/puppet/modules/site_webapp/manifests/init.pp index f3c28f49..1071ea1d 100644 --- a/puppet/modules/site_webapp/manifests/init.pp +++ b/puppet/modules/site_webapp/manifests/init.pp @@ -31,13 +31,6 @@ class site_webapp { require => [ Group['leap-webapp'] ]; } - file { '/srv/leap/webapp': - ensure => directory, - owner => 'leap-webapp', - group => 'leap-webapp', - require => User['leap-webapp']; - } - vcsrepo { '/srv/leap/webapp': ensure => present, force => true, -- cgit v1.2.3