now it works from current directory

git-svn-id: svn+ssh://llin/home/dpavlin/private/svn/BackupPC/trunk@36 8392b6e1-25fa-0310-8288-cc32f8e212ea

diff --git a/xls2conf/Makefile b/xls2conf/Makefile
index 869a446..be172dd 100644 (file)
--- a/xls2conf/Makefile
+++ b/xls2conf/Makefile
@@ -1,6 +1,21 @@
-all:   
+backuppc_data=/data/backuppc/data/
+
+all:
        test -d conf || mkdir conf
        rm conf/* || true
        ./xls2conf.pl analitika.xls
-       cp -f Makefile.install conf/Makefile
-       rsync -rav conf/ 10.210.99.1:conf/
+
+       grep -v asa $(backuppc_data)/conf/hosts > conf/hosts.backuppc.orig
+       cat conf/hosts.backuppc.orig conf/hosts.backuppc > conf/hosts.backuppc.new
+
+       grep -v 10.210.100 /etc/hosts > conf/hosts.orig
+       cat conf/hosts.orig conf/hosts.add > conf/hosts.new
+
+       mv $(backuppc_data)/conf/hosts $(backuppc_data)/conf/hosts.bak
+       mv conf/hosts.backuppc.new $(backuppc_data)/conf/hosts
+       mv /etc/hosts /etc/hosts.bak
+       mv conf/hosts.new /etc/hosts
+
+       cp conf/*.pl $(backuppc_data)/conf/
+
+       /etc/init.d/backuppc reload

diff --git a/xls2conf/Makefile.install b/xls2conf/Makefile.install
deleted file mode 100644 (file)
index 6aae810..0000000
--- a/xls2conf/Makefile.install
+++ /dev/null
@@ -1,17 +0,0 @@
-backuppc_data="/data/backup-data/"
-
-all:
-       grep -v asa $(backuppc_data)/conf/hosts > hosts.backuppc.orig
-       cat hosts.backuppc.orig hosts.backuppc > hosts.backuppc.new
-
-       grep -v 10.210.100 /etc/hosts > hosts.orig
-       cat hosts.orig hosts.add > hosts.new
-
-       mv $(backuppc_data)/conf/hosts $(backuppc_data)/conf/hosts.bak
-       mv hosts.backuppc.new $(backuppc_data)/conf/hosts
-       mv /etc/hosts /etc/hosts.bak
-       mv hosts.new /etc/hosts
-
-       cp *.pl $(backuppc_data)/conf/
-
-       /etc/init.d/backuppc reload