From 708a7e39af9a337ae38f491e7ca1892dd70002c1 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Sun, 10 Feb 2013 23:39:27 -0800
Subject: set webapp module to use try::file where appropriate

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

(limited to 'puppet/modules/site_webapp')

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