From a8e2a86c9d889df38e64a4b50dc30f19b933f091 Mon Sep 17 00:00:00 2001 From: Florian Heigl Date: Wed, 9 Sep 2015 15:27:35 +0200 Subject: [PATCH 1/5] fix incorrect wrapper path --- ansible/templates/ec2ExistRclocal.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/templates/ec2ExistRclocal.template b/ansible/templates/ec2ExistRclocal.template index ad29854..c18bd1d 100644 --- a/ansible/templates/ec2ExistRclocal.template +++ b/ansible/templates/ec2ExistRclocal.template @@ -9,5 +9,5 @@ EXIST_HOME={{ existLn }} echo 'Starting the eXist native XML database from within /etc/rc.d/rc.local ...' grep 'jetty.port' $EXIST_HOME/tools/jetty/etc/jetty.xml echo 'Stating with the following max memory (MB)' -grep 'wrapper.java.maxmemory' $EXIST_HOME/tools/wrapper/wrapper.conf -/etc/init.d/exist start \ No newline at end of file +grep 'wrapper.java.maxmemory' $EXIST_HOME/tools/wrapper/conf/wrapper.conf +/etc/init.d/exist start From 1801049f409d9e023d9e781a67b986dd090710a4 Mon Sep 17 00:00:00 2001 From: Florian Heigl Date: Wed, 9 Sep 2015 15:29:51 +0200 Subject: [PATCH 2/5] Update ec2ExistRclocal.template --- ansible/templates/ec2ExistRclocal.template | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ansible/templates/ec2ExistRclocal.template b/ansible/templates/ec2ExistRclocal.template index c18bd1d..4addbb8 100644 --- a/ansible/templates/ec2ExistRclocal.template +++ b/ansible/templates/ec2ExistRclocal.template @@ -10,4 +10,10 @@ echo 'Starting the eXist native XML database from within /etc/rc.d/rc.local ...' grep 'jetty.port' $EXIST_HOME/tools/jetty/etc/jetty.xml echo 'Stating with the following max memory (MB)' grep 'wrapper.java.maxmemory' $EXIST_HOME/tools/wrapper/conf/wrapper.conf -/etc/init.d/exist start +# start as service user +su svcexist -c /etc/init.d/exist start + +# add nat rule to forward 8080 to 80. 8080 also accessible with this config. +iptables -A INPUT -i eth0 -p tcp --dport 80 -j ACCEPT +iptables -A INPUT -i eth0 -p tcp --dport 8080 -j ACCEPT +iptables -A PREROUTING -t nat -i eth0 -p tcp --dport 80 -j REDIRECT --to-port 8080 From 1726e2edfeb0b3eed63b2003c46be9b46e0692b6 Mon Sep 17 00:00:00 2001 From: Florian Heigl Date: Wed, 9 Sep 2015 15:34:48 +0200 Subject: [PATCH 3/5] Update installExist.yml blah i hate github --- ansible/playbooks/installExist.yml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/ansible/playbooks/installExist.yml b/ansible/playbooks/installExist.yml index 0f6e2de..7e0cde0 100644 --- a/ansible/playbooks/installExist.yml +++ b/ansible/playbooks/installExist.yml @@ -14,7 +14,6 @@ # add inet.d startup # change sudoer file # sudoer changes -# change port to 80 or make firewall change # memory settings # WHAT ELSE? # @@ -25,7 +24,7 @@ existLn: /usr/local/existlatest existShLn: /usr/local/exist #java_home: /usr/lib/jvm/java - existJettyPort: 80 + existJettyPort: 8080 jettyConfFile: /usr/local/existlatest/tools/jetty/etc/jetty.xml wrapperConfFile: /usr/local/existlatest/tools/wrapper/conf/wrapper.conf # MBytes @@ -49,6 +48,9 @@ - name: test debug: msg="test is successful" when_string: ${buildSuccess.stdout} != 'BUILD SUCCESSFUL' + + - name: add user svcexist + user: name=svcexist - name: install java-1.7.0-openjdk latest version action: yum pkg=java-1.7.0-openjdk state=latest @@ -68,6 +70,12 @@ action: command svn checkout ${existSvnUrl} ${existDir} when_string: ${buildSuccess.stdout} != 'BUILD SUCCESSFUL' + - name: add missing directories + file: dest={{ item }} state=directory + with_items: + - {{ existDir }}/lib/extensions + - {{ existDir }}/extensions/modules/lib + - name: build existdb with javac in this location ${existDir} action: script ../../bash/buildExistdb.sh ${existDir} when_string: ${buildSuccess.stdout} != 'BUILD SUCCESSFUL' @@ -121,4 +129,4 @@ - name: set the jetty wrapper port for http to ${existJettyPort} action: lineinfile backup="yes" dest="${jettyConfFile}" state=present line='' regexp=' Date: Wed, 9 Sep 2015 15:38:05 +0200 Subject: [PATCH 4/5] switch to git as used by exist now --- ansible/playbooks/installExist.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/ansible/playbooks/installExist.yml b/ansible/playbooks/installExist.yml index 7e0cde0..3d1591d 100644 --- a/ansible/playbooks/installExist.yml +++ b/ansible/playbooks/installExist.yml @@ -19,7 +19,7 @@ # - hosts: naked-existdb vars: - existSvnUrl: svn://svn.code.sf.net/p/exist/code/stable/eXist-2.0.x + existgitUrl: https://github.com/eXist-db/exist.git existDir: /usr/local/exist2.0.x existLn: /usr/local/existlatest existShLn: /usr/local/exist @@ -62,13 +62,14 @@ action: yum pkg=ant state=latest when_string: ${buildSuccess.stdout} != 'BUILD SUCCESSFUL' - - name: install svn - action: yum pkg=svn state=present + - name: install git + action: yum pkg=git state=present when_string: ${buildSuccess.stdout} != 'BUILD SUCCESSFUL' - - name: checkout exist-db from svn at ${existSvnUrl} - action: command svn checkout ${existSvnUrl} ${existDir} - when_string: ${buildSuccess.stdout} != 'BUILD SUCCESSFUL' + - git: repo={{ existgitUrl }} + dest={{ existDir }} + version=eXist-2.0.x + when: buildSuccess.stdout != 'BUILD SUCCESSFUL' - name: add missing directories file: dest={{ item }} state=directory From 625d12b9c3f8f37484d3f6db29ce52087e49223c Mon Sep 17 00:00:00 2001 From: Florian Heigl Date: Wed, 9 Sep 2015 15:41:51 +0200 Subject: [PATCH 5/5] Update installExist.yml --- ansible/playbooks/installExist.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/ansible/playbooks/installExist.yml b/ansible/playbooks/installExist.yml index 3d1591d..2ee4e4f 100644 --- a/ansible/playbooks/installExist.yml +++ b/ansible/playbooks/installExist.yml @@ -23,7 +23,7 @@ existDir: /usr/local/exist2.0.x existLn: /usr/local/existlatest existShLn: /usr/local/exist - #java_home: /usr/lib/jvm/java + java_home: /usr/lib/jvm/java-1.7.0-openjdk-amd64 existJettyPort: 8080 jettyConfFile: /usr/local/existlatest/tools/jetty/etc/jetty.xml wrapperConfFile: /usr/local/existlatest/tools/wrapper/conf/wrapper.conf @@ -53,17 +53,14 @@ user: name=svcexist - name: install java-1.7.0-openjdk latest version - action: yum pkg=java-1.7.0-openjdk state=latest - - - name: set alternatives up for java 1.7 openJdk - action: script ../../bash/javaAlternatives.sh + apt: pkg=openjdk-7-jdk state=latest - name: install ant lastest version - action: yum pkg=ant state=latest + apt: pkg=ant state=latest when_string: ${buildSuccess.stdout} != 'BUILD SUCCESSFUL' - name: install git - action: yum pkg=git state=present + apt: pkg=git-core state=present when_string: ${buildSuccess.stdout} != 'BUILD SUCCESSFUL' - git: repo={{ existgitUrl }}