Menu
▾
▴
safekeep-commit
|
From: <di...@us...> - 2007-03-07 21:28:12
|
Revision: 441
http://safekeep.svn.sourceforge.net/safekeep/?rev=441&view=rev
Author: dimi
Date: 2007-03-07 13:28:11 -0800 (Wed, 07 Mar 2007)
Log Message:
-----------
Deprecate the ability to specify client config files on the command line
Modified Paths:
--------------
safekeep/trunk/doc/safekeep.txt
safekeep/trunk/safekeep
Modified: safekeep/trunk/doc/safekeep.txt
===================================================================
--- safekeep/trunk/doc/safekeep.txt 2007-03-07 19:13:40 UTC (rev 440)
+++ safekeep/trunk/doc/safekeep.txt 2007-03-07 21:28:11 UTC (rev 441)
@@ -82,13 +82,10 @@
SERVER OPTIONS
--------------
--c, --conf=FILE|DIR::
+-c, --conf=FILE::
Specifies the configuration file location.
- This can be a single file (for a single client configuration)
- or a directory containing several configuration files (one per
- backup client). Can be specified multiple times.
- If not specified at all, SafeKeep will default in non-client mode
- to searching `/etc/safekeep/clients.d/` for configuration files.
+ If not specified at all, SafeKeep will default to
+ `/etc/safekeep/safekeep.conf` if it exists.
Simply using this default is the recommended usage.
KEYS OPTIONS
Modified: safekeep/trunk/safekeep
===================================================================
--- safekeep/trunk/safekeep 2007-03-07 19:13:40 UTC (rev 440)
+++ safekeep/trunk/safekeep 2007-03-07 21:28:11 UTC (rev 441)
@@ -770,7 +770,7 @@
print '--keys launch in keys management mode'
print
print 'common options:'
- print '-c, --conf=FILE|DIR use the given configuration file/directory'
+ print '-c, --conf=FILE use the FILE configuration file'
print '-h, --help show this help message and exit'
print '-q, --quiet decreases the verbosity level'
print '-v, --verbose increases the verbosity level'
@@ -805,6 +805,7 @@
for o, a in opts:
if o in ('-c', '--conf'):
if os.path.isdir(a) or a.endswith(config_ext):
+ warn('Adding client config files/dirs via this switch is deprecated')
cfglocs.append(a)
elif cfgfile is None:
cfgfile = a
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2007-03-07 22:40:10
|
Revision: 442
http://safekeep.svn.sourceforge.net/safekeep/?rev=442&view=rev
Author: dimi
Date: 2007-03-07 14:40:01 -0800 (Wed, 07 Mar 2007)
Log Message:
-----------
Allow for the explicit spcification of an identity file during key management
Modified Paths:
--------------
safekeep/trunk/doc/safekeep.txt
safekeep/trunk/safekeep
Modified: safekeep/trunk/doc/safekeep.txt
===================================================================
--- safekeep/trunk/doc/safekeep.txt 2007-03-07 21:28:11 UTC (rev 441)
+++ safekeep/trunk/doc/safekeep.txt 2007-03-07 22:40:01 UTC (rev 442)
@@ -9,7 +9,7 @@
--------
'safekeep' [--server] [-q] [-v] [-c file] <clientid>*
-'safekeep' --keys [-q] [-v] [-c file] [--status] [--print] [--deploy] <clientid>*
+'safekeep' --keys [-q] [-v] [-c file] [-i file] [--status] [--print] [--deploy] <clientid>*
'safekeep' --client
@@ -90,6 +90,11 @@
KEYS OPTIONS
------------
+-i FILE::
+ Forces `ssh(1)` to use FILE for the identity (private key) in
+ RSA/DSA authentication. If not specified, ssh(1) will use its
+ default indetity files.
+
--status::
Display the key status for the clients. It is implied if no other
option is specified. In effect this option prints the steps that
Modified: safekeep/trunk/safekeep
===================================================================
--- safekeep/trunk/safekeep 2007-03-07 21:28:11 UTC (rev 441)
+++ safekeep/trunk/safekeep 2007-03-07 22:40:01 UTC (rev 442)
@@ -622,7 +622,7 @@
info('------------------------------------------------------------------')
debug('Server backup done')
-def do_keys(cfgs, ids, status, dump, deploy):
+def do_keys(cfgs, ids, identity, status, dump, deploy):
for cfg in cfgs.itervalues():
id = cfg['id']
if ids and id not in ids: continue
@@ -671,8 +671,13 @@
output = '\n'.join(lines)
if dump:
print output
+
+ basessh = 'ssh'
+ if identity: basessh += ' -i %s' % (commands.mkarg(identity))
+
if status or deploy:
- cmd = 'ssh %s@%s "if test -f .ssh/authorized_keys; then cat .ssh/authorized_keys; fi"' % (cfg['user'], cfg['host'])
+ if identity: cmd = "ssh -i %s" % (commands.mkarg(identity))
+ cmd = '%s %s@%s "if test -f .ssh/authorized_keys; then cat .ssh/authorized_keys; fi"' % (basessh, cfg['user'], cfg['host'])
debug(cmd)
out = os.popen(cmd, 'r')
authtext = out.read()
@@ -694,7 +699,7 @@
if status:
print '%s: Keys will be deployed on the client.' % id
if deploy:
- cmd = 'ssh %s@%s "umask 077; test -d .ssh || mkdir .ssh; cat >> .ssh/authorized_keys"' % (cfg['user'], cfg['host'])
+ cmd = '%s %s@%s "umask 077; test -d .ssh || mkdir .ssh; cat >> .ssh/authorized_keys"' % (basessh, cfg['user'], cfg['host'])
debug(cmd)
pipe = os.popen(cmd, 'w')
pipe.write('%s\n' % '\n'.join([key[4] for key in new_keys]))
@@ -777,6 +782,7 @@
print '-V, --version show the version number and exit'
print
print 'keys options:'
+ print '-i FILE use FILE as identity for RSA/DSA authentication'
print '--status display the key status for the clients (default)'
print '--print display the authorization keys'
print '--deploy deploy the authorization keys'
@@ -784,7 +790,7 @@
def main():
try:
- opts, args = getopt.getopt(sys.argv[1:], 'c:e:hs:qvV',
+ opts, args = getopt.getopt(sys.argv[1:], 'c:e:i:hs:qvV',
[ 'conf=', 'client', 'clientid=', 'deploy',
'email=', 'help', 'keys', 'print',
'quiet', 'server', 'smtp=', 'status',
@@ -799,6 +805,7 @@
cfglocs = []
verbosity = 0
clientid = None
+ identity = None
keys_status = None
keys_print = None
keys_deploy = None
@@ -831,6 +838,8 @@
elif o in ('--keys', ):
if mode: usage(2)
mode = 'keys'
+ elif o in ('-i', ):
+ identity = a
elif o in ('--status', ):
keys_status = True
elif o in ('--print', ):
@@ -848,7 +857,7 @@
if mode is None:
mode = 'server'
- if mode is not 'keys' and (keys_status or keys_print or keys_deploy):
+ if mode is not 'keys' and (identity or keys_status or keys_print or keys_deploy):
usage(2)
if mode is not 'server' and (email or smtp):
@@ -901,7 +910,7 @@
verbosity_level = 1 + verbosity
if not keys_status and not keys_print and not keys_deploy:
keys_status = True
- do_keys(cfgs, args, keys_status, keys_print, keys_deploy)
+ do_keys(cfgs, args, identity, keys_status, keys_print, keys_deploy)
else:
assert False, 'Unkown mode: ' + mode
except Exception, ex:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2007-03-08 03:44:21
|
Revision: 443
http://safekeep.svn.sourceforge.net/safekeep/?rev=443&view=rev
Author: dimi
Date: 2007-03-07 19:44:20 -0800 (Wed, 07 Mar 2007)
Log Message:
-----------
Teach safekeep to switch to a given user in server mode.
Controlled via the 'user' property in /etc/safekeep/safekeep.conf
Modified Paths:
--------------
safekeep/trunk/doc/safekeep.conf.txt
safekeep/trunk/safekeep
safekeep/trunk/sample.conf
Modified: safekeep/trunk/doc/safekeep.conf.txt
===================================================================
--- safekeep/trunk/doc/safekeep.conf.txt 2007-03-07 22:40:01 UTC (rev 442)
+++ safekeep/trunk/doc/safekeep.conf.txt 2007-03-08 03:44:20 UTC (rev 443)
@@ -34,6 +34,11 @@
If not specified, `safekeep` will just use
`/usr/sbin/sendmail` to deliver the mail.
+user::
+ The Unix user under which the server will run.
+ If not specified, `safekeep` will just run under the
+ current user.
+
FILES
-----
/etc/safekeep/safekeep.conf
Modified: safekeep/trunk/safekeep
===================================================================
--- safekeep/trunk/safekeep 2007-03-07 22:40:01 UTC (rev 442)
+++ safekeep/trunk/safekeep 2007-03-08 03:44:20 UTC (rev 443)
@@ -799,6 +799,7 @@
usage(2)
mode = None
+ user = None
email = []
smtp = None
cfgfile = None
@@ -874,6 +875,8 @@
props = parse_prop_file(cfgfile)
else:
props = {}
+ if 'user' in props:
+ user = props['user']
if 'email.smtp.server' in props:
smtp = props['email.smtp.server']
if 'email.to' in props:
@@ -895,6 +898,13 @@
ok = False
if not ok: sys.exit(2)
+ if user and mode is not 'keys':
+ import pwd
+ (name, passwd, uid, gid, gecos, dir, shell) = pwd.getpwnam(user)
+ os.setregid(gid, gid)
+ os.setreuid(uid, uid)
+ os.env['HOME'] = dir
+
try:
global is_client, verbosity_level
if mode is 'server':
Modified: safekeep/trunk/sample.conf
===================================================================
--- safekeep/trunk/sample.conf 2007-03-07 22:40:01 UTC (rev 442)
+++ safekeep/trunk/sample.conf 2007-03-08 03:44:20 UTC (rev 443)
@@ -4,6 +4,9 @@
# - keys are separated from values by '='
# - leading and trailing blanks are ignored
+# the user under which the server will run
+# user = safekeep
+
# a comma separated list of emails to receive the logs
# ema...@co...,ro...@co...
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2007-03-08 20:27:17
|
Revision: 444
http://safekeep.svn.sourceforge.net/safekeep/?rev=444&view=rev
Author: dimi
Date: 2007-03-08 12:27:15 -0800 (Thu, 08 Mar 2007)
Log Message:
-----------
Instrument the --keys mode to work with a different backup user.
Rename the property to 'backup.user' instead of just 'user'.
Modified Paths:
--------------
safekeep/trunk/doc/safekeep.conf.txt
safekeep/trunk/safekeep
safekeep/trunk/sample.conf
Modified: safekeep/trunk/doc/safekeep.conf.txt
===================================================================
--- safekeep/trunk/doc/safekeep.conf.txt 2007-03-08 03:44:20 UTC (rev 443)
+++ safekeep/trunk/doc/safekeep.conf.txt 2007-03-08 20:27:15 UTC (rev 444)
@@ -20,6 +20,12 @@
PARAMETERS
----------
+
+backup.user::
+ The Unix user under which the server will run.
+ If not specified, `safekeep` will just run under the
+ current user.
+
email.to::
In addition to writing the session logs
on the standard output, `safekeep` can also send the
@@ -34,11 +40,6 @@
If not specified, `safekeep` will just use
`/usr/sbin/sendmail` to deliver the mail.
-user::
- The Unix user under which the server will run.
- If not specified, `safekeep` will just run under the
- current user.
-
FILES
-----
/etc/safekeep/safekeep.conf
Modified: safekeep/trunk/safekeep
===================================================================
--- safekeep/trunk/safekeep 2007-03-08 03:44:20 UTC (rev 443)
+++ safekeep/trunk/safekeep 2007-03-08 20:27:15 UTC (rev 444)
@@ -2,7 +2,7 @@
import getopt, os, os.path, popen2, re, sys
import commands, tempfile, time, traceback
-import xml.dom.minidom
+import getpass, pwd, xml.dom.minidom
import socket, smtplib
config_dir = '/etc/safekeep'
@@ -10,6 +10,9 @@
logbuf = []
is_client = False
verbosity_level = 1
+work_user = getpass.getuser()
+backup_user = None
+home_dir = None
PROTOCOL = "1.0"
VERSION = "0.9.1"
@@ -186,11 +189,10 @@
host = user = key_ctrl = key_data = None
if host and not user:
user = 'root'
- home = os.getenv('HOME', '/root')
if host and not key_ctrl:
- key_ctrl = os.path.join(home, '.ssh', 'safekeep-server-ctrl-key')
+ key_ctrl = os.path.join(home_dir, '.ssh', 'safekeep-server-ctrl-key')
if host and not key_data:
- key_data = os.path.join(home, '.ssh', 'safekeep-server-data-key')
+ key_data = os.path.join(home_dir, '.ssh', 'safekeep-server-data-key')
repo_el = backup_el.getElementsByTagName('repo')
dir = None
@@ -648,8 +650,9 @@
break
if deploy:
info('%s: Key do not exist, generating it now: %s' % (id, privatekeyfile))
- gencmd = 'ssh-keygen -q -b 1024 -t dsa -N "" -C "SafeKeep auto generated key at %s@%s" -f %s' % \
- (os.getenv('LOGNAME', 'root'), os.uname()[1], privatekeyfile)
+ gencmd = 'ssh-keygen -q -b 1024 -t dsa -N "" -C "SafeKeep auto generated key at %s@%s" -f %s' % (backup_user, os.uname()[1], privatekeyfile)
+ if backup_user is not work_user:
+ gencmd = 'su -c %s - %s' % (commands.mkarg(gencmd), backup_user)
debug(gencmd)
if os.system(gencmd):
error('%s: Failed to generate key %s. Skipping client.' % (id, privatekeyfile))
@@ -676,7 +679,6 @@
if identity: basessh += ' -i %s' % (commands.mkarg(identity))
if status or deploy:
- if identity: cmd = "ssh -i %s" % (commands.mkarg(identity))
cmd = '%s %s@%s "if test -f .ssh/authorized_keys; then cat .ssh/authorized_keys; fi"' % (basessh, cfg['user'], cfg['host'])
debug(cmd)
out = os.popen(cmd, 'r')
@@ -798,8 +800,8 @@
except getopt.GetoptError:
usage(2)
+ global backup_user, home_dir
mode = None
- user = None
email = []
smtp = None
cfgfile = None
@@ -875,8 +877,8 @@
props = parse_prop_file(cfgfile)
else:
props = {}
- if 'user' in props:
- user = props['user']
+ if 'backup.user' in props:
+ backup_user = props['backup.user']
if 'email.smtp.server' in props:
smtp = props['email.smtp.server']
if 'email.to' in props:
@@ -884,7 +886,21 @@
if len(cfglocs) == 0:
locs = os.path.join(config_dir, 'clients.d')
if os.path.isdir(locs): cfglocs.append(locs)
+
+ if backup_user and backup_user != work_user:
+ (user, pswd, uid, gid, gecos, home_dir, shell) = pwd.getpwnam(backup_user)
+ if mode is not 'keys':
+ os.setregid(gid, gid)
+ os.setreuid(uid, uid)
+ os.env['HOME'] = home_dir
+ else:
+ backup_user = work_user
+ home_dir = os.getenv('HOME', '/')
+
+ if len(cfglocs) > 0:
cfgs = parse_locs(cfglocs)
+ else:
+ cfgs = {}
if mode is 'client':
if len(args) > 0: usage(2)
@@ -898,13 +914,6 @@
ok = False
if not ok: sys.exit(2)
- if user and mode is not 'keys':
- import pwd
- (name, passwd, uid, gid, gecos, dir, shell) = pwd.getpwnam(user)
- os.setregid(gid, gid)
- os.setreuid(uid, uid)
- os.env['HOME'] = dir
-
try:
global is_client, verbosity_level
if mode is 'server':
Modified: safekeep/trunk/sample.conf
===================================================================
--- safekeep/trunk/sample.conf 2007-03-08 03:44:20 UTC (rev 443)
+++ safekeep/trunk/sample.conf 2007-03-08 20:27:15 UTC (rev 444)
@@ -5,7 +5,7 @@
# - leading and trailing blanks are ignored
# the user under which the server will run
-# user = safekeep
+# backup.user = safekeep
# a comma separated list of emails to receive the logs
# ema...@co...,ro...@co...
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2007-03-08 20:35:46
|
Revision: 445
http://safekeep.svn.sourceforge.net/safekeep/?rev=445&view=rev
Author: dimi
Date: 2007-03-08 12:35:44 -0800 (Thu, 08 Mar 2007)
Log Message:
-----------
Add property that controls the data repo base dir
Modified Paths:
--------------
safekeep/trunk/doc/safekeep.conf.txt
safekeep/trunk/safekeep
safekeep/trunk/sample.conf
Modified: safekeep/trunk/doc/safekeep.conf.txt
===================================================================
--- safekeep/trunk/doc/safekeep.conf.txt 2007-03-08 20:27:15 UTC (rev 444)
+++ safekeep/trunk/doc/safekeep.conf.txt 2007-03-08 20:35:44 UTC (rev 445)
@@ -26,6 +26,11 @@
If not specified, `safekeep` will just run under the
current user.
+base.dir::
+ The base directory for date repository relative paths.
+ If not specified, it defaults to the home directory
+ of the backup user.
+
email.to::
In addition to writing the session logs
on the standard output, `safekeep` can also send the
Modified: safekeep/trunk/safekeep
===================================================================
--- safekeep/trunk/safekeep 2007-03-08 20:27:15 UTC (rev 444)
+++ safekeep/trunk/safekeep 2007-03-08 20:35:44 UTC (rev 445)
@@ -13,6 +13,7 @@
work_user = getpass.getuser()
backup_user = None
home_dir = None
+base_dir = None
PROTOCOL = "1.0"
VERSION = "0.9.1"
@@ -203,6 +204,7 @@
elif len(repo_el) > 1:
raise ConfigException('Can not have more than a repo element')
if not dir: dir = id
+ dir = os.path.join(base_dir, dir)
setup_el = backup_el.getElementsByTagName('setup')
dumps = []
@@ -800,7 +802,7 @@
except getopt.GetoptError:
usage(2)
- global backup_user, home_dir
+ global backup_user, home_dir, base_dir
mode = None
email = []
smtp = None
@@ -879,6 +881,8 @@
props = {}
if 'backup.user' in props:
backup_user = props['backup.user']
+ if 'base.dir' in props:
+ base_dir = props['base.dir']
if 'email.smtp.server' in props:
smtp = props['email.smtp.server']
if 'email.to' in props:
@@ -897,6 +901,9 @@
backup_user = work_user
home_dir = os.getenv('HOME', '/')
+ if not base_dir:
+ base_dir = home_dir
+
if len(cfglocs) > 0:
cfgs = parse_locs(cfglocs)
else:
Modified: safekeep/trunk/sample.conf
===================================================================
--- safekeep/trunk/sample.conf 2007-03-08 20:27:15 UTC (rev 444)
+++ safekeep/trunk/sample.conf 2007-03-08 20:35:44 UTC (rev 445)
@@ -7,6 +7,9 @@
# 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...
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2007-03-08 22:43:08
|
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.
|
|
From: <di...@us...> - 2007-03-09 01:03:30
|
Revision: 452
http://safekeep.svn.sourceforge.net/safekeep/?rev=452&view=rev
Author: dimi
Date: 2007-03-08 17:03:28 -0800 (Thu, 08 Mar 2007)
Log Message:
-----------
Fix the packages to include the clients.d dir as well
Modified Paths:
--------------
safekeep/trunk/debian/safekeep-server.dirs
safekeep/trunk/safekeep.spec.in
Modified: safekeep/trunk/debian/safekeep-server.dirs
===================================================================
--- safekeep/trunk/debian/safekeep-server.dirs 2007-03-09 00:33:17 UTC (rev 451)
+++ safekeep/trunk/debian/safekeep-server.dirs 2007-03-09 01:03:28 UTC (rev 452)
@@ -1,2 +1,3 @@
etc/cron.daily
etc/safekeep
+etc/safekeep/clients.d
Modified: safekeep/trunk/safekeep.spec.in
===================================================================
--- safekeep/trunk/safekeep.spec.in 2007-03-09 00:33:17 UTC (rev 451)
+++ safekeep/trunk/safekeep.spec.in 2007-03-09 01:03:28 UTC (rev 452)
@@ -121,8 +121,9 @@
%attr(750,%{name},%{name}) %dir %{homedir}
%attr(700,%{name},%{name}) %dir %{homedir}/.ssh
%dir %{_sysconfdir}/safekeep
+%dir %{_sysconfdir}/safekeep/clients.d
%config %{_sysconfdir}/safekeep/safekeep.conf
-%config %{_sysconfdir}/cron.daily/safekeep
+%{_sysconfdir}/cron.daily/safekeep
%doc safekeep-test sample.backup
%doc AUTHORS COPYING LICENSE
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2007-03-09 02:21:37
|
Revision: 454
http://safekeep.svn.sourceforge.net/safekeep/?rev=454&view=rev
Author: dimi
Date: 2007-03-08 18:21:36 -0800 (Thu, 08 Mar 2007)
Log Message:
-----------
Fix permissions
Modified Paths:
--------------
safekeep/trunk/debian/rules
safekeep/trunk/safekeep.spec.in
Modified: safekeep/trunk/debian/rules
===================================================================
--- safekeep/trunk/debian/rules 2007-03-09 01:04:10 UTC (rev 453)
+++ safekeep/trunk/debian/rules 2007-03-09 02:21:36 UTC (rev 454)
@@ -17,12 +17,12 @@
install -d -m 755 $(CURDIR)/debian/safekeep-common/usr/bin
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 -m 444 doc/safekeep.1 $(CURDIR)/debian/safekeep-common/usr/share/man/man1
+ 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 -m 755 safekeep.conf $(CURDIR)/debian/safekeep-server/etc/safekeep
+ 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/safekeep.spec.in
===================================================================
--- safekeep/trunk/safekeep.spec.in 2007-03-09 01:04:10 UTC (rev 453)
+++ safekeep/trunk/safekeep.spec.in 2007-03-09 02:21:36 UTC (rev 454)
@@ -72,16 +72,16 @@
%install
install -d -m 755 "%{buildroot}%{_sysconfdir}/safekeep/clients.d"
-install -m 755 safekeep.conf "%{buildroot}%{_sysconfdir}/safekeep/"
+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"
install -d -m 755 "%{buildroot}%{_bindir}/"
install -m 755 safekeep "%{buildroot}%{_bindir}/"
install -d -m 755 "%{buildroot}%{_mandir}/man1/"
-install -m 755 doc/safekeep.1 "%{buildroot}%{_mandir}/man1/"
+install -m 444 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 -m 444 doc/safekeep.conf.5 "%{buildroot}%{_mandir}/man5/"
+install -m 444 doc/safekeep.backup.5 "%{buildroot}%{_mandir}/man5/"
install -d -m 750 "%{buildroot}%{homedir}"
install -d -m 700 "%{buildroot}%{homedir}/.ssh"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|
|
From: <di...@us...> - 2007-03-13 18:37:19
|
Revision: 466
http://safekeep.svn.sourceforge.net/safekeep/?rev=466&view=rev
Author: dimi
Date: 2007-03-13 11:36:41 -0700 (Tue, 13 Mar 2007)
Log Message:
-----------
Update ANNOUNCE and release changelog
Modified Paths:
--------------
safekeep/trunk/ANNOUNCE
safekeep/trunk/safekeep.spec.in
Modified: safekeep/trunk/ANNOUNCE
===================================================================
--- safekeep/trunk/ANNOUNCE 2007-03-13 17:35:34 UTC (rev 465)
+++ safekeep/trunk/ANNOUNCE 2007-03-13 18:36:41 UTC (rev 466)
@@ -1,30 +1,39 @@
-This is release 0.9.1 of SafeKeep, a centralized and easy to use
+This is release 0.9.2 of SafeKeep, a centralized and easy to use
backup application that combines the best features of a mirror
and an incremental backup.
What's new in this release:
- - Lots of documentation improvements;
- - Prepare the RPMs for Fedora acceptance;
- - Automatic creation of data store directory;
- - A few bug fixes.
+ - Client configuration files have been moved to
+ /etc/safekeep/backup.d, and have the extension '.backup';
+ - A new global configuration file has been added in
+ /etc/safekeep/safekeep.conf;
+ - A number of command line options have been deprecated;
+ (-e/--email, -s/--smtp), and moved to the global configuration.
+ - SafeKeep now knows of the user under which the backup will execute,
+ making it possible to better deploy keys, avoid the need to invoke
+ safekeep(1) via sudo(8), and execute the backup as root if need be;
+ - Relative paths now have more intuitive behaviour;
+ - Some documentation improvements;
+ - Automatic migration of old configuration to the new format;
+ - A CRITICAL (e.g. data loss) race has been fixed.
Because of lags created by using mirrors, this message may reach you before
the release is available at the public sites. Sources and binaries will be
available from the following locations:
- RedHat EL 3,4, CentOS 3,4, Fedora 4,5,6:
- http://prdownloads.sourceforge.net/safekeep/safekeep-common-0.9.1-1.noarch.rpm
- http://prdownloads.sourceforge.net/safekeep/safekeep-client-0.9.1-1.noarch.rpm
- http://prdownloads.sourceforge.net/safekeep/safekeep-server-0.9.1-1.noarch.rpm
- http://prdownloads.sourceforge.net/safekeep/safekeep-0.9.1-1.src.rpm
+ http://prdownloads.sourceforge.net/safekeep/safekeep-common-0.9.2-1.noarch.rpm
+ http://prdownloads.sourceforge.net/safekeep/safekeep-client-0.9.2-1.noarch.rpm
+ http://prdownloads.sourceforge.net/safekeep/safekeep-server-0.9.2-1.noarch.rpm
+ http://prdownloads.sourceforge.net/safekeep/safekeep-0.9.2-1.src.rpm
- Ubuntu Edgy, Dapper, and Breezy:
- http://prdownloads.sourceforge.net/safekeep/safekeep-common_0.9.1_all.deb
- http://prdownloads.sourceforge.net/safekeep/safekeep-client_0.9.1_all.deb
- http://prdownloads.sourceforge.net/safekeep/safekeep-server_0.9.1_all.deb
+ http://prdownloads.sourceforge.net/safekeep/safekeep-common_0.9.2_all.deb
+ http://prdownloads.sourceforge.net/safekeep/safekeep-client_0.9.2_all.deb
+ http://prdownloads.sourceforge.net/safekeep/safekeep-server_0.9.2_all.deb
- Source:
- http://prdownloads.sourceforge.net/safekeep/safekeep-0.9.1.tar.gz
+ http://prdownloads.sourceforge.net/safekeep/safekeep-0.9.2.tar.gz
To find out more about the project visit on our website:
http://safekeep.sourceforge.net
Modified: safekeep/trunk/safekeep.spec.in
===================================================================
--- safekeep/trunk/safekeep.spec.in 2007-03-13 17:35:34 UTC (rev 465)
+++ safekeep/trunk/safekeep.spec.in 2007-03-13 18:36:41 UTC (rev 466)
@@ -128,6 +128,21 @@
%doc AUTHORS COPYING LICENSE
%changelog
+* Tue Mar 13 2007 Dimi Paun <di...@la...> 0.9.2-1
+ - Client configuration files have been moved to
+ /etc/safekeep/backup.d, and have the extension '.backup';
+ - A new global configuration file has been added in
+ /etc/safekeep/safekeep.conf;
+ - A number of command line options have been deprecated;
+ (-e/--email, -s/--smtp), and moved to the global configuration.
+ - SafeKeep now knows of the user under which the backup will execute,
+ making it possible to better deploy keys, avoid the need to invoke
+ safekeep(1) via sudo(8), and execute the backup as root if need be;
+ - Relative paths now have more intuitive behaviour;
+ - Some documentation improvements;
+ - Automatic migration of old configuration to the new format;
+ - A CRITICAL (e.g. data loss) race has been fixed.
+
* Mon Feb 12 2007 Dimi Paun <di...@la...> 0.9.1-1
- Lots of documentation improvements;
- Prepare the RPMs for Fedora acceptance (Jef Spaleta);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2007-04-21 15:19:51
|
Revision: 481
http://safekeep.svn.sourceforge.net/safekeep/?rev=481&view=rev
Author: dimi
Date: 2007-04-21 08:19:50 -0700 (Sat, 21 Apr 2007)
Log Message:
-----------
Switch the default shell for the 'safekeep' account to /bin/bash.
We need it to be able to execute commands as 'safekeep' via su(1).
Also, to help people upgrading, force the shell of already existing
'safekeep' users to /bin/bash. We can remove this in the future
once we know all old users have upgraded to 0.9.3 or later.
Modified Paths:
--------------
safekeep/trunk/debian/control
safekeep/trunk/debian/safekeep-server.postinst
safekeep/trunk/safekeep.spec.in
Modified: safekeep/trunk/debian/control
===================================================================
--- safekeep/trunk/debian/control 2007-04-14 12:45:12 UTC (rev 480)
+++ safekeep/trunk/debian/control 2007-04-21 15:19:50 UTC (rev 481)
@@ -7,7 +7,7 @@
Package: safekeep-server
Architecture: all
-Depends: safekeep-common, rdiff-backup, adduser, ssh-client
+Depends: safekeep-common, rdiff-backup, adduser, chsh, ssh-client
Replaces: safekeep
Description: The server component of the SafeKeep backup system.
SafeKeep is a client/server backup system which enhances the
Modified: safekeep/trunk/debian/safekeep-server.postinst
===================================================================
--- safekeep/trunk/debian/safekeep-server.postinst 2007-04-14 12:45:12 UTC (rev 480)
+++ safekeep/trunk/debian/safekeep-server.postinst 2007-04-21 15:19:50 UTC (rev 481)
@@ -5,6 +5,7 @@
case "$1" in
configure)
adduser --quiet --system --home /var/lib/safekeep safekeep
+ chsh -s /bin/bash safekeep > /dev/null
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
Modified: safekeep/trunk/safekeep.spec.in
===================================================================
--- safekeep/trunk/safekeep.spec.in 2007-04-14 12:45:12 UTC (rev 480)
+++ safekeep/trunk/safekeep.spec.in 2007-04-21 15:19:50 UTC (rev 481)
@@ -52,7 +52,7 @@
%package server
Summary: The SafeKeep backup system (server component)
Group: Applications/System
-Requires(pre): /usr/sbin/useradd
+Requires(pre): /usr/sbin/useradd, /usr/bin/chsh
Requires(unpre):/usr/sbin/userdel
Requires: openssh, openssh-clients
Requires: safekeep-common = %{PACKAGE_VERSION}
@@ -89,7 +89,8 @@
rm -rf "%{buildroot}"
%pre server
-%{_sbindir}/useradd -r -d %{homedir} -s /sbin/nologin -u 186 %{name} 2> /dev/null || :
+%{_sbindir}/useradd -r -d %{homedir} -s /bin/bash -u 186 %{name} 2> /dev/null || :
+%{_bindir}/chsh -s /bin/bash %{name} > /dev/null || :
%post server
if test -d /etc/safekeep.d; then
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2007-05-27 14:42:52
|
Revision: 508
http://safekeep.svn.sourceforge.net/safekeep/?rev=508&view=rev
Author: dimi
Date: 2007-05-27 07:42:48 -0700 (Sun, 27 May 2007)
Log Message:
-----------
The Fedora policy states that we shouldn't delete our user:
http://fedoraproject.org/wiki/PackagingDrafts/UsersAndGroups
Here is the rationale:
We never remove users or groups created by packages. There's
no sane way to check if files owned by those users/groups are
left behind (and even if there would, what would we do to them?),
and leaving those behind with ownerships pointing to now
nonexistent users/groups may result in security issues when a
semantically unrelated user/group is created later and reuses
the UID/GID. Also, in some setups deleting the user/group might
not be possible or/nor desirable (eg. when using a shared remote
user/group database). Cleanup of unused users/groups is left to
the system administrators to take care of if they so desire.
Modified Paths:
--------------
safekeep/trunk/debian/safekeep-server.prerm
safekeep/trunk/safekeep.spec.in
Modified: safekeep/trunk/debian/safekeep-server.prerm
===================================================================
--- safekeep/trunk/debian/safekeep-server.prerm 2007-05-16 15:19:10 UTC (rev 507)
+++ safekeep/trunk/debian/safekeep-server.prerm 2007-05-27 14:42:48 UTC (rev 508)
@@ -4,7 +4,6 @@
case "$1" in
remove|deconfigure)
- deluser safekeep
;;
upgrade)
;;
Modified: safekeep/trunk/safekeep.spec.in
===================================================================
--- safekeep/trunk/safekeep.spec.in 2007-05-16 15:19:10 UTC (rev 507)
+++ safekeep/trunk/safekeep.spec.in 2007-05-27 14:42:48 UTC (rev 508)
@@ -53,7 +53,6 @@
Summary: The SafeKeep backup system (server component)
Group: Applications/System
Requires(pre): /usr/sbin/useradd, /usr/bin/chsh
-Requires(unpre):/usr/sbin/userdel
Requires: openssh, openssh-clients
Requires: safekeep-common = %{PACKAGE_VERSION}
@@ -102,11 +101,6 @@
rmdir /etc/safekeep.d 2> /dev/null || :
fi
-%preun server
-if [ "$1" = "0" ]; then
- %{_sbindir}/userdel %{name} >> /dev/null 2>&1 || :
-fi
-
%files common
%defattr(-,root,root,-)
%{_bindir}/safekeep
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2007-05-28 15:47:23
|
Revision: 513
http://safekeep.svn.sourceforge.net/safekeep/?rev=513&view=rev
Author: dimi
Date: 2007-05-28 08:46:45 -0700 (Mon, 28 May 2007)
Log Message:
-----------
We no longer need to have a working shell for the
safekeep user. Better from a security perspective.
Modified Paths:
--------------
safekeep/trunk/debian/safekeep-server.postinst
safekeep/trunk/safekeep.spec.in
Modified: safekeep/trunk/debian/safekeep-server.postinst
===================================================================
--- safekeep/trunk/debian/safekeep-server.postinst 2007-05-28 15:39:57 UTC (rev 512)
+++ safekeep/trunk/debian/safekeep-server.postinst 2007-05-28 15:46:45 UTC (rev 513)
@@ -5,7 +5,6 @@
case "$1" in
configure)
adduser --quiet --system --home /var/lib/safekeep safekeep
- chsh -s /bin/bash safekeep > /dev/null
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
Modified: safekeep/trunk/safekeep.spec.in
===================================================================
--- safekeep/trunk/safekeep.spec.in 2007-05-28 15:39:57 UTC (rev 512)
+++ safekeep/trunk/safekeep.spec.in 2007-05-28 15:46:45 UTC (rev 513)
@@ -92,9 +92,8 @@
%pre server
%{_sbindir}/groupadd -f -r %{name}
id %{name} >/dev/null 2>&1 || \
-%{_sbindir}/useradd -r -g %{name} -d %{homedir} -s /bin/bash \
+%{_sbindir}/useradd -r -g %{name} -d %{homedir} -s /sbin/nologin \
-c "Used by safekeep to run backups." %{name}
-%{_bindir}/chsh -s /bin/bash %{name} > /dev/null || :
%post server
if test -d /etc/safekeep.d; then
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2007-06-08 19:46:57
|
Revision: 517
http://safekeep.svn.sourceforge.net/safekeep/?rev=517&view=rev
Author: dimi
Date: 2007-06-08 12:46:56 -0700 (Fri, 08 Jun 2007)
Log Message:
-----------
Do not package safekeep-test, it's useful only during
development, and creates all sort of rpm-lint errors.
Modified Paths:
--------------
safekeep/trunk/debian/safekeep-server.docs
safekeep/trunk/safekeep.spec.in
Modified: safekeep/trunk/debian/safekeep-server.docs
===================================================================
--- safekeep/trunk/debian/safekeep-server.docs 2007-05-29 04:30:35 UTC (rev 516)
+++ safekeep/trunk/debian/safekeep-server.docs 2007-06-08 19:46:56 UTC (rev 517)
@@ -1,5 +1,4 @@
AUTHORS
COPYING
LICENSE
-safekeep-test
sample.backup
Modified: safekeep/trunk/safekeep.spec.in
===================================================================
--- safekeep/trunk/safekeep.spec.in 2007-05-29 04:30:35 UTC (rev 516)
+++ safekeep/trunk/safekeep.spec.in 2007-06-08 19:46:56 UTC (rev 517)
@@ -122,7 +122,7 @@
%dir %{_sysconfdir}/safekeep/backup.d
%config %{_sysconfdir}/safekeep/safekeep.conf
%{_sysconfdir}/cron.daily/safekeep
-%doc safekeep-test sample.backup
+%doc sample.backup
%doc AUTHORS COPYING LICENSE
%changelog
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2007-06-08 20:39:01
|
Revision: 518
http://safekeep.svn.sourceforge.net/safekeep/?rev=518&view=rev
Author: dimi
Date: 2007-06-08 13:38:56 -0700 (Fri, 08 Jun 2007)
Log Message:
-----------
Remove configuration migration code, it shouldn't be
necessary anymore now that we reached 1.0.
Besides it triggers rpm-lint errors.
Modified Paths:
--------------
safekeep/trunk/Makefile
safekeep/trunk/debian/safekeep-server.postinst
safekeep/trunk/safekeep.spec.in
Modified: safekeep/trunk/Makefile
===================================================================
--- safekeep/trunk/Makefile 2007-06-08 19:46:56 UTC (rev 517)
+++ safekeep/trunk/Makefile 2007-06-08 20:38:56 UTC (rev 518)
@@ -87,14 +87,6 @@
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 \
- mv "$$file" /etc/safekeep/backup.d/`basename "$$file" .conf`.backup \
- fi \
- done \
- rmdir /etc/safekeep.d 2> /dev/null || true \
- fi
tar:
svn export -r {'$(timestamp_svn)'} $(svnroot)/safekeep/trunk $(snapshotname)
Modified: safekeep/trunk/debian/safekeep-server.postinst
===================================================================
--- safekeep/trunk/debian/safekeep-server.postinst 2007-06-08 19:46:56 UTC (rev 517)
+++ safekeep/trunk/debian/safekeep-server.postinst 2007-06-08 20:38:56 UTC (rev 518)
@@ -6,14 +6,6 @@
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/backup.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.spec.in
===================================================================
--- safekeep/trunk/safekeep.spec.in 2007-06-08 19:46:56 UTC (rev 517)
+++ safekeep/trunk/safekeep.spec.in 2007-06-08 20:38:56 UTC (rev 518)
@@ -94,16 +94,6 @@
%{_sbindir}/useradd -r -g %{name} -d %{homedir} -s /sbin/nologin \
-c "Used by safekeep to run backups." %{name}
-%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/backup.d/`basename "$file" .conf`.backup
- fi
- done
- rmdir /etc/safekeep.d 2> /dev/null || :
-fi
-
%files common
%defattr(-,root,root,-)
%{_bindir}/safekeep
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2007-06-08 21:55:44
|
Revision: 520
http://safekeep.svn.sourceforge.net/safekeep/?rev=520&view=rev
Author: dimi
Date: 2007-06-08 14:55:43 -0700 (Fri, 08 Jun 2007)
Log Message:
-----------
Move the man pages for .backup and .conf to the server package.
Modified Paths:
--------------
safekeep/trunk/debian/rules
safekeep/trunk/safekeep.spec.in
Modified: safekeep/trunk/debian/rules
===================================================================
--- safekeep/trunk/debian/rules 2007-06-08 21:49:40 UTC (rev 519)
+++ safekeep/trunk/debian/rules 2007-06-08 21:55:43 UTC (rev 520)
@@ -16,11 +16,11 @@
install -d -m 755 $(CURDIR)/debian/safekeep-common/usr/bin
install -d -m 755 $(CURDIR)/debian/safekeep-common/usr/share/man/man1
- install -d -m 755 $(CURDIR)/debian/safekeep-common/usr/share/man/man5
+ install -d -m 755 $(CURDIR)/debian/safekeep-server/usr/share/man/man5
install -m 755 safekeep $(CURDIR)/debian/safekeep-common/usr/bin
install -m 444 doc/safekeep.1 $(CURDIR)/debian/safekeep-common/usr/share/man/man1
- 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 -m 444 doc/safekeep.conf.5 $(CURDIR)/debian/safekeep-server/usr/share/man/man5
+ install -m 444 doc/safekeep.backup.5 $(CURDIR)/debian/safekeep-server/usr/share/man/man5
install -d -m 755 $(CURDIR)/debian/safekeep-server/etc/safekeep/backup.d
install -m 664 safekeep.conf $(CURDIR)/debian/safekeep-server/etc/safekeep
Modified: safekeep/trunk/safekeep.spec.in
===================================================================
--- safekeep/trunk/safekeep.spec.in 2007-06-08 21:49:40 UTC (rev 519)
+++ safekeep/trunk/safekeep.spec.in 2007-06-08 21:55:43 UTC (rev 520)
@@ -98,8 +98,6 @@
%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
@@ -112,6 +110,8 @@
%dir %{_sysconfdir}/safekeep/backup.d
%config %{_sysconfdir}/safekeep/safekeep.conf
%{_sysconfdir}/cron.daily/safekeep
+%{_mandir}/man5/safekeep.conf.5*
+%{_mandir}/man5/safekeep.backup.5*
%doc sample.backup
%doc AUTHORS COPYING LICENSE
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2007-06-10 23:02:59
|
Revision: 524
http://safekeep.svn.sourceforge.net/safekeep/?rev=524&view=rev
Author: dimi
Date: 2007-06-10 16:02:54 -0700 (Sun, 10 Jun 2007)
Log Message:
-----------
Adjust the test to support also Fedora 7, which
includes the distro id automatically in the generated
rpm names.
Modified Paths:
--------------
safekeep/trunk/safekeep-test
Property Changed:
----------------
safekeep/trunk/
Property changes on: safekeep/trunk
___________________________________________________________________
Name: svn:ignore
+ releases
Modified: safekeep/trunk/safekeep-test
===================================================================
--- safekeep/trunk/safekeep-test 2007-06-08 22:11:59 UTC (rev 523)
+++ safekeep/trunk/safekeep-test 2007-06-10 23:02:54 UTC (rev 524)
@@ -1,6 +1,6 @@
#!/usr/bin/python
-import getopt, os, os.path, re, shutil, socket, sys
+import getopt, glob, os, os.path, re, shutil, socket, sys
import commands, random, time, tempfile, traceback
from commands import mkarg
@@ -265,24 +265,22 @@
raise TestFailure('Failed to nuke the tar')
ver = mytar[len('safekeep-'):-len('.tar.gz')]
- binrpm_common = os.path.join(pkgroot, 'RPMS/noarch', 'safekeep-common-' + ver + '-1.noarch.rpm')
- binrpm_client = os.path.join(pkgroot, 'RPMS/noarch', 'safekeep-client-' + ver + '-1.noarch.rpm')
- binrpm_server = os.path.join(pkgroot, 'RPMS/noarch', 'safekeep-server-' + ver + '-1.noarch.rpm')
+ binrpm_list = glob.glob(os.path.join(pkgroot, 'RPMS/noarch', 'safekeep-*-' + ver + '-1*.noarch.rpm'))
- for binrpm in (binrpm_common, binrpm_client, binrpm_server):
+ for binrpm in binrpm_list:
if not os.path.isfile(binrpm):
raise TestFailure('Failed to find binary rpm: %s' % binrpm)
if sign_packages:
- cmd = 'rpm --define %s --addsign %s %s %s' % \
- (mkarg('_gpg_name ' + keyname), binrpm_common, binrpm_client, binrpm_server)
+ cmd = 'rpm --define %s --addsign %s' % \
+ (mkarg('_gpg_name ' + keyname), ' '.join(binrpm_list))
print cmd
if os.system(cmd):
raise TestFailure('Failed to sign rpms')
for repodir in repodirs:
- cmd = '%s %s %s %s %s@%s:%s/noarch' % \
- (mkssh('scp'), binrpm_common, binrpm_client, binrpm_server, user, host, repodir)
+ cmd = '%s %s %s@%s:%s/noarch' % \
+ (mkssh('scp'), ' '.join(binrpm_list), user, host, repodir)
print cmd
if os.system(cmd):
raise TestFailure('Failed to copy safekee-*-%s-1.noarch.rpm to the repository' % ver)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2007-06-17 22:36:57
|
Revision: 527
http://safekeep.svn.sourceforge.net/safekeep/?rev=527&view=rev
Author: dimi
Date: 2007-06-17 15:36:53 -0700 (Sun, 17 Jun 2007)
Log Message:
-----------
Prepare announcement for version 1.0.1.
Modified Paths:
--------------
safekeep/trunk/ANNOUNCE
safekeep/trunk/safekeep.spec.in
Modified: safekeep/trunk/ANNOUNCE
===================================================================
--- safekeep/trunk/ANNOUNCE 2007-06-11 04:00:18 UTC (rev 526)
+++ safekeep/trunk/ANNOUNCE 2007-06-17 22:36:53 UTC (rev 527)
@@ -1,28 +1,31 @@
-This is release 1.0.0 of SafeKeep, a centralized and easy to use
+This is release 1.0.1 of SafeKeep, a centralized and easy to use
backup application that combines the best features of a mirror
and an incremental backup.
What's new in this release:
- - Tested support for database (MySQL and PostgreSQL) dumps
- - Small documentation improvements.
+ - The safekeep user no longer requires a working shell
+ - Add support for Fedora 7 to the testing script
+ - Packaging improvements for integration into Fedora
+ - Remove the old configuration migration scripts
+ - Do not package the testing script, it's used only during development
Because of lags created by using mirrors, this message may reach you before
the release is available at the public sites. Sources and binaries will be
available from the following locations:
- RedHat EL 3,4,5, CentOS 3,4,5, Fedora 4,5,6:
- http://prdownloads.sourceforge.net/safekeep/safekeep-common-1.0.0-1.noarch.rpm
- http://prdownloads.sourceforge.net/safekeep/safekeep-client-1.0.0-1.noarch.rpm
- http://prdownloads.sourceforge.net/safekeep/safekeep-server-1.0.0-1.noarch.rpm
- http://prdownloads.sourceforge.net/safekeep/safekeep-1.0.0-1.src.rpm
+ http://prdownloads.sourceforge.net/safekeep/safekeep-common-1.0.1-1.noarch.rpm
+ http://prdownloads.sourceforge.net/safekeep/safekeep-client-1.0.1-1.noarch.rpm
+ http://prdownloads.sourceforge.net/safekeep/safekeep-server-1.0.1-1.noarch.rpm
+ http://prdownloads.sourceforge.net/safekeep/safekeep-1.0.1-1.src.rpm
- Ubuntu Edgy, Dapper, and Breezy:
- http://prdownloads.sourceforge.net/safekeep/safekeep-common_1.0.0_all.deb
- http://prdownloads.sourceforge.net/safekeep/safekeep-client_1.0.0_all.deb
- http://prdownloads.sourceforge.net/safekeep/safekeep-server_1.0.0_all.deb
+ http://prdownloads.sourceforge.net/safekeep/safekeep-common_1.0.1_all.deb
+ http://prdownloads.sourceforge.net/safekeep/safekeep-client_1.0.1_all.deb
+ http://prdownloads.sourceforge.net/safekeep/safekeep-server_1.0.1_all.deb
- Source:
- http://prdownloads.sourceforge.net/safekeep/safekeep-1.0.0.tar.gz
+ http://prdownloads.sourceforge.net/safekeep/safekeep-1.0.1.tar.gz
To find out more about the project visit on our website:
http://safekeep.sourceforge.net
Modified: safekeep/trunk/safekeep.spec.in
===================================================================
--- safekeep/trunk/safekeep.spec.in 2007-06-11 04:00:18 UTC (rev 526)
+++ safekeep/trunk/safekeep.spec.in 2007-06-17 22:36:53 UTC (rev 527)
@@ -116,6 +116,13 @@
%doc AUTHORS COPYING LICENSE
%changelog
+* Sun Jun 17 2007 Dimi Paun <di...@la...> 1.0.1-1
+ - The safekeep user no longer requires a working shell
+ - Add support for Fedora 7 to the testing script
+ - Packaging improvements for integration into Fedora
+ - Remove the old configuration migration scripts
+ - Do not package the testing script, it's used only during development
+
* Wed May 16 2007 Dimi Paun <di...@la...> 1.0.0-1
- Small documentation inprovements.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2007-09-07 16:40:56
|
Revision: 543
http://safekeep.svn.sourceforge.net/safekeep/?rev=543&view=rev
Author: dimi
Date: 2007-09-07 09:40:54 -0700 (Fri, 07 Sep 2007)
Log Message:
-----------
Prepare for 1.0.2.
Modified Paths:
--------------
safekeep/trunk/ANNOUNCE
safekeep/trunk/safekeep
safekeep/trunk/safekeep.spec.in
Modified: safekeep/trunk/ANNOUNCE
===================================================================
--- safekeep/trunk/ANNOUNCE 2007-09-07 03:15:22 UTC (rev 542)
+++ safekeep/trunk/ANNOUNCE 2007-09-07 16:40:54 UTC (rev 543)
@@ -1,31 +1,27 @@
-This is release 1.0.1 of SafeKeep, a centralized and easy to use
+This is release 1.0.2 of SafeKeep, a centralized and easy to use
backup application that combines the best features of a mirror
and an incremental backup.
What's new in this release:
- - The safekeep user no longer requires a working shell
- - Add support for Fedora 7 to the testing script
- - Packaging improvements for integration into Fedora
- - Remove the old configuration migration scripts
- - Do not package the testing script, it's used only during development
+ - Yet more packaging improvements for integration into Fedora
Because of lags created by using mirrors, this message may reach you before
the release is available at the public sites. Sources and binaries will be
available from the following locations:
- RedHat EL 3,4,5, CentOS 3,4,5, Fedora 4,5,6,7:
- http://prdownloads.sourceforge.net/safekeep/safekeep-common-1.0.1-1.noarch.rpm
- http://prdownloads.sourceforge.net/safekeep/safekeep-client-1.0.1-1.noarch.rpm
- http://prdownloads.sourceforge.net/safekeep/safekeep-server-1.0.1-1.noarch.rpm
- http://prdownloads.sourceforge.net/safekeep/safekeep-1.0.1-1.src.rpm
+ http://prdownloads.sourceforge.net/safekeep/safekeep-common-1.0.2-1.noarch.rpm
+ http://prdownloads.sourceforge.net/safekeep/safekeep-client-1.0.2-1.noarch.rpm
+ http://prdownloads.sourceforge.net/safekeep/safekeep-server-1.0.2-1.noarch.rpm
+ http://prdownloads.sourceforge.net/safekeep/safekeep-1.0.2-1.src.rpm
- Ubuntu Edgy, Dapper, and Breezy:
- http://prdownloads.sourceforge.net/safekeep/safekeep-common_1.0.1_all.deb
- http://prdownloads.sourceforge.net/safekeep/safekeep-client_1.0.1_all.deb
- http://prdownloads.sourceforge.net/safekeep/safekeep-server_1.0.1_all.deb
+ http://prdownloads.sourceforge.net/safekeep/safekeep-common_1.0.2_all.deb
+ http://prdownloads.sourceforge.net/safekeep/safekeep-client_1.0.2_all.deb
+ http://prdownloads.sourceforge.net/safekeep/safekeep-server_1.0.2_all.deb
- Source:
- http://prdownloads.sourceforge.net/safekeep/safekeep-1.0.1.tar.gz
+ http://prdownloads.sourceforge.net/safekeep/safekeep-1.0.2.tar.gz
To find out more about the project visit on our website:
http://safekeep.sourceforge.net
Modified: safekeep/trunk/safekeep
===================================================================
--- safekeep/trunk/safekeep 2007-09-07 03:15:22 UTC (rev 542)
+++ safekeep/trunk/safekeep 2007-09-07 16:40:54 UTC (rev 543)
@@ -16,7 +16,7 @@
base_dir = None
PROTOCOL = "1.0"
-VERSION = "1.0.1"
+VERSION = "1.0.2"
VEBOSITY_BY_CLASS = {'DBG': 3, 'INFO': 2, 'WARN': 1, 'ERR': 0}
######################################################################
Modified: safekeep/trunk/safekeep.spec.in
===================================================================
--- safekeep/trunk/safekeep.spec.in 2007-09-07 03:15:22 UTC (rev 542)
+++ safekeep/trunk/safekeep.spec.in 2007-09-07 16:40:54 UTC (rev 543)
@@ -15,7 +15,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-BuildRequires: xmlto, asciidoc > 6.0.3
+BuildRequires: xmlto, asciidoc > 6.0.3
%description
SafeKeep is a client/server backup system which enhances the
@@ -71,6 +71,7 @@
make build
%install
+rm -rf %{buildroot}
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"
@@ -116,6 +117,16 @@
%doc sample.backup
%changelog
+* Fri Sep 7 2007 Dimi Paun <di...@la...> 1.0.2-1
+ - Add missing buildroot removal in install section (Jeff Spaleta)
+ - Remove references to %{PACKAGE_VERSION}, follow the Fedora
+ guidelines closer.
+ - Provide default attr for all packages.
+ - Clarify the licensing in .rpm package.
+ - We don't need to include AUTHORS COPYING LICENSE multiple times,
+ keeping them in -common is enough.
+ - More acceptable SF link.
+
* Sun Jun 17 2007 Dimi Paun <di...@la...> 1.0.1-1
- The safekeep user no longer requires a working shell
- Add support for Fedora 7 to the testing script
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st...@us...> - 2007-10-09 11:44:02
|
Revision: 547
http://safekeep.svn.sourceforge.net/safekeep/?rev=547&view=rev
Author: stelian
Date: 2007-10-09 04:43:58 -0700 (Tue, 09 Oct 2007)
Log Message:
-----------
Implement --force to handle the unexpected.
Modified Paths:
--------------
safekeep/trunk/doc/safekeep.txt
safekeep/trunk/safekeep
Modified: safekeep/trunk/doc/safekeep.txt
===================================================================
--- safekeep/trunk/doc/safekeep.txt 2007-09-08 06:06:59 UTC (rev 546)
+++ safekeep/trunk/doc/safekeep.txt 2007-10-09 11:43:58 UTC (rev 547)
@@ -7,7 +7,7 @@
SYNOPSIS
--------
-'safekeep' [--server] [-q] [-v] [-c file] <clientid>*
+'safekeep' [--server] [-q] [-v] [--force] [-c file] <clientid>*
'safekeep' --keys [-q] [-v] [-c file] [-i file] [--status] [--print] [--deploy] <clientid>*
@@ -64,6 +64,12 @@
GENERAL OPTIONS
---------------
+-c, --conf=FILE::
+ Specifies the configuration file location.
+ If not specified at all, SafeKeep will default to
+ `/etc/safekeep/safekeep.conf` if it exists.
+ Simply using this default is the recommended usage.
+
-h, --help::
Selects the help mode, in which safekeep prints out the
online help and exits.
@@ -82,11 +88,12 @@
SERVER OPTIONS
--------------
--c, --conf=FILE::
- Specifies the configuration file location.
- If not specified at all, SafeKeep will default to
- `/etc/safekeep/safekeep.conf` if it exists.
- Simply using this default is the recommended usage.
+--force::
+ Pass the `--force` option to `rdiff-backup`, allowing it
+ to overwrite the backup directory metadata. This option
+ is potentially dangerous, and should only be used if the
+ backup directory becomes corrupt, and `rdiff-backup` error
+ logs tells you to use this option.
KEYS OPTIONS
------------
Modified: safekeep/trunk/safekeep
===================================================================
--- safekeep/trunk/safekeep 2007-09-08 06:06:59 UTC (rev 546)
+++ safekeep/trunk/safekeep 2007-10-09 11:43:58 UTC (rev 547)
@@ -511,13 +511,16 @@
else:
log(line[:-1])
-def do_server_rdiff(cfg, bdir):
+def do_server_rdiff(cfg, bdir, force):
args = ['rdiff-backup']
if cfg['host']:
schema = 'ssh -C -i %s %%s rdiff-backup --server' % (cfg['key_data'])
args.extend(['--remote-schema', schema])
+ if force:
+ args.extend(['--force'])
+
#args.extend([ '-v', '6'])
for clude in cfg['cludes']:
opt = '--' + clude['type']
@@ -549,7 +552,7 @@
if server_major != client_major:
raise Exception('Incompatible protocols: %s <> %s' % (PROTOCOL, client_protocol))
-def do_server(cfgs, ids):
+def do_server(cfgs, ids, force):
debug("Do server main loop")
for cfg in cfgs.itervalues():
id = cfg['id']
@@ -610,7 +613,7 @@
else:
backup_marker = None
- do_server_rdiff(cfg, bdir)
+ do_server_rdiff(cfg, bdir, force)
if os.path.isdir(rdiff_logdir):
info_file(backup_log, backup_marker)
@@ -793,6 +796,9 @@
print '-v, --verbose increases the verbosity level'
print '-V, --version show the version number and exit'
print
+ print 'server options:'
+ print '--force force backup destination overwriting, dangerous!'
+ print
print 'keys options:'
print '-i FILE use FILE as identity for RSA/DSA authentication'
print '--status display the key status for the clients (default)'
@@ -804,9 +810,9 @@
try:
opts, args = getopt.getopt(sys.argv[1:], 'c:e:i:hs:qvV',
[ 'conf=', 'client', 'clientid=', 'deploy',
- 'email=', 'help', 'keys', 'print',
- 'quiet', 'server', 'smtp=', 'status',
- 'verbose', 'version'])
+ 'email=', 'force', 'help', 'keys',
+ 'print', 'quiet', 'server', 'smtp=',
+ 'status', 'verbose', 'version'])
except getopt.GetoptError:
usage(2)
@@ -818,6 +824,7 @@
cfglocs = []
verbosity = 0
clientid = None
+ force = 0
identity = None
keys_status = None
keys_print = None
@@ -851,6 +858,8 @@
elif o in ('--keys', ):
if mode: usage(2)
mode = 'keys'
+ elif o in ('--force', ):
+ force = 1
elif o in ('-i', ):
identity = a
elif o in ('--status', ):
@@ -937,7 +946,7 @@
if mode is 'server':
is_client = False
verbosity_level = 1 + verbosity
- do_server(cfgs, args)
+ do_server(cfgs, args, force)
elif mode is 'client':
is_client = True
verbosity_level = 3 + verbosity
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st...@us...> - 2007-10-12 21:17:59
|
Revision: 550
http://safekeep.svn.sourceforge.net/safekeep/?rev=550&view=rev
Author: stelian
Date: 2007-10-12 14:17:52 -0700 (Fri, 12 Oct 2007)
Log Message:
-----------
Fix the copyright notices.
Modified Paths:
--------------
safekeep/trunk/LICENSE
safekeep/trunk/safekeep
Modified: safekeep/trunk/LICENSE
===================================================================
--- safekeep/trunk/LICENSE 2007-10-09 11:44:53 UTC (rev 549)
+++ safekeep/trunk/LICENSE 2007-10-12 21:17:52 UTC (rev 550)
@@ -1,15 +1,14 @@
-Copyright (C) 2006 Lattica, Inc.
+Copyright (C) 2006-2007 Lattica, Inc.
-SafeKeep is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2.1 as published
-by the Free Software Foundation.
+SafeKeep is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
+Safekeep is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
-A copy of the GNU General Public License is included in the
-Chef distribution in the file COPYING. If you did not receive this
-copy, write to the Free Software Foundation, Inc., 59 Temple Place,
-Suite 330, Boston, MA 02111-1307 USA.
+You should have received a copy of the GNU General Public License
+along with Safekeep. If not, see <http://www.gnu.org/licenses/>.
Modified: safekeep/trunk/safekeep
===================================================================
--- safekeep/trunk/safekeep 2007-10-09 11:44:53 UTC (rev 549)
+++ safekeep/trunk/safekeep 2007-10-12 21:17:52 UTC (rev 550)
@@ -1,5 +1,20 @@
#!/usr/bin/python
+# Copyright (C) 2006-2007 Lattica, Inc.
+#
+# SafeKeep is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# Safekeep is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Safekeep. If not, see <http://www.gnu.org/licenses/>.
+
import getopt, os, os.path, popen2, re, sys
import commands, tempfile, time, traceback
import getpass, pwd, xml.dom.minidom
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2007-10-19 16:47:31
|
Revision: 553
http://safekeep.svn.sourceforge.net/safekeep/?rev=553&view=rev
Author: dimi
Date: 2007-10-19 09:47:29 -0700 (Fri, 19 Oct 2007)
Log Message:
-----------
Prepare for release 1.0.3.
Modified Paths:
--------------
safekeep/trunk/ANNOUNCE
safekeep/trunk/safekeep
Modified: safekeep/trunk/ANNOUNCE
===================================================================
--- safekeep/trunk/ANNOUNCE 2007-10-19 16:38:47 UTC (rev 552)
+++ safekeep/trunk/ANNOUNCE 2007-10-19 16:47:29 UTC (rev 553)
@@ -1,27 +1,31 @@
-This is release 1.0.2 of SafeKeep, a centralized and easy to use
+This is release 1.0.3 of SafeKeep, a centralized and easy to use
backup application that combines the best features of a mirror
and an incremental backup.
What's new in this release:
- - Yet more packaging improvements for integration into Fedora
+ - Clarify licensing in lite of the new GPLv3 license;
+ - New --force option to handle unexpected problems with the data repository;
+ - Better logging and status handling when we invoke external commands
+ - Clearer backup status on job end.
+ - A small packaging bug got fixes.
Because of lags created by using mirrors, this message may reach you before
the release is available at the public sites. Sources and binaries will be
available from the following locations:
- RedHat EL 3,4,5, CentOS 3,4,5, Fedora 4,5,6,7:
- http://prdownloads.sourceforge.net/safekeep/safekeep-common-1.0.2-1.noarch.rpm
- http://prdownloads.sourceforge.net/safekeep/safekeep-client-1.0.2-1.noarch.rpm
- http://prdownloads.sourceforge.net/safekeep/safekeep-server-1.0.2-1.noarch.rpm
- http://prdownloads.sourceforge.net/safekeep/safekeep-1.0.2-1.src.rpm
+ http://prdownloads.sourceforge.net/safekeep/safekeep-common-1.0.3-1.noarch.rpm
+ http://prdownloads.sourceforge.net/safekeep/safekeep-client-1.0.3-1.noarch.rpm
+ http://prdownloads.sourceforge.net/safekeep/safekeep-server-1.0.3-1.noarch.rpm
+ http://prdownloads.sourceforge.net/safekeep/safekeep-1.0.3-1.src.rpm
- Ubuntu Edgy, Dapper, and Breezy:
- http://prdownloads.sourceforge.net/safekeep/safekeep-common_1.0.2_all.deb
- http://prdownloads.sourceforge.net/safekeep/safekeep-client_1.0.2_all.deb
- http://prdownloads.sourceforge.net/safekeep/safekeep-server_1.0.2_all.deb
+ http://prdownloads.sourceforge.net/safekeep/safekeep-common_1.0.3_all.deb
+ http://prdownloads.sourceforge.net/safekeep/safekeep-client_1.0.3_all.deb
+ http://prdownloads.sourceforge.net/safekeep/safekeep-server_1.0.3_all.deb
- Source:
- http://prdownloads.sourceforge.net/safekeep/safekeep-1.0.2.tar.gz
+ http://prdownloads.sourceforge.net/safekeep/safekeep-1.0.3.tar.gz
To find out more about the project visit on our website:
http://safekeep.sourceforge.net
Modified: safekeep/trunk/safekeep
===================================================================
--- safekeep/trunk/safekeep 2007-10-19 16:38:47 UTC (rev 552)
+++ safekeep/trunk/safekeep 2007-10-19 16:47:29 UTC (rev 553)
@@ -31,7 +31,7 @@
base_dir = None
PROTOCOL = "1.0"
-VERSION = "1.0.2"
+VERSION = "1.0.3"
VEBOSITY_BY_CLASS = {'DBG': 3, 'INFO': 2, 'WARN': 1, 'ERR': 0}
######################################################################
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2007-10-19 16:50:09
|
Revision: 554
http://safekeep.svn.sourceforge.net/safekeep/?rev=554&view=rev
Author: dimi
Date: 2007-10-19 09:50:06 -0700 (Fri, 19 Oct 2007)
Log Message:
-----------
Update ChangeLog
Modified Paths:
--------------
safekeep/trunk/ChangeLog
safekeep/trunk/safekeep.spec.in
Modified: safekeep/trunk/ChangeLog
===================================================================
--- safekeep/trunk/ChangeLog 2007-10-19 16:47:29 UTC (rev 553)
+++ safekeep/trunk/ChangeLog 2007-10-19 16:50:06 UTC (rev 554)
@@ -1,3 +1,41 @@
+2007-10-19 16:47 +0000 [r553] Dimi Paun <di...@la...>
+
+ * safekeep/trunk/safekeep, safekeep/trunk/ANNOUNCE: Prepare for
+ release 1.0.3.
+
+2007-10-19 16:38 +0000 [r552] Dimi Paun <di...@la...>
+
+ * safekeep/trunk/Makefile: Add target to deploy latest docs to
+ website
+
+2007-10-12 21:17 +0000 [r550] Stelian Pop <st...@la...>
+
+ * safekeep/trunk/LICENSE, safekeep/trunk/safekeep: Fix the
+ copyright notices.
+
+2007-10-09 11:44 +0000 [r549] Stelian Pop <st...@la...>
+
+ * safekeep/trunk/safekeep: Give a clear backup status on job end
+
+2007-10-09 11:44 +0000 [r548] Stelian Pop <st...@la...>
+
+ * safekeep/trunk/safekeep: Better error handling and logging in
+ spawn()
+
+2007-10-09 11:43 +0000 [r547] Stelian Pop <st...@la...>
+
+ * safekeep/trunk/safekeep, safekeep/trunk/doc/safekeep.txt:
+ Implement --force to handle the unexpected.
+
+2007-09-08 06:06 +0000 [r546] Dimi Paun <di...@la...>
+
+ * safekeep/trunk/safekeep.spec.in: Remove macro from comments, it
+ gets expanded in there otherwise.
+
+2007-09-07 16:45 +0000 [r544] Dimi Paun <di...@la...>
+
+ * safekeep/trunk/ChangeLog: Update ChangeLog
+
2007-09-07 16:40 +0000 [r543] Dimi Paun <di...@la...>
* safekeep/trunk/safekeep.spec.in, safekeep/trunk/safekeep,
Modified: safekeep/trunk/safekeep.spec.in
===================================================================
--- safekeep/trunk/safekeep.spec.in 2007-10-19 16:47:29 UTC (rev 553)
+++ safekeep/trunk/safekeep.spec.in 2007-10-19 16:50:06 UTC (rev 554)
@@ -117,6 +117,13 @@
%doc sample.backup
%changelog
+* Fri Oct 19 2007 Dimi Paun <di...@la...> 1.0.3-1
+ - Clarify licensing in lite of the new GPLv3 license;
+ - New --force option to handle unexpected problems with the data repository;
+ - Better logging and status handling when we invoke external commands
+ - Clearer backup status on job end.
+ - A small packaging bug got fixes.
+
* Fri Sep 7 2007 Dimi Paun <di...@la...> 1.0.2-1
- Add missing buildroot removal in install section (Jeff Spaleta)
- Remove references to PACKAGE_VERSION, follow the Fedora
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2007-11-07 14:36:08
|
Revision: 564
http://safekeep.svn.sourceforge.net/safekeep/?rev=564&view=rev
Author: dimi
Date: 2007-11-07 06:36:06 -0800 (Wed, 07 Nov 2007)
Log Message:
-----------
Always require specification of the operation mode,
based on suggestion from Gert <ger...@ta...>.
Modified Paths:
--------------
safekeep/trunk/TODO
safekeep/trunk/doc/safekeep.txt
safekeep/trunk/safekeep
Modified: safekeep/trunk/TODO
===================================================================
--- safekeep/trunk/TODO 2007-11-07 14:21:25 UTC (rev 563)
+++ safekeep/trunk/TODO 2007-11-07 14:36:06 UTC (rev 564)
@@ -7,11 +7,6 @@
* Øyvind Skaar <os...@op...>: FreeBSD have snapshot capabilities
- http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/snapshots.html
- http://www.freebsd.org/cgi/man.cgi?query=snapshot&sektion=0&manpath=FreeBSD+6.2-RELEASE&apropos=1&format=html
- * Gert <ger...@ta...>: change default mode from --server
- A small, but annoying issue (to me) it the fact that the default
- action for /usr/bin/safekeep is to run the server. This means that
- making a typo (eg /usr/bin/safekeep -help) or not knowing the
- parameters always triggers the server and starts the full backup process.
* Dag Wieers <da...@wi...>: avoid asciidoc build requirements
Would it be possible to recreate the manpages and other asciidoc documents
before distributing the tar-files ? That way there is no dependency on
Modified: safekeep/trunk/doc/safekeep.txt
===================================================================
--- safekeep/trunk/doc/safekeep.txt 2007-11-07 14:21:25 UTC (rev 563)
+++ safekeep/trunk/doc/safekeep.txt 2007-11-07 14:36:06 UTC (rev 564)
@@ -7,7 +7,7 @@
SYNOPSIS
--------
-'safekeep' [--server] [-q] [-v] [--force] [-c file] <clientid>*
+'safekeep' --server [-q] [-v] [--force] [-c file] <clientid>*
'safekeep' --keys [-q] [-v] [-c file] [-i file] [--status] [--print] [--deploy] <clientid>*
@@ -51,7 +51,7 @@
OPERATION MODE
--------------
--server::
- Selects the server mode (default)
+ Selects the server mode
--client::
Selects the client mode. This should never be invoked manually, the
@@ -61,6 +61,9 @@
--keys::
Selects the SSH key management mode
+Please note that you must always specify an operation mode. Earlier
+versions used do default to `--server` mode, but that proved to work
+out poorly in practice.
GENERAL OPTIONS
---------------
Modified: safekeep/trunk/safekeep
===================================================================
--- safekeep/trunk/safekeep 2007-11-07 14:21:25 UTC (rev 563)
+++ safekeep/trunk/safekeep 2007-11-07 14:36:06 UTC (rev 564)
@@ -845,11 +845,11 @@
######################################################################
def usage(exitcode=None):
- print 'usage: %s [--server] [common options] [server options] <client-id>*' % (sys.argv[0])
+ print 'usage: %s --server [common options] [server options] <client-id>*' % (sys.argv[0])
print ' %s --keys [common options] [keys options] <client-id>*' % (sys.argv[0])
print
- print 'mode selection (pick one):'
- print '--server launch in server mode (default)'
+ print 'mode selection (you must pick one):'
+ print '--server launch in server mode'
print '--keys launch in keys management mode'
print
print 'common options:'
@@ -940,7 +940,7 @@
return
if mode is None:
- mode = 'server'
+ usage(2)
if mode is not 'keys' and (identity or keys_status or keys_print or keys_deploy):
usage(2)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2007-11-07 15:01:55
|
Revision: 569
http://safekeep.svn.sourceforge.net/safekeep/?rev=569&view=rev
Author: dimi
Date: 2007-11-07 07:01:51 -0800 (Wed, 07 Nov 2007)
Log Message:
-----------
Build docs at distribution time to remove build-time dependency
on asciidoc 6, which requires python 2.3. These components are
not readily available on older system, making it impossible for
packagers to provide ready-make packages for distros such as RHEL3.
Based on a suggestion from Dag Wieers <da...@wi...>.
Modified Paths:
--------------
safekeep/trunk/Makefile
safekeep/trunk/TODO
safekeep/trunk/debian/control
safekeep/trunk/safekeep.spec.in
Modified: safekeep/trunk/Makefile
===================================================================
--- safekeep/trunk/Makefile 2007-11-07 14:54:57 UTC (rev 568)
+++ safekeep/trunk/Makefile 2007-11-07 15:01:51 UTC (rev 569)
@@ -52,7 +52,7 @@
@echo "SVN Root = $(svnroot)"
-build: docs
+build:
release: check-info commit-release dist distrpm
@@ -122,6 +122,7 @@
cat $(releasename)/$(name).spec.in | sed 's/^%define version.*/%define version $(version)/' > $(releasename)/$(name).spec
cat $(releasename)/debian/changelog.in | sed 's/^safekeep.*/safekeep ($(version)) unstable; urgency=low/' > $(releasename)/debian/changelog
mkdir -p $(releasedir); tar cz -f $(releasedir)/$(releasename).tar.gz $(releasename)
+ cd $(releasename); make docs
rm -rf $(releasename)
distdeb: dist
Modified: safekeep/trunk/TODO
===================================================================
--- safekeep/trunk/TODO 2007-11-07 14:54:57 UTC (rev 568)
+++ safekeep/trunk/TODO 2007-11-07 15:01:51 UTC (rev 569)
@@ -7,10 +7,6 @@
* Øyvind Skaar <os...@op...>: FreeBSD have snapshot capabilities
- http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/snapshots.html
- http://www.freebsd.org/cgi/man.cgi?query=snapshot&sektion=0&manpath=FreeBSD+6.2-RELEASE&apropos=1&format=html
- * Dag Wieers <da...@wi...>: avoid asciidoc build requirements
- Would it be possible to recreate the manpages and other asciidoc documents
- before distributing the tar-files ? That way there is no dependency on
- asciidoc > 6 (and as a result, no dependency on python 2.3).
* Dag Wieers <da...@wi...>: disaster recovery
http://dag.wieers.com/blog/content/call-for-participation-on-mksysb
Modified: safekeep/trunk/debian/control
===================================================================
--- safekeep/trunk/debian/control 2007-11-07 14:54:57 UTC (rev 568)
+++ safekeep/trunk/debian/control 2007-11-07 15:01:51 UTC (rev 569)
@@ -2,7 +2,7 @@
Section: Applications/System
Priority: optional
Maintainer: Lattica, Inc.
-Build-Depends: debhelper (>= 4.0.0), xmlto, asciidoc (> 6.0.3)
+Build-Depends: debhelper (>= 4.0.0)
Standards-Version: 3.6.2
Package: safekeep-server
Modified: safekeep/trunk/safekeep.spec.in
===================================================================
--- safekeep/trunk/safekeep.spec.in 2007-11-07 14:54:57 UTC (rev 568)
+++ safekeep/trunk/safekeep.spec.in 2007-11-07 15:01:51 UTC (rev 569)
@@ -15,7 +15,6 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-BuildRequires: xmlto, asciidoc > 6.0.3
%description
SafeKeep is a client/server backup system which enhances the
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X