my $transfer_log = join('|',map { ( split(/:/,$_,3) )[1] } @transfer );
if ( $ENV{SQL} ) {
- print "CREATE TABLE rsync_transfer (\n\t",
+ warn "CREATE TABLE rsync_transfer (\n\t",
join(",\n\t", map { my @m = split(/:/,$_,3); "$m[0] $m[2]" } @transfer),
"\n);\n";
exit 1;
}
-my $store = CloudStore::Store->new( dir => $dir );
+my $store = CloudStore::Store->new( $slice );
unlink $log_fifo if -f $log_fifo;
mkfifo $log_fifo, 0700 unless -p $log_fifo;
+sub rsync_rebuild_config {
+
my $rsync_config = qq{
#uid = nobody
#pre-xfer exec = /srv/cloudstore/rsync-xfer-trigger.pl
#post-xfer exec = /srv/cloudstore/rsync-xfer-trigger.pl
+# inplace breaks update of deduped files
+refuse options = inplace
+
};
open(my $p, '<', '/var/lib/extrausers/passwd');
my ( $login, undef, $uid, $gid, $email, $path, $shell ) = split(/:/,$_,7);
- if ( -d $path && -f "$path/.secrets" ) {
- my @secrets = map { chomp; $_ } read_file "$path/.secrets";
+ if ( -d $path && -f "$path/.secrets" && ! -e "$path/.meta/secrets" ) {
+ $store->api->mkbasepath( "$path/.meta/secrets" );
+ rename "$path/.secrets", "$path/.meta/secrets";
+ warn "UPGRADE $login rsync secrets location\n";
+ }
+
+ if ( -d $path && -f "$path/.meta/secrets" ) {
+ my @secrets = map { chomp; $_ } read_file "$path/.meta/secrets";
my $auth_users = join(', ', map { s/:.+$//; $_ } @secrets );
$rsync_config .= <<__RSYNC_MODULE__;
[$login]
path = $path
auth users = $auth_users
- secrets file = $path/.secrets
+ secrets file = $path/.meta/secrets
read only = false
uid = $uid
gid = $gid
- filter = - /.secrets
+ filter = - /.meta
# refuse options = c delete
# dont compress = *
+ incoming chmod = u=rwX,g+rX,o+rX
+
__RSYNC_MODULE__
- print "INFO: added $login = $auth_users\n";
+ warn "INFO: added $login = $auth_users\n";
} else {
warn "skipped $login: $!";
write_file $cfg_file, $rsync_config;
warn "created $cfg_file ", -s $cfg_file, " bytes\n";
+} # sub rsync_rebuild_config
+
+rsync_rebuild_config;
+
sub rsync_running_pid {
return unless -e $pid_file;
my $pid = read_file $pid_file;
$SIG{CHLD} = \&REAPER;
-if ( ! -e $pid_file ) {
+if ( ! -e $pid_file || ! kill( 0, rsync_running_pid ) ) {
my $exec = "$rsync --daemon --config $cfg_file --no-detach --port=$port";
warn "START $exec\n";
=cut
die "no rsync running" unless kill 0, rsync_running_pid;
- } elsif ( $line =~ m/unknown module/ ) {
+ } elsif ( $line =~ m/(unknown module|rebuild|reload|config)/ ) {
+ warn "refresh modules, rebuild config and HUP rsync";
+ Module::Refresh->refresh;
+ rsync_rebuild_config;
my $pid = rsync_running_pid;
kill 1, $pid && warn "reload config";
} else {