From e014176d7be252a9815a22cc0fba9f54a1a9dda1 Mon Sep 17 00:00:00 2001
From: Janek Bevendorff <janek@refining-linux.org>
Date: Fri, 12 Sep 2014 15:34:40 +0200
Subject: [PATCH] Move files and folders from /usr/local to /usr

---
 client/{usr/local => }/bin/rs-backup-run        |   0
 .../etc/rs-backup/client-config.example         |   0
 .../etc/rs-backup/include-files.example         |   0
 server/usr/{local => }/bin/rs-rotate            |   0
 server/usr/{local => }/bin/rs-run-ssh-cmd       |   0
 .../etc/rs-backup/rsnapshot.conf.template       |   0
 .../etc/rs-backup/rsync.conf.template           |   0
 .../etc/rs-backup/server-config.example         |   0
 .../usr/local/etc/rs-backup/.server-config.swp  | Bin 12288 -> 0 bytes
 server/usr/{local => }/sbin/rs-add-ssh-key      |   0
 server/usr/{local => }/sbin/rs-add-user         |   0
 server/usr/{local => }/sbin/rs-rotate-cron      |   0
 server/usr/{local => }/sbin/rs-update-passwd    |   0
 server/usr/{local => }/sbin/spin-down-storage   |   0
 14 files changed, 0 insertions(+), 0 deletions(-)
 rename client/{usr/local => }/bin/rs-backup-run (100%)
 rename client/{usr/local => }/etc/rs-backup/client-config.example (100%)
 rename client/{usr/local => }/etc/rs-backup/include-files.example (100%)
 rename server/usr/{local => }/bin/rs-rotate (100%)
 rename server/usr/{local => }/bin/rs-run-ssh-cmd (100%)
 rename server/usr/{local => }/etc/rs-backup/rsnapshot.conf.template (100%)
 rename server/usr/{local => }/etc/rs-backup/rsync.conf.template (100%)
 rename server/usr/{local => }/etc/rs-backup/server-config.example (100%)
 delete mode 100644 server/usr/local/etc/rs-backup/.server-config.swp
 rename server/usr/{local => }/sbin/rs-add-ssh-key (100%)
 rename server/usr/{local => }/sbin/rs-add-user (100%)
 rename server/usr/{local => }/sbin/rs-rotate-cron (100%)
 rename server/usr/{local => }/sbin/rs-update-passwd (100%)
 rename server/usr/{local => }/sbin/spin-down-storage (100%)

