X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=aa1aed422aed27265b5e48e5f862983e788d483e;hb=HEAD;hp=148a8aa43bbe71e42347706512d1f6dc1f7ad795;hpb=cfc58a2b9e2038ec694d18c2c873141c9de09b35;p=plewww.git

diff --git a/Makefile b/Makefile
index 148a8aa..aa1aed4 100644
--- a/Makefile
+++ b/Makefile
@@ -7,19 +7,24 @@ tags:
 ########## sync
 # 2 forms are supported
 # (*) if your plc root context has direct ssh access:
-# make sync PLC=boot.planet-lab.eu
-# (*) otherwise, entering through the root context
-# make sync PLCHOST=testplc.onelab.eu GUEST=vplc03.inria.fr
+# make sync PLC=private.one-lab.org
+# (*) otherwise, for test deployments, use on your testmaster
+# $ run export
+# and cut'n paste the export lines before you run make sync
 
-PLCHOST ?= testplc.onelab.eu
-
-ifdef GUEST
-SSHURL:=root@$(PLCHOST):/vservers/$(GUEST)
-SSHCOMMAND:=ssh root@$(PLCHOST) vserver $(GUEST)
-endif
 ifdef PLC
 SSHURL:=root@$(PLC):/
 SSHCOMMAND:=ssh root@$(PLC)
+else
+ifdef PLCHOSTLXC
+SSHURL:=root@$(PLCHOSTLXC):/vservers/$(GUESTNAME)
+SSHCOMMAND:=ssh root@$(PLCHOSTLXC) ssh $(GUESTHOSTNAME)
+else
+ifdef PLCHOSTVS
+SSHURL:=root@$(PLCHOSTVS):/vservers/$(GUESTNAME)
+SSHCOMMAND:=ssh root@$(PLCHOSTVS) vserver $(GUESTNAME) exec
+endif
+endif
 endif
 
 LOCAL_RSYNC_EXCLUDES	:= --exclude '*.pyc' 
@@ -29,18 +34,20 @@ RSYNC			:= rsync -a -v $(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES)
 
 sync:
 ifeq (,$(SSHURL))
-	@echo "sync: You must define, either PLC, or PLCHOST & GUEST, on the command line"
-	@echo "  e.g. make sync PLC=boot.planet-lab.eu"
-	@echo "  or   make sync PLCHOST=testplc.onelab.eu GUEST=vplc03.inria.fr"
+	@echo "sync: I need more info from the command line, e.g."
+	@echo "  make sync PLC=boot.planetlab.eu"
+	@echo "  make sync PLCHOSTVS=.. GUESTNAME=.."
+	@echo "  make sync PLCHOSTLXC=.. GUESTNAME=.. GUESTHOSTNAME=.."
 	@exit 1
 else
 	+$(RSYNC) planetlab plekit modules $(SSHURL)/var/www/html/
+	+$(RSYNC) drupal-hacks/*.module $(SSHURL)/var/www/html/modules/
 endif
 
 compress:
 	$(foreach file,\
 		$(shell find . -type f -iname "*.js" | grep -v datepicker.js | grep -v raphael),\
-		$(shell python jsmin.py < $(file) > $(file).new && mv $(file).new $(file)))
+		$(shell python2 jsmin.py < $(file) > $(file).new && mv $(file).new $(file)))
 	@echo "Compressed .js files with jsmin.py"
 
 .PHONY: compress