From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Sat, 28 Feb 2015 11:41:17 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.3~74
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=9c374e6720cfd174ed38d25541bb66006f3e2ad2;hp=4d26ed18cf30c1e1dc12be165732486bc9510d84;p=unfold.git

Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
---

diff --git a/Makefile b/Makefile
index 69725db5..80d49c4c 100644
--- a/Makefile
+++ b/Makefile
@@ -110,8 +110,9 @@ ftags: force
 
 #################### sync : push current code on a box running myslice
 # this for now targets deployments based on the debian packaging
-SSHURL:=root@$(MYSLICEBOX):/
-SSHCOMMAND:=ssh root@$(MYSLICEBOX)
+SSHUSER    ?= root
+SSHURL     := $(SSHUSER)@$(MYSLICEBOX):
+SSHCOMMAND := ssh $(SSHUSER)@$(MYSLICEBOX)
 
 ### rsync options
 # the config file should probably not be overridden ??
@@ -163,3 +164,14 @@ ifeq (,$(MYSLICEBOX))
 else
 	+$(SSHCOMMAND) apachectl restart
 endif
+
+#SSHUSER=tparment
+#MYSLICEBOX=srv-diana.inria.fr
+sync-devel:
+ifeq (,$(MYSLICEBOX))
+	@echo "you need to set MYSLICEBOX, like in e.g."
+	@echo "  $(MAKE) MYSLICEBOX=srv-diana.inria.fr "$@""
+	@exit 1
+else
+	+$(RSYNC) --relative $$(git ls-files) $(SSHURL)myslice/
+endif
diff --git a/devel/server-loop.sh b/devel/server-loop.sh
index c77258fc..78e1da15 100755
--- a/devel/server-loop.sh
+++ b/devel/server-loop.sh
@@ -2,9 +2,8 @@
 DIRNAME=$(dirname $0)
 cd $DIRNAME/..
 
-# default port : if hostname starts with z -> use 8080 ; otherwise take 80
-#hostname | grep -q '^z' && port=8080 || port=8080
-hostname | grep -q '^z' && port=8080 || port=80
+# default port : if hostname starts with z or with srv- -> use 8000 ; otherwise take 80
+hostname | egrep -q '^(z|srv-)' && port=8000 || port=80
 [[ -n "$@" ]] && port=$1
 
 while true; do 
diff --git a/sla/urls.py b/sla/urls.py
index e385bafd..676d108c 100755
--- a/sla/urls.py
+++ b/sla/urls.py
@@ -3,10 +3,16 @@ from django.conf.urls import patterns, url, include
 from sla import slicetabsla
 
 urlpatterns = patterns('',
-	url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')),
-	url(r'^testbeds/', slicetabsla.Testbeds.as_view(), name="testbeds"),
-	url(r'^(?P<slicename>[^/]+)/?$', slicetabsla.SLAView.as_view(), name="agreements_summary"),
-	url(r'^agreements/(?P<agreement_id>[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})/detail$', slicetabsla.agreement_details, name='agreement_details'),
-	url(r'^agreements/(?P<agreement_id>[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})/guarantees/(?P<guarantee_name>\w+)/violations$', slicetabsla.agreement_term_violations, name='agreement_term_violations'),
-	url(r'^agreements/simplecreate/?$', slicetabsla.AgreementSimple.as_view(), name="agreementsimple"),
-)
\ No newline at end of file
+	url(r'^api-auth/',
+            include('rest_framework.urls', namespace='rest_framework')),
+	url(r'^testbeds/',
+            slicetabsla.Testbeds.as_view(), name="testbeds"),
+	url(r'^(?P<slicename>[^/]+)/?$',
+            slicetabsla.SLAView.as_view(), name="agreements_summary"),
+	url(r'^agreements/(?P<agreement_id>[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})/detail$',
+            slicetabsla.agreement_details, name='agreement_details'),
+	url(r'^agreements/(?P<agreement_id>[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})/guarantees/(?P<guarantee_name>\w+)/violations$',
+            slicetabsla.agreement_term_violations, name='agreement_term_violations'),
+	url(r'^agreements/simplecreate/?$',
+            slicetabsla.AgreementSimple.as_view(), name="agreementsimple"),
+)