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

diff --git a/Makefile b/Makefile
index 69725db..80d49c4 100644 (file)
--- 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 c77258f..78e1da1 100755 (executable)
--- 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 e385baf..676d108 100755 (executable)
--- 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"),
+)