tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bacula: Updated Bacula-web to 6.0.0 and fixed depency error from Makefile.

Browse source
This commit is contained in:
Timo Makinen 2014-05-02 02:44:07 +03:00
parent a688d071bf
commit bb0bd73076
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bacula/Makefile
View file

@ -1,8 +1,8 @@
include $(CURDIR)/../Makefile.inc include $(CURDIR)/../Makefile.inc
VERSION = 5.2.13-1 VERSION = 6.0.0
BASEURL = http://www.bacula-web.org/tl_files/downloads/ 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).tar.gz PACKAGE = bacula-web-$(VERSION).tgz
all: manifest $(PACKAGES)/$(PACKAGE) all: manifest $(PACKAGES)/$(PACKAGE)
@ -10,8 +10,8 @@ manifest: $(MANIFESTS)/bacula.pp
$(PACKAGES)/$(PACKAGE): $(PACKAGES)/$(PACKAGE):
@umask 022 ; echo $@ ; \ @umask 022 ; echo $@ ; \
curl -f -o $@ $(BASEURL)/$(PACKAGE) curl -f -o $@ $(URL)
$(MANIFESTS)/bacula.pp: $(MANIFESTS)/bacula.pp: $(PACKAGES)/$(PACKAGE)
@umask 022 ; echo $@ ; \ @umask 022 ; echo $@ ; \
echo '$$bacula_package_latest = "$(PACKAGE)"' > $@ echo '$$bacula_package_latest = "$(PACKAGE)"' > $@

1
bacula/manifests/init.pp
View file

@ -543,6 +543,7 @@ class bacula::web($htaccess,
util::extract::tar { "/usr/local/share/bacula-web": util::extract::tar { "/usr/local/share/bacula-web":
ensure => latest, ensure => latest,
source => "/usr/local/src/bacula-web.tar.gz", source => "/usr/local/src/bacula-web.tar.gz",
strip => "1",
require => File["/usr/local/src/bacula-web.tar.gz"], require => File["/usr/local/src/bacula-web.tar.gz"],
} }