Changed package fetching Makefiles for abusehelper, vsroom and wiki
No longer uses symlinks to manage package versions. Ppackage versions are now recorded in /srv/puppet/files/common/packages/manifests/*.pp instead, which must be included in the site or node manifest.
This commit is contained in:
parent
32956c0d26
commit
29bc90e6f6
6 changed files with 70 additions and 52 deletions
|
@ -1,19 +1,27 @@
|
|||
GWIKI = default
|
||||
GWIKIURL = https://bitbucket.org/clarifiednetworks/graphingwiki/get/$(GWIKI).tar.gz
|
||||
MOIN = 1.8.8
|
||||
MOINURL = http://static.moinmo.in/files/moin-$(MOIN).tar.gz
|
||||
OUT = /srv/puppet/files/common/packages
|
||||
include $(CURDIR)/../Makefile.inc
|
||||
|
||||
all: tarball
|
||||
tarball: graphingwiki.tar.gz moin.tar.gz
|
||||
.PHONY: graphingwiki.tar.gz moin.tar.gz
|
||||
GWIKIBRANCH = default
|
||||
GWIKISOURCE = https://bitbucket.org/clarifiednetworks/graphingwiki/get/$(GWIKIBRANCH).tar.gz
|
||||
GWIKITARGET = graphingwiki-$(GWIKIBRANCH)-$(TIMESTAMP).tar.gz
|
||||
|
||||
graphingwiki.tar.gz:
|
||||
@umask 022 && mkdir -p $(OUT)/graphingwiki && \
|
||||
cd $(OUT)/graphingwiki && wget -nv -N $(GWIKIURL) && \
|
||||
cd $(OUT) && ln -fs graphingwiki/$(GWIKI).tar.gz graphingwiki.tar.gz
|
||||
MOINVERSION = 1.8.9
|
||||
MOINSOURCE = http://static.moinmo.in/files/moin-$(MOINVERSION).tar.gz
|
||||
MOINTARGET = moin-$(MOINVERSION).tar.gz
|
||||
|
||||
moin.tar.gz:
|
||||
@umask 022 && mkdir -p $(OUT)/moin && \
|
||||
cd $(OUT)/moin && wget -nv -N $(MOINURL) && \
|
||||
cd $(OUT) && ln -fs moin/moin-$(MOIN).tar.gz moin.tar.gz
|
||||
all: tarball manifest
|
||||
tarball: $(PACKAGES)/$(GWIKITARGET) $(PACKAGES)/$(MOINTARGET)
|
||||
manifest: $(MANIFESTS)/wiki.pp
|
||||
|
||||
$(PACKAGES)/$(GWIKITARGET):
|
||||
@umask 022; echo $@; \
|
||||
test -f $@ || curl -o $@ $(GWIKISOURCE)
|
||||
|
||||
$(PACKAGES)/$(MOINTARGET):
|
||||
@umask 022; echo $@; \
|
||||
test -f $@ || curl -o $@ $(MOINSOURCE)
|
||||
|
||||
$(MANIFESTS)/wiki.pp: $(PACKAGES)/$(GWIKITARGET) $(PACKAGES)/$(MOINTARGET)
|
||||
@umask 022; echo $@; \
|
||||
echo '$$graphingwiki_package = "$(GWIKITARGET)"' > $@ && \
|
||||
echo '$$moin_package = "$(MOINTARGET)"' >> $@ && \
|
||||
echo '$$moin_patch = "moin-$(MOINVERSION).patch"' >> $@
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue