Menu
▾
▴
SF.net SVN: safekeep: [434] safekeep/trunk
|
From: <di...@us...> - 2007-03-07 15:23:11
|
Revision: 434
http://safekeep.svn.sourceforge.net/safekeep/?rev=434&view=rev
Author: dimi
Date: 2007-03-07 07:23:08 -0800 (Wed, 07 Mar 2007)
Log Message:
-----------
Complete the renaming of safekeep.conf.txt into safekeep.backup.txt
Modified Paths:
--------------
safekeep/trunk/Makefile
safekeep/trunk/debian/rules
safekeep/trunk/debian/safekeep-server.docs
safekeep/trunk/doc/safekeep.backup.txt
safekeep/trunk/safekeep.spec.in
Added Paths:
-----------
safekeep/trunk/sample.backup
Removed Paths:
-------------
safekeep/trunk/sample.conf
Modified: safekeep/trunk/Makefile
===================================================================
--- safekeep/trunk/Makefile 2007-03-06 21:15:27 UTC (rev 433)
+++ safekeep/trunk/Makefile 2007-03-07 15:23:08 UTC (rev 434)
@@ -10,8 +10,8 @@
dirname := $(shell basename $(PWD))
rpmroot := $(shell grep '%_topdir' ~/.rpmmacros | sed 's/^[^ \t]*[ \t]*//')
svnroot := $(shell LANG=C svn info | grep Root | cut -c 18-)
-MAN_TXT := doc/safekeep.txt doc/safekeep.conf.txt
-DOC_MAN := doc/safekeep.1 doc/safekeep.conf.5
+MAN_TXT := doc/safekeep.txt doc/safekeep.backup.txt
+DOC_MAN := doc/safekeep.1 doc/safekeep.backup.5
DOC_HTML := $(patsubst %.txt,%.html,$(MAN_TXT))
@@ -78,7 +78,7 @@
install: $(DOC_MAN)
install -m 755 safekeep "/usr/bin/"
install -m 755 doc/safekeep.1 "/usr/share/man/man1/"
- install -m 755 doc/safekeep.conf.5 "/usr/share/man/man5/"
+ install -m 755 doc/safekeep.backup.5 "/usr/share/man/man5/"
if test -d /etc/safekeep.d; then \
for file in /etc/safekeep.d/*.conf; do \
if test -f "$$file"; then \
Modified: safekeep/trunk/debian/rules
===================================================================
--- safekeep/trunk/debian/rules 2007-03-06 21:15:27 UTC (rev 433)
+++ safekeep/trunk/debian/rules 2007-03-07 15:23:08 UTC (rev 434)
@@ -18,7 +18,7 @@
install -d -m 755 $(CURDIR)/debian/safekeep-common/usr/share/man/{man1,man5}
install -m 755 safekeep $(CURDIR)/debian/safekeep-common/usr/bin
install -m 755 doc/safekeep.1 $(CURDIR)/debian/safekeep-common/usr/share/man/man1
- install -m 755 doc/safekeep.conf.5 $(CURDIR)/debian/safekeep-common/usr/share/man/man5
+ install -m 755 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/cron.daily
Modified: safekeep/trunk/debian/safekeep-server.docs
===================================================================
--- safekeep/trunk/debian/safekeep-server.docs 2007-03-06 21:15:27 UTC (rev 433)
+++ safekeep/trunk/debian/safekeep-server.docs 2007-03-07 15:23:08 UTC (rev 434)
@@ -2,4 +2,4 @@
COPYING
LICENSE
safekeep-test
-sample.conf
+sample.backup
Modified: safekeep/trunk/doc/safekeep.backup.txt
===================================================================
--- safekeep/trunk/doc/safekeep.backup.txt 2007-03-06 21:15:27 UTC (rev 433)
+++ safekeep/trunk/doc/safekeep.backup.txt 2007-03-07 15:23:08 UTC (rev 434)
@@ -3,18 +3,18 @@
NAME
----
-safekeep.backup - Configuration file for 'safekeep(1)'
+safekeep.backup - Configuration file for a 'safekeep(1)' client
SYNOPSIS
--------
These files are usually placed in `/etc/safekeep/clients.d/` to be picked
-up automatically be 'safekeep(1)'. They must have a `.conf` extension.
+up automatically by 'safekeep(1)'. They must have a `.backup` extension.
DESCRIPTION
-----------
Each configuration file controls the backup of a host. They are typically
named after the hostname of the machine they control the backup for, and
-have a '.conf' extension (e.g. `mailbox.conf`). These files are written
+have a '.backup' extension (e.g. `mailbox.backup`). These files are written
in XML. Virtually all elements and attributes are optional; if not present,
`safekeep(1)` will provide reasonable, useful defaults.
Modified: safekeep/trunk/safekeep.spec.in
===================================================================
--- safekeep/trunk/safekeep.spec.in 2007-03-06 21:15:27 UTC (rev 433)
+++ safekeep/trunk/safekeep.spec.in 2007-03-07 15:23:08 UTC (rev 434)
@@ -79,7 +79,7 @@
install -d -m 755 "%{buildroot}%{_mandir}/man1/"
install -m 755 doc/safekeep.1 "%{buildroot}%{_mandir}/man1/"
install -d -m 755 "%{buildroot}%{_mandir}/man5/"
-install -m 755 doc/safekeep.conf.5 "%{buildroot}%{_mandir}/man5/"
+install -m 755 doc/safekeep.backup.5 "%{buildroot}%{_mandir}/man5/"
install -d -m 750 "%{buildroot}%{homedir}"
install -d -m 700 "%{buildroot}%{homedir}/.ssh"
@@ -108,7 +108,7 @@
%defattr(-,root,root,-)
%{_bindir}/safekeep
%{_mandir}/man1/safekeep.1*
-%{_mandir}/man5/safekeep.conf.5*
+%{_mandir}/man5/safekeep.backup.5*
%doc AUTHORS COPYING LICENSE README TODO
%files client
@@ -119,7 +119,7 @@
%attr(700,%{name},%{name}) %dir %{homedir}/.ssh
%dir %{_sysconfdir}/safekeep
%config %{_sysconfdir}/cron.daily/safekeep
-%doc safekeep-test sample.conf
+%doc safekeep-test sample.backup
%doc AUTHORS COPYING LICENSE
%changelog
Copied: safekeep/trunk/sample.backup (from rev 425, safekeep/trunk/sample.conf)
===================================================================
--- safekeep/trunk/sample.backup (rev 0)
+++ safekeep/trunk/sample.backup 2007-03-07 15:23:08 UTC (rev 434)
@@ -0,0 +1,55 @@
+<!-- the client backup id -->
+<backup id="my_workstation">
+
+ <!-- the client backup host, the user under which the servers will connect,
+ the SSH keys used for launching "safekeep -c" and "rdiff-backup" -->
+ <host
+ name="my_box.corp.com" user="root"
+ key-ctrl="/home/jdoe/.ssh/backup_id_dsa"
+ key-data="/home/jdoe/.ssh/backup2_id_dsa"
+ />
+
+ <!-- location where the backuped data will be stored on the server
+ and for how long (s=sec, m=min, h=hours, D=days, W=weeks, M=months, or Y=years) -->
+ <repo
+ path="./data"
+ retention="10D"
+ />
+
+ <!-- settings for database dump and for volume snapshot -->
+ <setup>
+
+ <!-- database type ("postgres" or "mysql"), user with backup rights,
+ location of the dump file on the client host, and flag to remove
+ or not the dump file after the backup is done -->
+ <dump
+ type="postgres"
+ db="dbname"
+ user="foobar"
+ file="/var/backup/dumps/mydata"
+ cleanup="true"
+ />
+
+ <!-- what volume is to be snapshoted (device location) and the size
+ of the snapshot (unallocated space must exist in the volume group) -->
+ <snapshot
+ device="/path/to/volume"
+ size="500M"
+ />
+
+ </setup>
+
+ <!-- data to be backuped -->
+ <data>
+ <!-- each type of tag can be present more than one time -->
+ <!-- if a database dump was created, it must be added in this section -->
+ <include path="/home"/>
+ <exclude path="/home/guest"/>
+
+ <include glob="**/important/"/>
+ <exclude glob="/home/*/tmp"/>
+
+ <include regexp=".*\.ogg"/>
+ <exclude regexp=".*\.mp3"/>
+ </data>
+</backup>
Deleted: safekeep/trunk/sample.conf
===================================================================
--- safekeep/trunk/sample.conf 2007-03-06 21:15:27 UTC (rev 433)
+++ safekeep/trunk/sample.conf 2007-03-07 15:23:08 UTC (rev 434)
@@ -1,55 +0,0 @@
-<!-- the client backup id -->
-<backup id="my_workstation">
-
- <!-- the client backup host, the user under which the servers will connect,
- the SSH keys used for launching "safekeep -c" and "rdiff-backup" -->
- <host
- name="my_box.corp.com" user="root"
- key-ctrl="/home/jdoe/.ssh/backup_id_dsa"
- key-data="/home/jdoe/.ssh/backup2_id_dsa"
- />
-
- <!-- location where the backuped data will be stored on the server
- and for how long (s=sec, m=min, h=hours, D=days, W=weeks, M=months, or Y=years) -->
- <repo
- path="./data"
- retention="10D"
- />
-
- <!-- settings for database dump and for volume snapshot -->
- <setup>
-
- <!-- database type ("postgres" or "mysql"), user with backup rights,
- location of the dump file on the client host, and flag to remove
- or not the dump file after the backup is done -->
- <dump
- type="postgres"
- db="dbname"
- user="foobar"
- file="/var/backup/dumps/mydata"
- cleanup="true"
- />
-
- <!-- what volume is to be snapshoted (device location) and the size
- of the snapshot (unallocated space must exist in the volume group) -->
- <snapshot
- device="/path/to/volume"
- size="500M"
- />
-
- </setup>
-
- <!-- data to be backuped -->
- <data>
- <!-- each type of tag can be present more than one time -->
- <!-- if a database dump was created, it must be added in this section -->
- <include path="/home"/>
- <exclude path="/home/guest"/>
-
- <include glob="**/important/"/>
- <exclude glob="/home/*/tmp"/>
-
- <include regexp=".*\.ogg"/>
- <exclude regexp=".*\.mp3"/>
- </data>
-</backup>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
