diff options
| author | elijah <elijah@riseup.net> | 2013-02-10 23:40:05 -0800 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2013-02-10 23:40:05 -0800 |
| commit | ea5ec53f0c7b4fd3c400d5976ddb736331e245b8 (patch) | |
| tree | cd3c89ef07d5d51efb6ffae30695c0e8f875662d /puppet/modules/site_webapp | |
| parent | 3cdd7f5f02c237da0f8a3f3eb898982883fd9b97 (diff) | |
| parent | 708a7e39af9a337ae38f491e7ca1892dd70002c1 (diff) | |
Merge branch 'try' into develop
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 f0d6c90a..cdec1b6a 100644 --- a/puppet/modules/site_webapp/manifests/init.pp +++ b/puppet/modules/site_webapp/manifests/init.pp @@ -82,7 +82,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']; @@ -94,14 +96,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 { |