summaryrefslogtreecommitdiff
path: root/puppet/modules/site_webapp
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2013-07-11 10:04:21 -0700
committerelijah <elijah@riseup.net>2013-07-11 12:17:33 -0700
commit8478e8613ded138b5d68b122cb82f5418a199764 (patch)
tree504137470336f899abb4ca3abca0021f7f4a0303 /puppet/modules/site_webapp
parent0e7b47380edb2af6683a0cdc871eaa60a4101f5c (diff)
changes to support restrictive permissions for /etc/leap. this is required to work with the latest leap_cli.
Diffstat (limited to 'puppet/modules/site_webapp')
-rw-r--r--puppet/modules/site_webapp/manifests/init.pp29
1 files changed, 20 insertions, 9 deletions
diff --git a/puppet/modules/site_webapp/manifests/init.pp b/puppet/modules/site_webapp/manifests/init.pp
index e743dc07..103a0faf 100644
--- a/puppet/modules/site_webapp/manifests/init.pp
+++ b/puppet/modules/site_webapp/manifests/init.pp
@@ -107,24 +107,35 @@ class site_webapp {
try::file {
'/srv/leap/webapp/public/favicon.ico':
- ensure => 'link',
+ ensure => present,
+ owner => leap-webapp,
+ group => leap-webapp,
require => Vcsrepo['/srv/leap/webapp'],
- target => $webapp['favicon'];
+ source => $webapp['favicon'];
'/srv/leap/webapp/app/assets/stylesheets/tail.scss':
- ensure => 'link',
+ ensure => present,
+ owner => leap-webapp,
+ group => leap-webapp,
require => Vcsrepo['/srv/leap/webapp'],
- target => $webapp['tail_scss'];
+ source => $webapp['tail_scss'];
'/srv/leap/webapp/app/assets/stylesheets/head.scss':
- ensure => 'link',
+ ensure => present,
+ owner => leap-webapp,
+ group => leap-webapp,
require => Vcsrepo['/srv/leap/webapp'],
- target => $webapp['head_scss'];
+ source => $webapp['head_scss'];
'/srv/leap/webapp/public/img':
- ensure => 'link',
- require => Vcsrepo['/srv/leap/webapp'],
- target => $webapp['img_dir'];
+ ensure => directory,
+ recurse => true,
+ purge => true,
+ force => true,
+ owner => leap-webapp,
+ group => leap-webapp,
+ mode => '0644',
+ source => $webapp['img_dir'];
}
file {