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

diff --git a/Makefile b/Makefile
index 0c33c67..a69c9df 100644
--- a/Makefile
+++ b/Makefile
@@ -2,14 +2,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
@@ -19,16 +11,16 @@ tags:
 ########## sync
 # 2 forms are supported
 # (*) if your plc root context has direct ssh access:
-# make sync PLC=private.one-lab.org
+# make sync PLC=boot.planet-lab.eu
 # (*) otherwise, entering through the root context
-# make sync PLCHOST=testbox1.inria.fr GUEST=vplc03.inria.fr
+# make sync PLCHOST=testplc.onelab.eu GUEST=vplc03.inria.fr
+
+PLCHOST ?= testplc.onelab.eu
 
 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)
@@ -42,14 +34,15 @@ 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 "  e.g. make sync PLC=boot.planet-lab.eu"
+	@echo "  or   make sync PLCHOST=testplc.onelab.eu GUEST=vplc03.inria.fr"
 	@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 
 endif