SF.net SVN: safekeep: [449] safekeep/trunk

[<di...@us...>]

Revision: 449
          http://safekeep.svn.sourceforge.net/safekeep/?rev=449&view=rev
Author:   dimi
Date:     2007-03-08 14:43:05 -0800 (Thu, 08 Mar 2007)

Log Message:
-----------
Install a default safekeep.conf in /etc/safekeep

Modified Paths:
--------------
    safekeep/trunk/Makefile
    safekeep/trunk/debian/rules
    safekeep/trunk/debian/safekeep-server.docs
    safekeep/trunk/safekeep.cron
    safekeep/trunk/safekeep.spec.in

Added Paths:
-----------
    safekeep/trunk/safekeep.conf

Removed Paths:
-------------
    safekeep/trunk/sample.conf

Modified: safekeep/trunk/Makefile
===================================================================
--- safekeep/trunk/Makefile	2007-03-08 21:46:05 UTC (rev 448)
+++ safekeep/trunk/Makefile	2007-03-08 22:43:05 UTC (rev 449)
@@ -77,6 +77,8 @@
 
 install: $(DOC_MAN)
 	install -m 755 safekeep "/usr/bin/"
+	install -d -m 755 "/etc/safekeep/clients.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/"
 	install -m 755 doc/safekeep.backup.5 "/usr/share/man/man5/"

Modified: safekeep/trunk/debian/rules
===================================================================
--- safekeep/trunk/debian/rules	2007-03-08 21:46:05 UTC (rev 448)
+++ safekeep/trunk/debian/rules	2007-03-08 22:43:05 UTC (rev 449)
@@ -22,6 +22,7 @@
 	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 -m 755 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.docs
===================================================================
--- safekeep/trunk/debian/safekeep-server.docs	2007-03-08 21:46:05 UTC (rev 448)
+++ safekeep/trunk/debian/safekeep-server.docs	2007-03-08 22:43:05 UTC (rev 449)
@@ -2,5 +2,4 @@
 COPYING
 LICENSE
 safekeep-test
-sample.conf
 sample.backup

Copied: safekeep/trunk/safekeep.conf (from rev 445, safekeep/trunk/sample.conf)
===================================================================
--- safekeep/trunk/safekeep.conf	                        (rev 0)
+++ safekeep/trunk/safekeep.conf	2007-03-08 22:43:05 UTC (rev 449)
@@ -0,0 +1,17 @@
+# This is a sample file for safekeep(1)
+# The format is similar to Java .properties files:
+#   - lines starting with '#' are ignored
+#   - keys are separated from values by '='
+#   - leading and trailing blanks are ignored
+
+# the user under which the server will run
+backup.user = safekeep
+
+# the base directory for data repository relative paths
+base.dir = /var/lib/safekeep
+
+# a comma separated list of emails to receive the logs
+# ema...@co...,ro...@co...
+
+# a SMTP server to use to deliver email if email.to is non-empty
+# email.smtp.server=mail.company.com

Modified: safekeep/trunk/safekeep.cron
===================================================================
--- safekeep/trunk/safekeep.cron	2007-03-08 21:46:05 UTC (rev 448)
+++ safekeep/trunk/safekeep.cron	2007-03-08 22:43:05 UTC (rev 449)
@@ -2,5 +2,4 @@
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 
-sudo -H -u safekeep safekeep -v --server
-
+safekeep -v --server

Modified: safekeep/trunk/safekeep.spec.in
===================================================================
--- safekeep/trunk/safekeep.spec.in	2007-03-08 21:46:05 UTC (rev 448)
+++ safekeep/trunk/safekeep.spec.in	2007-03-08 22:43:05 UTC (rev 449)
@@ -72,6 +72,7 @@
 
 %install
 install -d -m 755 "%{buildroot}%{_sysconfdir}/safekeep/clients.d"
+install -m 755 safekeep.conf "%{buildroot}%{_sysconfdir}/safekeep/"
 install -d -m 755 "%{buildroot}%{_sysconfdir}/cron.daily"
 install -m 755 safekeep.cron "%{buildroot}%{_sysconfdir}/cron.daily/safekeep"
 install -d -m 755 "%{buildroot}%{_bindir}/"
@@ -120,8 +121,9 @@
 %attr(750,%{name},%{name}) %dir %{homedir}
 %attr(700,%{name},%{name}) %dir %{homedir}/.ssh
 %dir %{_sysconfdir}/safekeep
+%config %{_sysconfdir}/safekeep/safekeep.conf
 %config %{_sysconfdir}/cron.daily/safekeep
-%doc safekeep-test sample.conf sample.backup
+%doc safekeep-test sample.backup
 %doc AUTHORS COPYING LICENSE
 
 %changelog

Deleted: safekeep/trunk/sample.conf
===================================================================
--- safekeep/trunk/sample.conf	2007-03-08 21:46:05 UTC (rev 448)
+++ safekeep/trunk/sample.conf	2007-03-08 22:43:05 UTC (rev 449)
@@ -1,17 +0,0 @@
-# This is a sample file for safekeep(1)
-# The format is similar to Java .properties files:
-#   - lines starting with '#' are ignored
-#   - keys are separated from values by '='
-#   - leading and trailing blanks are ignored
-
-# the user under which the server will run
-# backup.user = safekeep
-
-# the base directory for data repository relative paths
-# base.dir = /var/lib/safekeep
-
-# a comma separated list of emails to receive the logs
-# ema...@co...,ro...@co...
-
-# a SMTP server to use to deliver email if email.to is non-empty
-# email.smtp.server=mail.company.com


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.