From 6160ff9aa4a088e0d84ebd4971c541354d2e73f0 Mon Sep 17 00:00:00 2001
From: Janek Bevendorff <janek@refining-linux.org>
Date: Fri, 12 Sep 2014 18:26:08 +0200
Subject: [PATCH] Move server config examples and templates from
 /usr/etc/rs-backup to /etc/rs-backup

---
 Makefile                                               | 7 +++++--
 server/{usr => }/etc/rs-backup/rsnapshot.conf.template | 0
 server/{usr => }/etc/rs-backup/rsync.conf.template     | 0
 server/{usr => }/etc/rs-backup/server-config.example   | 0
 4 files changed, 5 insertions(+), 2 deletions(-)
 rename server/{usr => }/etc/rs-backup/rsnapshot.conf.template (100%)
 rename server/{usr => }/etc/rs-backup/rsync.conf.template (100%)
 rename server/{usr => }/etc/rs-backup/server-config.example (100%)

diff --git a/Makefile b/Makefile
index bff2d68..58b8c30 100644
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,7 @@ install: server-install client-install
 
 server-install: $(wildcard server/bkp/etc/*) $(wildcard server/etc/*/*) $(wildcard server/usr/*/*)
 	mkdir -p /etc/rs-skel
+	mkdir -p /etc/rs-backup
 	mkdir -p /bkp/{bin,dev,etc,lib,usr}
 	mkdir -p /bkp/usr/{bin,lib,local,share}
 	
@@ -36,14 +37,16 @@ endif
 		cp -Rv --preserve=mode,timestamps $$i $(addprefix /,$${i/server\//}); \
 	done;
 
-client-install: $(wildcard client/etc/*) $(wildcard client/usr/bin/*)
+client-install: $(wildcard client/etc/*/*) $(wildcard client/usr/bin/*)
+	mkdir -p /etc/rs-backup
+
 	@for i in $+; do \
 		cp -Rv --preserve=mode,timestamps $$i $(addprefix /,$${i/client\//}); \
 	done;
 
 uninstall: server-uninstall client-uninstall
 
-server-uninstall:  $(wildcard server/etc/*/*) server/etc/rs-skel $(wildcard server/usr/*/*)
+server-uninstall:  $(wildcard server/etc/*/*) server/etc/rs-skel server/etc/rs-backup $(wildcard server/usr/*/*)
 	rm -Rf $(addprefix /,$(subst server/,,$+))
 	@echo -e "\e[1mINFO: /bkp not removed to preserve your data. Delete it manually if you don't need it anymore.\e[0m"
 
diff --git a/server/usr/etc/rs-backup/rsnapshot.conf.template b/server/etc/rs-backup/rsnapshot.conf.template
similarity index 100%
rename from server/usr/etc/rs-backup/rsnapshot.conf.template
rename to server/etc/rs-backup/rsnapshot.conf.template
diff --git a/server/usr/etc/rs-backup/rsync.conf.template b/server/etc/rs-backup/rsync.conf.template
similarity index 100%
rename from server/usr/etc/rs-backup/rsync.conf.template
rename to server/etc/rs-backup/rsync.conf.template
diff --git a/server/usr/etc/rs-backup/server-config.example b/server/etc/rs-backup/server-config.example
similarity index 100%
rename from server/usr/etc/rs-backup/server-config.example
rename to server/etc/rs-backup/server-config.example