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

solr: Update pysolr, add requests dependency

Browse source
This commit is contained in:
Ossi Salmi 2013-11-27 08:22:46 +02:00
parent bda0cb174a
commit e952bc4920
2 changed files with 31 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
solr/Makefile
View file

@ -5,12 +5,16 @@ VERSION = 4.5.0
TARGET = solr-$(VERSION).tgz TARGET = solr-$(VERSION).tgz
SOURCE = http://ftp.funet.fi/pub/mirrors/apache.org/lucene/solr/$(VERSION)/solr-$(VERSION).tgz SOURCE = http://ftp.funet.fi/pub/mirrors/apache.org/lucene/solr/$(VERSION)/solr-$(VERSION).tgz
PYSOLRVERSION = 2.0.15 PYSOLRVERSION = 3.1.0
PYSOLRSOURCE = https://pypi.python.org/packages/source/p/pysolr/pysolr-$(PYSOLRVERSION).tar.gz PYSOLRSOURCE = https://pypi.python.org/packages/source/p/pysolr/pysolr-$(PYSOLRVERSION).tar.gz
PYSOLRTARGET = pysolr-$(PYSOLRVERSION).tar.gz PYSOLRTARGET = pysolr-$(PYSOLRVERSION).tar.gz
REQUESTSVERSION = 2.0.1
REQUESTSSOURCE = https://pypi.python.org/packages/source/r/requests/requests-$(REQUESTSVERSION).tar.gz
REQUESTSTARGET = requests-$(REQUESTSVERSION).tar.gz
all: download manifest all: download manifest
download: $(PACKAGES)/$(TARGET) $(PACKAGES)/$(PYSOLRTARGET) download: $(PACKAGES)/$(TARGET) $(PACKAGES)/$(PYSOLRTARGET) $(PACKAGES)/$(REQUESTSTARGET)
manifest: $(MANIFESTS)/solr.pp manifest: $(MANIFESTS)/solr.pp
$(PACKAGES)/$(TARGET): $(PACKAGES)/$(TARGET):
@ -21,7 +25,12 @@ $(PACKAGES)/$(PYSOLRTARGET):
@umask 022; echo $@; \ @umask 022; echo $@; \
test -f $@ || curl -f -o $@ $(PYSOLRSOURCE) test -f $@ || curl -f -o $@ $(PYSOLRSOURCE)
$(MANIFESTS)/solr.pp: $(PACKAGES)/$(TARGET) $(PACKAGES)/$(PYSOLRTARGET) $(PACKAGES)/$(REQUESTSTARGET):
@umask 022; echo $@; \
test -f $@ || curl -f -o $@ $(REQUESTSSOURCE)
$(MANIFESTS)/solr.pp: $(PACKAGES)/$(TARGET) $(PACKAGES)/$(PYSOLRTARGET) $(PACKAGES)/$(REQUESTSTARGET)
@umask 022; echo $@; \ @umask 022; echo $@; \
echo '$$solr_package_latest = "$(TARGET)"' > $@ && \ echo '$$solr_package_latest = "$(TARGET)"' > $@ && \
echo '$$pysolr_package_latest = "$(PYSOLRTARGET)"' >> $@ echo '$$solr_pysolr_package_latest = "$(PYSOLRTARGET)"' >> $@ && \
echo '$$solr_requests_package_latest = "$(REQUESTSTARGET)"' >> $@

23
solr/manifests/init.pp
View file

@ -198,16 +198,29 @@ class solr {
} }
} }
if !$pysolr_package { if !$solr_requests_package {
if $pysolr_package_latest { if $solr_requests_package_latest {
$pysolr_package = $pysolr_package_latest $solr_requests_package = $solr_requests_package_latest
} else { } else {
fail("Must define \$pysolr_package or \$pysolr_package_latest") fail("Must define \$solr_requests_package or \$solr_requests_package_latest")
} }
} }
if !$solr_pysolr_package {
if $solr_pysolr_package_latest {
$solr_pysolr_package = $solr_pysolr_package_latest
} else {
fail("Must define \$solr_pysolr_package or \$solr_pysolr_package_latest")
}
}
python::setup::install { "/usr/local/src/requests":
source => "puppet:///files/packages/${solr_requests_package}",
}
python::setup::install { "/usr/local/src/pysolr": python::setup::install { "/usr/local/src/pysolr":
source => "puppet:///files/packages/${pysolr_package}", source => "puppet:///files/packages/${solr_pysolr_package}",
require => Python::Setup::Install["/usr/local/src/requests"],
} }
} }