diff --git a/client/usr/local/bin/rs-backup-run b/client/bin/rs-backup-run
similarity index 100%
rename from client/usr/local/bin/rs-backup-run
rename to client/bin/rs-backup-run
diff --git a/client/usr/local/etc/rs-backup/client-config.example b/client/etc/rs-backup/client-config.example
similarity index 100%
rename from client/usr/local/etc/rs-backup/client-config.example
rename to client/etc/rs-backup/client-config.example
diff --git a/client/usr/local/etc/rs-backup/include-files.example b/client/etc/rs-backup/include-files.example
similarity index 100%
rename from client/usr/local/etc/rs-backup/include-files.example
rename to client/etc/rs-backup/include-files.example
diff --git a/server/usr/local/bin/rs-rotate b/server/usr/bin/rs-rotate
similarity index 100%
rename from server/usr/local/bin/rs-rotate
rename to server/usr/bin/rs-rotate
diff --git a/server/usr/local/bin/rs-run-ssh-cmd b/server/usr/bin/rs-run-ssh-cmd
similarity index 100%
rename from server/usr/local/bin/rs-run-ssh-cmd
rename to server/usr/bin/rs-run-ssh-cmd
diff --git a/server/usr/local/etc/rs-backup/rsnapshot.conf.template b/server/usr/etc/rs-backup/rsnapshot.conf.template
similarity index 100%
rename from server/usr/local/etc/rs-backup/rsnapshot.conf.template
rename to server/usr/etc/rs-backup/rsnapshot.conf.template
diff --git a/server/usr/local/etc/rs-backup/rsync.conf.template b/server/usr/etc/rs-backup/rsync.conf.template
similarity index 100%
rename from server/usr/local/etc/rs-backup/rsync.conf.template
rename to server/usr/etc/rs-backup/rsync.conf.template
diff --git a/server/usr/local/etc/rs-backup/server-config.example b/server/usr/etc/rs-backup/server-config.example
similarity index 100%
rename from server/usr/local/etc/rs-backup/server-config.example
rename to server/usr/etc/rs-backup/server-config.example
diff --git a/server/usr/local/etc/rs-backup/.server-config.swp b/server/usr/local/etc/rs-backup/.server-config.swp
deleted file mode 100644
index b5982cdef71f0d207a0a37e2cea66cd2e5c9ed23..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI2L2lDP6hNoIk`@F9;FE5O)L<uR1r-F5lC)Sf4M`k!U`^~vGK%8~Gvh#oxCzJL
z5FmO1*l-6f0N)9;E(@YcY(RgcXG`<v|M~Nl_VnFnUK8%zt}q-|8T<0B)9!x0$oM73
zv{E*kUN-t7j=9zH^^%27YP1upkjIX&p`%T)&%<##b&Sw6p^KqP26DKh2!+W2892Xz
z)DDVwS6QW8a@Pwt;rg}S`D;)H86X2>fDDiUGC&5%02v?y|Fi)+U18tx1Q(Di$jVRf
zMS~2G0Wv@a$N(8217v^<kO4A42FL&z_)iS*h_SUb#$F)V|Nrb8z*l@6BcG5rh(t!n
zL!^Yb$YtahbKWEGkhe%y<2iB<xq*CKW$Xh&gA9-XGC&5%02v?yWPl8i0Wv@a{-S|)
zujSVQ@32*G1dnT-dT`)1J-=Gma^3Q{!1Cd4YtPSx-IH)Wue`mze>N>2&8p^0{vKPD
zZ2w`&>8^{O^G#KD+|zKrbS2l+nS^Z@n_Y*)bkY~vz=R(GkBtJ6MDR-55sWvXxe5EA
zH25&U=Y$UvY12p;Py;Br<t@x_r^<4O<wRNo8>tcC&KD<YF?oxzZo?1e$EsSL3e4#W
z3oqw+Sy`Dxawemc$FR8E4p>DS#`e5}MmMN?ooZnqV_~v(>r#u*Dt!ca_1$ur$Ycn1
zB!GuDS7E*$HnhN7_Hrh`D%h<(deVCubXqOnxu5Ou09(sVRtrvlJk9pl<#>wdWTUJ{
J9{+02upc$@*98Co

diff --git a/server/usr/local/sbin/rs-add-ssh-key b/server/usr/sbin/rs-add-ssh-key
similarity index 100%
rename from server/usr/local/sbin/rs-add-ssh-key
rename to server/usr/sbin/rs-add-ssh-key
diff --git a/server/usr/local/sbin/rs-add-user b/server/usr/sbin/rs-add-user
similarity index 100%
rename from server/usr/local/sbin/rs-add-user
rename to server/usr/sbin/rs-add-user
diff --git a/server/usr/local/sbin/rs-rotate-cron b/server/usr/sbin/rs-rotate-cron
similarity index 100%
rename from server/usr/local/sbin/rs-rotate-cron
rename to server/usr/sbin/rs-rotate-cron
diff --git a/server/usr/local/sbin/rs-update-passwd b/server/usr/sbin/rs-update-passwd
similarity index 100%
rename from server/usr/local/sbin/rs-update-passwd
rename to server/usr/sbin/rs-update-passwd
diff --git a/server/usr/local/sbin/spin-down-storage b/server/usr/sbin/spin-down-storage
similarity index 100%
rename from server/usr/local/sbin/spin-down-storage
rename to server/usr/sbin/spin-down-storage