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

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

Revision: 428
          http://safekeep.svn.sourceforge.net/safekeep/?rev=428&view=rev
Author:   dimi
Date:     2007-03-04 12:13:27 -0800 (Sun, 04 Mar 2007)

Log Message:
-----------
Move the client configuration files in /etc/safekeep/clients.d
Change the extension of client config files to .backup from .client.
Provide automatic migration code for DEB and RPM packages.

Modified Paths:
--------------
    safekeep/trunk/debian/rules
    safekeep/trunk/debian/safekeep-server.dirs
    safekeep/trunk/debian/safekeep-server.postinst
    safekeep/trunk/safekeep
    safekeep/trunk/safekeep.spec.in

Modified: safekeep/trunk/debian/rules
===================================================================
--- safekeep/trunk/debian/rules	2007-03-04 17:52:31 UTC (rev 427)
+++ safekeep/trunk/debian/rules	2007-03-04 20:13:27 UTC (rev 428)
@@ -20,7 +20,7 @@
 	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 -d -m 755 $(CURDIR)/debian/safekeep-server/etc/safekeep.d
+	install -d -m 755 $(CURDIR)/debian/safekeep-server/etc/safekeep/clients.d
 	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-04 17:52:31 UTC (rev 427)
+++ safekeep/trunk/debian/safekeep-server.dirs	2007-03-04 20:13:27 UTC (rev 428)
@@ -1,2 +1,2 @@
 etc/cron.daily
-etc/safekeep.d
+etc/safekeep

Modified: safekeep/trunk/debian/safekeep-server.postinst
===================================================================
--- safekeep/trunk/debian/safekeep-server.postinst	2007-03-04 17:52:31 UTC (rev 427)
+++ safekeep/trunk/debian/safekeep-server.postinst	2007-03-04 20:13:27 UTC (rev 428)
@@ -6,6 +6,14 @@
     configure)
     	adduser --quiet --system --home /var/lib/safekeep safekeep
 	install -d -m 700 -o safekeep -g nogroup /var/lib/safekeep/.ssh
+	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
+	        fi
+	    done
+	    rmdir /etc/safekeep.d 2> /dev/null || true
+	fi
 	;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: safekeep/trunk/safekeep
===================================================================
--- safekeep/trunk/safekeep	2007-03-04 17:52:31 UTC (rev 427)
+++ safekeep/trunk/safekeep	2007-03-04 20:13:27 UTC (rev 428)
@@ -5,8 +5,8 @@
 import xml.dom.minidom
 import socket, smtplib
 
-config_dir = '/etc/safekeep.d'
-config_ext = '.conf'
+config_dir = '/etc/safekeep/clients.d'
+config_ext = '.backup'
 logbuf = []
 is_client = False
 verbosity_level = 1

Modified: safekeep/trunk/safekeep.spec.in
===================================================================
--- safekeep/trunk/safekeep.spec.in	2007-03-04 17:52:31 UTC (rev 427)
+++ safekeep/trunk/safekeep.spec.in	2007-03-04 20:13:27 UTC (rev 428)
@@ -71,7 +71,7 @@
 make build
 
 %install
-install -d -m 755 "%{buildroot}%{_sysconfdir}/safekeep.d"
+install -d -m 755 "%{buildroot}%{_sysconfdir}/safekeep/clients.d"
 install -d -m 755 "%{buildroot}%{_sysconfdir}/cron.daily"
 install -m 755 safekeep.cron "%{buildroot}%{_sysconfdir}/cron.daily/safekeep"
 install -d -m 755 "%{buildroot}%{_bindir}/"
@@ -89,6 +89,16 @@
 %pre server
 %{_sbindir}/useradd -r -d %{homedir} -s /sbin/nologin -u 186 %{name} 2> /dev/null || :
 
+%post server
+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
+        fi
+    done
+    rmdir /etc/safekeep.d 2> /dev/null || :
+fi
+
 %preun server
 if [ "$1" = "0" ]; then
     %{_sbindir}/userdel %{name} >> /dev/null 2>&1 || :
@@ -107,7 +117,7 @@
 %files server
 %attr(750,%{name},%{name}) %dir %{homedir}
 %attr(700,%{name},%{name}) %dir %{homedir}/.ssh
-%dir %{_sysconfdir}/safekeep.d
+%dir %{_sysconfdir}/safekeep
 %config %{_sysconfdir}/cron.daily/safekeep
 %doc safekeep-test sample.conf
 %doc AUTHORS COPYING LICENSE


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