summaryrefslogtreecommitdiff
path: root/puppet/modules
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-07-23 18:50:01 +0200
committervarac <varacanero@zeromail.org>2013-07-23 18:50:01 +0200
commit661f19261c53e4270a22027103c808a9ec37b91a (patch)
treea4d3d44e9ae056c8c6994f6a4e2108b4114e2959 /puppet/modules
parent3a12f829316b7ccaf353158ea58d27d6fd400065 (diff)
parent87959aa1cda7e942fd0db89857c79e09876006c0 (diff)
Merge branch 'feature/issue_3238' into develop
Diffstat (limited to 'puppet/modules')
-rw-r--r--puppet/modules/site_webapp/manifests/init.pp22
1 files changed, 8 insertions, 14 deletions
diff --git a/puppet/modules/site_webapp/manifests/init.pp b/puppet/modules/site_webapp/manifests/init.pp
index 103a0faf..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,
@@ -128,14 +121,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 {