X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=0b57cd1f21738e13a96dfe070e1a184258c1ce4d;hb=1e0e4007e306ca111f0d538c073fd51380abcd99;hp=0c33c67a484e76c6f30f180149f4c25311bd6ac5;hpb=b670d6e34116c02c134e213dc20ac683851b491f;p=myplc.git

diff --git a/Makefile b/Makefile
index 0c33c67..0b57cd1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,6 @@
-# 
-# $Id$
-#
-
-BINARIES = plc-config plc-config-tty db-config dns-config \
-	clean-empty-dirs.py mtail.py \
-	plc-check-ssl-peering.py plc-map.py plc-kml.py plc-orphan-accounts.py \
-	support-scripts/renew_reminder.py support-scripts/gen_aliases.py 
-INIT_SCRIPTS = api bootcd bootmanager db dns functions gpg httpd mail network packages postgresql ssh ssl
-
-INITS=$(addprefix plc.d/,$(INIT_SCRIPTS))
-
 ##########
 tags:
-	find . -type f | egrep -v '.svn/|~$$' | xargs etags
+	find . -type f | egrep -v '\.git/|~$$' | xargs etags
 
 .PHONY: tags
 
@@ -20,18 +8,16 @@ tags:
 # 2 forms are supported
 # (*) if your plc root context has direct ssh access:
 # make sync PLC=private.one-lab.org
-# (*) otherwise, entering through the root context
-# make sync PLCHOST=testbox1.inria.fr GUEST=vplc03.inria.fr
+# (*) otherwise, for test deployments, use on your testmaster
+# $ run export
+# and cut'n paste the export lines before you run make sync
 
-ifdef GUEST
-ifdef PLCHOST
-SSHURL:=root@$(PLCHOST):/vservers/$(GUEST)
-SSHCOMMAND:=ssh root@$(PLCHOST) vserver $(GUEST)
-endif
-endif
 ifdef PLC
 SSHURL:=root@$(PLC):/
 SSHCOMMAND:=ssh root@$(PLC)
+else
+SSHURL:=root@$(PLCHOSTLXC):/vservers/$(GUESTNAME)/
+SSHCOMMAND:=ssh root@$(PLCHOSTLXC) ssh $(GUESTHOSTNAME)
 endif
 
 LOCAL_RSYNC_EXCLUDES	:= --exclude '*.pyc' 
@@ -41,17 +27,19 @@ 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=private.one-lab.org"
-	@echo "  or   make sync PLCHOST=testbox1.inria.fr 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) plc.init $(SSHURL)/etc/init.d/plc
-	+$(RSYNC) $(BINARIES) $(SSHURL)/usr/bin
-	+$(RSYNC) $(INITS) $(SSHURL)/etc/plc.d
-	+$(RSYNC) plc_config.py $(SSHURL)/usr/lib/python2.5/site-packages/plc_config.py
+	+$(RSYNC) bin/ $(SSHURL)/usr/bin/
+	+$(RSYNC) plc.d/ $(SSHURL)/etc/plc.d/
+	+$(RSYNC) db-config.d/ $(SSHURL)/etc/planetlab/db-config.d/
+	+$(RSYNC) plc_config.py $(SSHURL)/usr/lib\*/python2.\*/site-packages/plc_config.py
 	+$(RSYNC) default_config.xml $(SSHURL)/etc/planetlab/default_config.xml
-	@echo XXXXXXXX you might need to run ssh root@$(PLC) service plc start 
+	@echo XXXXXXXX you might need to run $(SSHCOMMAND) service plc start 
 endif
 
 #################### convenience, for debugging only