diff options
| author | Micah Anderson <micah@riseup.net> | 2013-01-29 16:38:39 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-01-29 16:38:39 -0500 |
| commit | b3f1d297973694f9aef9a7ab3d87799fc644f464 (patch) | |
| tree | 2c7a046bc6ff3191aa4af0e3ad21297dd0b2a479 | |
| parent | a48160a4861dcfffb661bcbf8783ecdb84cbf3e6 (diff) | |
test the $webapp['img_dir'] variable to see if it is undef or not, the default
in the json is ~ (nil), which ends up being undef in puppet (closes #1575)
| -rw-r--r-- | puppet/modules/site_webapp/manifests/init.pp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/puppet/modules/site_webapp/manifests/init.pp b/puppet/modules/site_webapp/manifests/init.pp index 717a9477..c7d918ae 100644 --- a/puppet/modules/site_webapp/manifests/init.pp +++ b/puppet/modules/site_webapp/manifests/init.pp @@ -84,10 +84,14 @@ class site_webapp { '/srv/leap-webapp/app/assets/stylesheets/head.scss': ensure => 'link', target => $webapp['head_scss']; + } - '/srv/leap-webapp/public/img': - ensure => 'link', - target => $webapp['img_dir']; + if $webapp['img_dir'] != undef { + file { + '/srv/leap-webapp/public/img': + ensure => 'link', + target => $webapp['img_dir']; + } } file { |