From 63807181a5db5d56a9c19c49ce7a4903d739ae72 Mon Sep 17 00:00:00 2001 From: Nikolaus Krismer <nikolaus.krismer@uibk.ac.at> Date: Tue, 12 Jan 2016 12:59:27 +0100 Subject: [PATCH] not starting tomcat on jenknis --- CHANGELOG.md | 1 + Vagrantfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 030ccee..9b0d733 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ Upcoming version: ----------------- + - not starting tomcat on jenknis (Nikolaus Krismer) - added some more options; moved remote cache dir to owncloud (Nikolaus Krismer) - update gradle version (Nikolaus Krismer) - fixed problems with deleting of tables in between srid change (Nikolaus Krismer) diff --git a/Vagrantfile b/Vagrantfile index e8a1b82..a8cb492 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -91,7 +91,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.vm.network :forwarded_port, guest: 7473, host: 7473, id: "neo4j-ssl", auto_correct: false config.vm.network :forwarded_port, guest: 7474, host: 7474, id: "neo4j", auto_correct: false config.vm.network :forwarded_port, guest: 80, host: 8000, id: "httpd", auto_correct: false - unless isLocalDeploy + unless (isLocalDeploy || isJenkinsDeploy) config.vm.network :forwarded_port, guest: 8080, host: 8080, id: "tomcat", auto_correct: false end # config.vm.network :private_network, :ip => '192.168.4.50' -- GitLab