From 9790337016b845d25db044aa7433844720cdf99b Mon Sep 17 00:00:00 2001 From: Steffen Tobias Wagner Date: Sat, 18 Jul 2015 08:48:42 +0000 Subject: [PATCH 1/2] added autossh section --- wiki/event-network-with-replica.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wiki/event-network-with-replica.md b/wiki/event-network-with-replica.md index ff42d21b3b7..ddfa752a679 100644 --- a/wiki/event-network-with-replica.md +++ b/wiki/event-network-with-replica.md @@ -52,6 +52,8 @@ The server is localted behind the ground floor desk in the 19" cabinet. The rout - 1x /24 network for SAP-lounge setup - user: sailing => `/home/sailing/servers/{servers,test}` - Maven: ready to build code under `/home/sailing/code/` +- autossh tunnel: started at replica startup, defined in /etc/rc.local + - redirects ports 1234(ssh), 1235(gwt), 1236(apache) to sapsailing.com where you can redirect the tunnel to your local pc ### Hostnames - the replica should be available as `sailing-demo.sapsailing.com` from every local network @@ -98,4 +100,4 @@ Then, log on as `root` on `sapsailing.com`, go to `/etc/httpd/conf.d` and edit ` - eventually merge other stuff to that branch `git merge origin/branch` - start doing a maven build with `./configuration/buildAndUpdateProduct.sh -t build` - after build is **SUCCESSFULLY FINISHED** install build with `./configuration/buildAndUpdateProduct.sh -s server install` -- now you are able to stop and start sailing instance (be careful with correct replication handling -> see above) +- now you are able to stop and start sailing instance (be careful with correct replication handling -> see above) \ No newline at end of file From 7d951bc1f965ac706bf52d5bbe94797515a9159b Mon Sep 17 00:00:00 2001 From: Frederik Petersen Date: Sat, 18 Jul 2015 11:17:27 +0200 Subject: [PATCH 2/2] Added two boat class names aliases that tractrac used --- .../com/sap/sailing/domain/common/BoatClassMasterdata.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/BoatClassMasterdata.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/BoatClassMasterdata.java index 7c42ded1317..00f6dea47d7 100644 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/BoatClassMasterdata.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/BoatClassMasterdata.java @@ -4,7 +4,7 @@ import com.sap.sailing.domain.common.impl.MeterDistance; public enum BoatClassMasterdata { - _18Footer ("18Footer", true, 8.90, 2.00, BoatHullType.MONOHULL, true, "18.Footer", "18ft", "18ft Skiff"), + _18Footer ("18Footer", true, 8.90, 2.00, BoatHullType.MONOHULL, true, "18.Footer", "18ft", "18ft Skiff", "18. Footer"), _2_4M ("2.4 Meter", true, 4.11, 0.81, BoatHullType.MONOHULL, false, "2.4M", "2.4mR", "2.4 Metre", "2.4-metre"), _5O5 ("5O5", true, 5.03, 1.88, BoatHullType.MONOHULL, true, "505", "5o5", "505er", "5o5er"), _12M ("12 Meter", true, 5.97, 1.43, BoatHullType.MONOHULL, true, "12M", "12mR", "12SQM", "12-metre", "12 metre"), @@ -31,7 +31,7 @@ public enum BoatClassMasterdata { FINN ("Finn", true, 4.50, 1.51, BoatHullType.MONOHULL, false), FLYING_PHANTOM ("Flying Phantom", true, 5.52, 3.00, BoatHullType.CATAMARAN, true), FOLKBOAT ("Folkboat", true, 7.68, 2.20, BoatHullType.MONOHULL, false, "Folke", "Folkeboot"), - FUN ("FUN", true, 7.20, 2.45, BoatHullType.MONOHULL, true, "FUN O.D.", "FUN OD"), + FUN ("FUN", true, 7.20, 2.45, BoatHullType.MONOHULL, true, "FUN O.D.", "FUN OD", "Open FUN"), F_16 ("Formula 16", true, 5.00, 2.50, BoatHullType.CATAMARAN, true, "F16", "F-16"), HOBIE_16 ("Hobie 16", true, 5.05, 2.41, BoatHullType.CATAMARAN, false, "H16"), H_BOAT ("H-Boat", true, 8.28, 2.18, BoatHullType.MONOHULL, true, "HB"),