Added support for specifying source packages for abusehelper, vsroom and wiki

This commit is contained in:
Ossi Salmi 2012-01-03 17:20:18 +02:00 committed by Timo Mkinen
parent 2b547723e6
commit 4bc3dcedf6
6 changed files with 52 additions and 6 deletions

View file

@ -22,5 +22,5 @@ $(PACKAGES)/$(IKTARGET):
$(MANIFESTS)/abusehelper.pp: $(PACKAGES)/$(AHTARGET) $(PACKAGES)/$(IKTARGET)
@umask 022; echo $@; \
echo '$$abusehelper_package = "$(AHTARGET)"' > $@ && \
echo '$$idiokit_package = "$(IKTARGET)"' >> $@
echo '$$abusehelper_package_latest = "$(AHTARGET)"' > $@ && \
echo '$$idiokit_package_latest = "$(IKTARGET)"' >> $@

View file

@ -24,6 +24,22 @@ class abusehelper {
}
}
if !$abusehelper_package {
if $abusehelper_package_latest {
$abusehelper_package = $abusehelper_package_latest
} else {
fail("Must define \$abusehelper_package or \$abusehelper_package_latest")
}
}
if !$idiokit_package {
if $idiokit_package_latest {
$idiokit_package = $idiokit_package_latest
} else {
fail("Must define \$idiokit_package or \$idiokit_package_latest")
}
}
file { "/usr/local/src/abusehelper.tar.gz":
ensure => present,
mode => 0644,
@ -33,6 +49,7 @@ class abusehelper {
links => follow,
}
util::extract::tar { "/usr/local/src/abusehelper":
ensure => latest,
strip => 1,
source => "/usr/local/src/abusehelper.tar.gz",
require => File["/usr/local/src/abusehelper.tar.gz"],
@ -47,6 +64,7 @@ class abusehelper {
links => follow,
}
util::extract::tar { "/usr/local/src/idiokit":
ensure => latest,
strip => 1,
source => "/usr/local/src/idiokit.tar.gz",
require => File["/usr/local/src/idiokit.tar.gz"],