Menu
▾
▴
SF.net SVN: safekeep: [456] safekeep/trunk
|
From: <di...@us...> - 2007-03-09 15:28:10
|
Revision: 456
http://safekeep.svn.sourceforge.net/safekeep/?rev=456&view=rev
Author: dimi
Date: 2007-03-09 07:28:02 -0800 (Fri, 09 Mar 2007)
Log Message:
-----------
Rename /etc/safekeep/clients.d to /etc/safekeep/backup.d
Modified Paths:
--------------
safekeep/trunk/Makefile
safekeep/trunk/debian/rules
safekeep/trunk/debian/safekeep-server.dirs
safekeep/trunk/debian/safekeep-server.postinst
safekeep/trunk/doc/safekeep.backup.txt
safekeep/trunk/doc/safekeep.txt
safekeep/trunk/safekeep
safekeep/trunk/safekeep-test
safekeep/trunk/safekeep.spec.in
Modified: safekeep/trunk/Makefile
===================================================================
--- safekeep/trunk/Makefile 2007-03-09 02:35:07 UTC (rev 455)
+++ safekeep/trunk/Makefile 2007-03-09 15:28:02 UTC (rev 456)
@@ -77,7 +77,7 @@
install: $(DOC_MAN)
install -m 755 safekeep "/usr/bin/"
- install -d -m 755 "/etc/safekeep/clients.d/"
+ install -d -m 755 "/etc/safekeep/backup.d/"
install -m 755 safekeep.conf "/etc/safekeep/"
install -m 755 doc/safekeep.1 "/usr/share/man/man1/"
install -m 755 doc/safekeep.conf.5 "/usr/share/man/man5/"
@@ -85,7 +85,7 @@
if test -d /etc/safekeep.d; then \
for file in /etc/safekeep.d/*.conf; do \
if test -f "$$file"; then \
- mv "$$file" /etc/safekeep/clients.d/`basename "$$file" .conf`.backup \
+ mv "$$file" /etc/safekeep/backup.d/`basename "$$file" .conf`.backup \
fi \
done \
rmdir /etc/safekeep.d 2> /dev/null || true \
Modified: safekeep/trunk/debian/rules
===================================================================
--- safekeep/trunk/debian/rules 2007-03-09 02:35:07 UTC (rev 455)
+++ safekeep/trunk/debian/rules 2007-03-09 15:28:02 UTC (rev 456)
@@ -21,7 +21,7 @@
install -m 444 doc/safekeep.conf.5 $(CURDIR)/debian/safekeep-common/usr/share/man/man5
install -m 444 doc/safekeep.backup.5 $(CURDIR)/debian/safekeep-common/usr/share/man/man5
- install -d -m 755 $(CURDIR)/debian/safekeep-server/etc/safekeep/clients.d
+ install -d -m 755 $(CURDIR)/debian/safekeep-server/etc/safekeep/backup.d
install -m 664 safekeep.conf $(CURDIR)/debian/safekeep-server/etc/safekeep
install -d -m 755 $(CURDIR)/debian/safekeep-server/etc/cron.daily
install -m 755 safekeep.cron $(CURDIR)/debian/safekeep-server/etc/cron.daily/safekeep
Modified: safekeep/trunk/debian/safekeep-server.dirs
===================================================================
--- safekeep/trunk/debian/safekeep-server.dirs 2007-03-09 02:35:07 UTC (rev 455)
+++ safekeep/trunk/debian/safekeep-server.dirs 2007-03-09 15:28:02 UTC (rev 456)
@@ -1,3 +1,3 @@
etc/cron.daily
etc/safekeep
-etc/safekeep/clients.d
+etc/safekeep/backup.d
Modified: safekeep/trunk/debian/safekeep-server.postinst
===================================================================
--- safekeep/trunk/debian/safekeep-server.postinst 2007-03-09 02:35:07 UTC (rev 455)
+++ safekeep/trunk/debian/safekeep-server.postinst 2007-03-09 15:28:02 UTC (rev 456)
@@ -9,7 +9,7 @@
if test -d /etc/safekeep.d; then
for file in /etc/safekeep.d/*.conf; do
if test -f "$file"; then
- mv "$file" /etc/safekeep/clients.d/`basename "$file" .conf`.backup
+ mv "$file" /etc/safekeep/backup.d/`basename "$file" .conf`.backup
fi
done
rmdir /etc/safekeep.d 2> /dev/null || true
Modified: safekeep/trunk/doc/safekeep.backup.txt
===================================================================
--- safekeep/trunk/doc/safekeep.backup.txt 2007-03-09 02:35:07 UTC (rev 455)
+++ safekeep/trunk/doc/safekeep.backup.txt 2007-03-09 15:28:02 UTC (rev 456)
@@ -7,7 +7,7 @@
SYNOPSIS
--------
-These files are usually placed in `/etc/safekeep/clients.d/` to be picked
+These files are usually placed in `/etc/safekeep/backup.d/` to be picked
up automatically by 'safekeep(1)'. They must have a `.backup` extension.
DESCRIPTION
@@ -245,7 +245,7 @@
FILES
-----
- /etc/safekeep/clients.d/
+ /etc/safekeep/backup.d/
SEE ALSO
--------
Modified: safekeep/trunk/doc/safekeep.txt
===================================================================
--- safekeep/trunk/doc/safekeep.txt 2007-03-09 02:35:07 UTC (rev 455)
+++ safekeep/trunk/doc/safekeep.txt 2007-03-09 15:28:02 UTC (rev 456)
@@ -111,7 +111,7 @@
CONFIGURATION
-------------
-Normally the configuration files are placed in the `/etc/safekeep/clients.d/`
+Normally the configuration files are placed in the `/etc/safekeep/backup.d/`
directory from where they will get picked up automatically by SafeKeep.
Each backup client is described by a configuration file in XML format.
The minimum configuration file is:
@@ -198,7 +198,7 @@
To do so, you just need to know the directory where the data is actually
stored. In a typical installation, for a box configured via the file
-`/etc/safekeep/clients.d/mybox.backup`, the data will be stored under
+`/etc/safekeep/backup.d/mybox.backup`, the data will be stored under
`/var/lib/safekeep/mybox/`. Please refer to `safekeep.backup(5)` for more
information on this matter.
Modified: safekeep/trunk/safekeep
===================================================================
--- safekeep/trunk/safekeep 2007-03-09 02:35:07 UTC (rev 455)
+++ safekeep/trunk/safekeep 2007-03-09 15:28:02 UTC (rev 456)
@@ -892,7 +892,7 @@
if 'email.to' in props:
email = props['email.to'].split(',')
if len(cfglocs) == 0:
- locs = os.path.join(os.path.dirname(cfgfile), 'clients.d')
+ locs = os.path.join(os.path.dirname(cfgfile), 'backup.d')
if os.path.isdir(locs): cfglocs.append(locs)
if backup_user and backup_user != work_user:
Modified: safekeep/trunk/safekeep-test
===================================================================
--- safekeep/trunk/safekeep-test 2007-03-09 02:35:07 UTC (rev 455)
+++ safekeep/trunk/safekeep-test 2007-03-09 15:28:02 UTC (rev 456)
@@ -119,7 +119,7 @@
def localTest(tmproot):
params = {'tmproot': tmproot, 'args': safekeep_args}
- os.mkdir(os.path.join(tmproot, 'clients.d'))
+ os.mkdir(os.path.join(tmproot, 'backup.d'))
os.mkdir(os.path.join(tmproot, 'client'))
os.mkdir(os.path.join(tmproot, 'client', 'data'))
os.mkdir(os.path.join(tmproot, 'client', 'home'))
@@ -138,7 +138,7 @@
</data>
</backup>
"""
- writefile(os.path.join(tmproot, 'clients.d', 'test.backup'), BACKUP % params)
+ writefile(os.path.join(tmproot, 'backup.d', 'test.backup'), BACKUP % params)
for i in xrange(test_reps):
FILES = (
'data/fileA.out',
@@ -355,7 +355,7 @@
</backup>
""" % (client, key_data, snap_conf)
- writefile('/etc/safekeep/clients.d/test-client.backup', conf, '664', 'w', 'root', server)
+ writefile('/etc/safekeep/backup.d/test-client.backup', conf, '664', 'w', 'root', server)
cmd = 'rm -rf client; mkdir -p client/data'
rcmd(cmd, 'safekeep', server, 'create data repo')
Modified: safekeep/trunk/safekeep.spec.in
===================================================================
--- safekeep/trunk/safekeep.spec.in 2007-03-09 02:35:07 UTC (rev 455)
+++ safekeep/trunk/safekeep.spec.in 2007-03-09 15:28:02 UTC (rev 456)
@@ -71,7 +71,7 @@
make build
%install
-install -d -m 755 "%{buildroot}%{_sysconfdir}/safekeep/clients.d"
+install -d -m 755 "%{buildroot}%{_sysconfdir}/safekeep/backup.d"
install -m 664 safekeep.conf "%{buildroot}%{_sysconfdir}/safekeep/"
install -d -m 755 "%{buildroot}%{_sysconfdir}/cron.daily"
install -m 755 safekeep.cron "%{buildroot}%{_sysconfdir}/cron.daily/safekeep"
@@ -95,7 +95,7 @@
if test -d /etc/safekeep.d; then
for file in /etc/safekeep.d/*.conf; do
if test -f "$file"; then
- mv "$file" /etc/safekeep/clients.d/`basename "$file" .conf`.backup
+ mv "$file" /etc/safekeep/backup.d/`basename "$file" .conf`.backup
fi
done
rmdir /etc/safekeep.d 2> /dev/null || :
@@ -121,7 +121,7 @@
%attr(750,%{name},%{name}) %dir %{homedir}
%attr(700,%{name},%{name}) %dir %{homedir}/.ssh
%dir %{_sysconfdir}/safekeep
-%dir %{_sysconfdir}/safekeep/clients.d
+%dir %{_sysconfdir}/safekeep/backup.d
%config %{_sysconfdir}/safekeep/safekeep.conf
%{_sysconfdir}/cron.daily/safekeep
%doc safekeep-test sample.backup
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
