From a8e2a86c9d889df38e64a4b50dc30f19b933f091 Mon Sep 17 00:00:00 2001 From: Florian Heigl Date: Wed, 9 Sep 2015 15:27:35 +0200 Subject: [PATCH 1/2] 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 ff9413863459d056496af503075923295c977bff Mon Sep 17 00:00:00 2001 From: Florian Heigl Date: Wed, 9 Sep 2015 15:34:47 +0200 Subject: [PATCH 2/2] 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='