From bb0bd730760ca9f55249aa8e7c0229e8c82a68e4 Mon Sep 17 00:00:00 2001
From: Timo Makinen <tmakinen@foo.sh>
Date: Fri, 2 May 2014 02:44:07 +0300
Subject: [PATCH] bacula: Updated Bacula-web to 6.0.0 and fixed depency error
 from Makefile.

---
 bacula/Makefile          | 10 +++++-----
 bacula/manifests/init.pp |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/bacula/Makefile b/bacula/Makefile
index d3bc79a..ac75a63 100644
--- a/bacula/Makefile
+++ b/bacula/Makefile
@@ -1,8 +1,8 @@
 include $(CURDIR)/../Makefile.inc
 
-VERSION = 5.2.13-1
-BASEURL = http://www.bacula-web.org/tl_files/downloads/
-PACKAGE = bacula-web-$(VERSION).tar.gz
+VERSION = 6.0.0
+URL = http://www.bacula-web.org/download/articles/bacula-web-600.html?file=files/bacula-web.org/downloads/bacula-web-6.0.0.tgz
+PACKAGE = bacula-web-$(VERSION).tgz
 
 all:            manifest $(PACKAGES)/$(PACKAGE)
 
@@ -10,8 +10,8 @@ manifest:	$(MANIFESTS)/bacula.pp
 
 $(PACKAGES)/$(PACKAGE):
 	@umask 022 ; echo $@ ; \
-	curl -f -o $@ $(BASEURL)/$(PACKAGE)
+	curl -f -o $@ $(URL)
 
-$(MANIFESTS)/bacula.pp:
+$(MANIFESTS)/bacula.pp:	$(PACKAGES)/$(PACKAGE)
 	@umask 022 ; echo $@ ; \
 	echo '$$bacula_package_latest = "$(PACKAGE)"' > $@
diff --git a/bacula/manifests/init.pp b/bacula/manifests/init.pp
index dc96dba..0a9b429 100644
--- a/bacula/manifests/init.pp
+++ b/bacula/manifests/init.pp
@@ -543,6 +543,7 @@ class bacula::web($htaccess,
     util::extract::tar { "/usr/local/share/bacula-web":
         ensure  => latest,
         source  => "/usr/local/src/bacula-web.tar.gz",
+        strip   => "1",
         require => File["/usr/local/src/bacula-web.tar.gz"],
     }