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

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

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
abusehelper/Makefile
View file

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

18
abusehelper/manifests/init.pp
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": file { "/usr/local/src/abusehelper.tar.gz":
ensure => present, ensure => present,
mode => 0644, mode => 0644,
@ -33,6 +49,7 @@ class abusehelper {
links => follow, links => follow,
} }
util::extract::tar { "/usr/local/src/abusehelper": util::extract::tar { "/usr/local/src/abusehelper":
ensure => latest,
strip => 1, strip => 1,
source => "/usr/local/src/abusehelper.tar.gz", source => "/usr/local/src/abusehelper.tar.gz",
require => File["/usr/local/src/abusehelper.tar.gz"], require => File["/usr/local/src/abusehelper.tar.gz"],
@ -47,6 +64,7 @@ class abusehelper {
links => follow, links => follow,
} }
util::extract::tar { "/usr/local/src/idiokit": util::extract::tar { "/usr/local/src/idiokit":
ensure => latest,
strip => 1, strip => 1,
source => "/usr/local/src/idiokit.tar.gz", source => "/usr/local/src/idiokit.tar.gz",
require => File["/usr/local/src/idiokit.tar.gz"], require => File["/usr/local/src/idiokit.tar.gz"],

2
vsroom/Makefile
View file

@ -14,4 +14,4 @@ $(PACKAGES)/$(TARGET):
$(MANIFESTS)/vsroom.pp: $(PACKAGES)/$(TARGET) $(MANIFESTS)/vsroom.pp: $(PACKAGES)/$(TARGET)
@umask 022; echo $@; \ @umask 022; echo $@; \
echo '$$vsroom_package = "$(TARGET)"' > $@ echo '$$vsroom_package_latest = "$(TARGET)"' > $@

9
vsroom/manifests/init.pp
View file

@ -17,6 +17,14 @@ class vsroom {
} }
} }
if !$vsroom_package {
if $vsroom_package_latest {
$vsroom_package = $vsroom_package_latest
} else {
fail("Must define \$vsroom_package or \$vsroom_package_latest")
}
}
file { "/usr/local/src/vsroom.tar.gz": file { "/usr/local/src/vsroom.tar.gz":
ensure => present, ensure => present,
mode => 0644, mode => 0644,
@ -26,6 +34,7 @@ class vsroom {
links => follow, links => follow,
} }
util::extract::tar { "/usr/local/src/vsroom": util::extract::tar { "/usr/local/src/vsroom":
ensure => latest,
strip => 1, strip => 1,
source => "/usr/local/src/vsroom.tar.gz", source => "/usr/local/src/vsroom.tar.gz",
require => File["/usr/local/src/vsroom.tar.gz"], require => File["/usr/local/src/vsroom.tar.gz"],

5
wiki/Makefile
View file

@ -22,6 +22,5 @@ $(PACKAGES)/$(MOINTARGET):
$(MANIFESTS)/wiki.pp: $(PACKAGES)/$(GWIKITARGET) $(PACKAGES)/$(MOINTARGET) $(MANIFESTS)/wiki.pp: $(PACKAGES)/$(GWIKITARGET) $(PACKAGES)/$(MOINTARGET)
@umask 022; echo $@; \ @umask 022; echo $@; \
echo '$$graphingwiki_package = "$(GWIKITARGET)"' > $@ && \ echo '$$graphingwiki_package_latest = "$(GWIKITARGET)"' > $@ && \
echo '$$moin_package = "$(MOINTARGET)"' >> $@ && \ echo '$$moin_package_latest = "$(MOINTARGET)"' >> $@
echo '$$moin_patch = "moin-$(MOINVERSION).patch"' >> $@

20
wiki/manifests/init.pp
View file

@ -2,6 +2,16 @@
# #
class wiki::moin { class wiki::moin {
if !$moin_package {
if $moin_package_latest {
$moin_package = $moin_package_latest
} else {
fail("Must define \$moin_package or \$moin_package_latest")
}
}
$moin_patch = regsubst($moin_package, '\.tar\.gz', '.patch')
file { "/usr/local/src/moin.tar.gz": file { "/usr/local/src/moin.tar.gz":
ensure => present, ensure => present,
mode => 0644, mode => 0644,
@ -19,6 +29,7 @@ class wiki::moin {
links => follow, links => follow,
} }
util::extract::tar { "/usr/local/src/moin": util::extract::tar { "/usr/local/src/moin":
ensure => latest,
strip => 1, strip => 1,
source => "/usr/local/src/moin.tar.gz", source => "/usr/local/src/moin.tar.gz",
require => File["/usr/local/src/moin.tar.gz"], require => File["/usr/local/src/moin.tar.gz"],
@ -38,6 +49,14 @@ class wiki::moin {
# #
class wiki::graphingwiki::common { class wiki::graphingwiki::common {
if !$graphingwiki_package {
if $graphingwiki_package_latest {
$graphingwiki_package = $graphingwiki_package_latest
} else {
fail("Must define \$graphingwiki_package or \$graphingwiki_package_latest")
}
}
file { "/usr/local/src/graphingwiki.tar.gz": file { "/usr/local/src/graphingwiki.tar.gz":
ensure => directory, ensure => directory,
mode => 0644, mode => 0644,
@ -47,6 +66,7 @@ class wiki::graphingwiki::common {
links => follow, links => follow,
} }
util::extract::tar { "/usr/local/src/graphingwiki": util::extract::tar { "/usr/local/src/graphingwiki":
ensure => latest,
strip => 1, strip => 1,
source => "/usr/local/src/graphingwiki.tar.gz", source => "/usr/local/src/graphingwiki.tar.gz",
require => File["/usr/local/src/graphingwiki.tar.gz"], require => File["/usr/local/src/graphingwiki.tar.gz"],