From 0e35af9b72ac51dd1b087208b25807c051d6005d Mon Sep 17 00:00:00 2001
From: Nikolaus Krismer <nikolaus.krismer@uibk.ac.at>
Date: Mon, 18 Aug 2014 16:38:34 +0200
Subject: [PATCH] sorted forwared ports by host-port only opening tomcat port
 if not in local test mode (needed to enable vagrant on jenkins)

---
 Vagrantfile             | 6 ++++--
 etc/vagrant/Vagrantfile | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 3451c523..2cf271f6 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -42,8 +42,10 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.provision "shell", path: "etc/vagrant/bootstrap.sh", args: ["niko", "secretPhdPassword#2014!", (isLocalMode ? "true" : "false")]
 
   # Network configuration
-  config.vm.network :forwarded_port, guest: 8080, host: 8080, auto_correct: true, id: "tomcat"
-  config.vm.network :forwarded_port, guest: 7474, host: 7474, auto_correct: true, id: "neo4j"
   config.vm.network :forwarded_port, guest: 5432, host: 5432, auto_correct: true, id: "postgresql"
+  config.vm.network :forwarded_port, guest: 7474, host: 7474, auto_correct: true, id: "neo4j"
   config.vm.network :forwarded_port, guest: 80,   host: 8000, auto_correct: true, id: "httpd"
+  unless isLocalMode
+  	config.vm.network :forwarded_port, guest: 8080, host: 8080, auto_correct: true, id: "tomcat"
+  end
 end
diff --git a/etc/vagrant/Vagrantfile b/etc/vagrant/Vagrantfile
index aee8b0d5..819d8ee2 100644
--- a/etc/vagrant/Vagrantfile
+++ b/etc/vagrant/Vagrantfile
@@ -30,10 +30,10 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.provision "shell", path: "bootstrap.sh"
 
   # Network configuration
-  config.vm.network :forwarded_port, guest: 8080, host: 8080, auto_correct: true, id: "tomcat"
-  config.vm.network :forwarded_port, guest: 7474, host: 7474, auto_correct: true, id: "neo4j"
   config.vm.network :forwarded_port, guest: 5432, host: 5432, auto_correct: true, id: "postgresql"
+  config.vm.network :forwarded_port, guest: 7474, host: 7474, auto_correct: true, id: "neo4j"
   config.vm.network :forwarded_port, guest: 80,   host: 8000, auto_correct: true, id: "httpd"
+  config.vm.network :forwarded_port, guest: 8080, host: 8080, auto_correct: true, id: "tomcat"
 #  config.vm.network :private_network, :ip => '192.168.4.50'
 #  config.vm.network :public_network
 end
-- 
GitLab