diff options
| author | Micah Anderson <micah@riseup.net> | 2013-02-12 11:14:32 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-02-12 11:14:32 -0500 |
| commit | 05b4a4d9d6ddb594ffa900192ad0ad714957663f (patch) | |
| tree | 2a24f3b6ecf55e8f8265cf7b9aa0e86c5563638b /puppet/modules/site_webapp | |
| parent | 1a2789d084c3c2beccb97726b8799cb194a634fd (diff) | |
| parent | 102af94df02decef888bac09748dbac6773dedd6 (diff) | |
Merge remote-tracking branch 'origin/develop' into bundle-and-precompile-as-user
Diffstat (limited to 'puppet/modules/site_webapp')
| -rw-r--r-- | puppet/modules/site_webapp/manifests/init.pp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/puppet/modules/site_webapp/manifests/init.pp b/puppet/modules/site_webapp/manifests/init.pp index 46cc0ed6..e8134521 100644 --- a/puppet/modules/site_webapp/manifests/init.pp +++ b/puppet/modules/site_webapp/manifests/init.pp @@ -84,7 +84,9 @@ class site_webapp { '/srv/leap-webapp/public/config/eip-service.json': content => $eip_service, owner => leap-webapp, group => leap-webapp, mode => '0644'; + } + try::file { '/srv/leap-webapp/public/favicon.ico': ensure => 'link', target => $webapp['favicon']; @@ -96,14 +98,10 @@ class site_webapp { '/srv/leap-webapp/app/assets/stylesheets/head.scss': ensure => 'link', target => $webapp['head_scss']; - } - if $webapp['img_dir'] != undef { - file { - '/srv/leap-webapp/public/img': - ensure => 'link', - target => $webapp['img_dir']; - } + '/srv/leap-webapp/public/img': + ensure => 'link', + target => $webapp['img_dir']; } file { |