X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=82ae384473d69f8aa50c0284791a7bdae0b10a56;hb=49ba90c5c9c2d8a7d81db679e709835b227c25bf;hp=3b9e203b8126ded857d42cbd1efd52a9638094d8;hpb=317691fe5e8de0459450c40f977ed12c192aa8c8;p=myplc.git

diff --git a/Makefile b/Makefile
index 3b9e203..82ae384 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 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
@@ -23,12 +15,12 @@ tags:
 # (*) otherwise, entering through the root context
 # make sync PLCHOST=testbox1.inria.fr 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)
@@ -47,8 +39,9 @@ ifeq (,$(SSHURL))
 	@exit 1
 else
 	+$(RSYNC) plc.init $(SSHURL)/etc/init.d/plc
-	+$(RSYNC) $(BINARIES) $(SSHURL)/usr/bin
-	+$(RSYNC) $(INITS) $(SSHURL)/etc/plc.d
+	+$(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.5/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