Commit 535c9c97 authored by mh's avatar mh
Browse files

more gems

parent 8b4d42f1
%if 0%{?_version:1}
%define _verstr %{_version}
%define _verstr 0.0.2
%define _verstr 0.0.6
# puppetserver still runs a ruby 1.9.3 kind JRuby
%define gems trocla iuid base32 ip formatador systemu hashdiff
%define extra_gem1 pg --version=0.18.4
# we want the jruby version of pg
%define jrubyonly_gems jruby-pg
%define mrionly_gems sinatra roo simpleidn
%define checkout %(date +%Y%m%d)
%define agentdir /opt/puppetlabs/puppet
......@@ -21,6 +28,8 @@ BuildRequires: puppet-agent >= 5.0
BuildRequires: puppetserver >= 5.0
BuildRequires: postgresql96
BuildRequires: postgresql96-devel
BuildRequires: libxml2-devel
BuildRequires: libxslt-devel
......@@ -56,7 +65,8 @@ echo -e "[master]\nconfdir=~/puppet\ncodedir=~/puppetcode" > ~/.puppetlabs/etc/p
export PATH=$PATH:/usr/pgsql-9.6/bin
/opt/puppetlabs/puppet/bin/gem install --lock --install-dir ./agent_gems --no-ri --no-rdoc -N trocla iuid base32 ip pg
/opt/puppetlabs/puppet/bin/gem install --lock --install-dir ./agent_gems --no-ri --no-rdoc -N %{extra_gem1}
/opt/puppetlabs/puppet/bin/gem install --lock --install-dir ./agent_gems --no-ri --no-rdoc -N %{gems} %{mrionly_gems}
# so it picks up the right config
export JAVA_BIN=/usr/bin/java
......@@ -74,8 +84,7 @@ export CONFIG=./server_config
-cp "$CLASSPATH" \
clojure.main -m puppetlabs.puppetserver.cli.gem \
--config ./server_config -- install --lock --install-dir ./server_gems --no-ri --no-rdoc -N trocla iuid
--config ./server_config -- install --lock --install-dir ./server_gems --no-ri --no-rdoc -N %{gems} %{jrubyonly_gems}
......@@ -94,6 +103,9 @@ done
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment