Commit 2783ebda authored by mh's avatar mh
Browse files

add open4 and some other

parent 535c9c97
%if 0%{?_version:1}
%define _verstr %{_version}
%else
%define _verstr 0.0.6
%define _verstr 0.0.9
%endif
# 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
%define gems trocla iuid base32 ip formatador systemu hashdiff open4
%define version_gems1 activerecord --version '~> 4.2.9'
%define version_gems2 actionmailer --version '~> 4.2.9'
# we don't need sinatra oder openoffice in jruby
%define mrionly_gems sinatra roo simpleidn
%define mrionly_gems_version1 pg --version '= 0.20'
# we want the jruby version of pg
%define jrubyonly_gems jruby-pg
%define mrionly_gems sinatra roo simpleidn
%define checkout %(date +%Y%m%d)
......@@ -65,8 +68,10 @@ echo -e "[master]\nconfdir=~/puppet\ncodedir=~/puppetcode" > ~/.puppetlabs/etc/p
%build
export PATH=$PATH:/usr/pgsql-9.6/bin
/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}
/opt/puppetlabs/puppet/bin/gem install --lock --install-dir ./agent_gems --no-ri --no-rdoc -N %{mrionly_gems_version1}
/opt/puppetlabs/puppet/bin/gem install --lock --install-dir ./agent_gems --no-ri --no-rdoc -N %{version_gems1}
/opt/puppetlabs/puppet/bin/gem install --lock --install-dir ./agent_gems --no-ri --no-rdoc -N %{version_gems2}
# so it picks up the right config
export JAVA_BIN=/usr/bin/java
......@@ -78,13 +83,21 @@ export SERVICE_STOP_RETRIES=60
export START_TIMEOUT=300
export RELOAD_TIMEOUT=120
export CLASSPATH=${INSTALL_DIR}/puppet-server-release.jar
export JRUBY_JAR="${JRUBY_JAR:-${INSTALL_DIR}/jruby-1_7.jar}"
export JRUBY_JAR="${JRUBY_JAR:-${INSTALL_DIR}/jruby-9k.jar}"
export CLASSPATH="${CLASSPATH}:${JRUBY_JAR}"
export CONFIG=./server_config
"${JAVA_BIN}" $JAVA_ARGS_CLI -Djava.security.egd=/dev/urandom \
-cp "$CLASSPATH" \
clojure.main -m puppetlabs.puppetserver.cli.gem \
--config ./server_config -- install --lock --install-dir ./server_gems --no-ri --no-rdoc -N %{gems} %{jrubyonly_gems}
"${JAVA_BIN}" $JAVA_ARGS_CLI -Djava.security.egd=/dev/urandom \
-cp "$CLASSPATH" \
clojure.main -m puppetlabs.puppetserver.cli.gem \
--config ./server_config -- install --lock --install-dir ./server_gems --no-ri --no-rdoc -N %{version_gems1}
"${JAVA_BIN}" $JAVA_ARGS_CLI -Djava.security.egd=/dev/urandom \
-cp "$CLASSPATH" \
clojure.main -m puppetlabs.puppetserver.cli.gem \
--config ./server_config -- install --lock --install-dir ./server_gems --no-ri --no-rdoc -N %{version_gems2}
%install
......@@ -106,6 +119,7 @@ done
%{agentdir}/bin/rackup
%{agentdir}/bin/tilt
%{agentdir}/bin/nokogiri
%{agentdir}/bin/erubis
%{agentgemdir}/specifications/*
%{agentgemdir}/extensions/*
%{agentgemdir}/gems/*
......
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