From b3f1d297973694f9aef9a7ab3d87799fc644f464 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Tue, 29 Jan 2013 16:38:39 -0500
Subject: 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)

---
 puppet/modules/site_webapp/manifests/init.pp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'puppet/modules/site_webapp/manifests/init.pp')

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 {
-- 
cgit v1.2.3