exit 1;
}
-my $store = CloudStore::Store->new;
+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
# don't check secrets file permission (uid)
strict modes = no
-pre-xfer exec = /srv/cloudstore/rsync-xfer-trigger.pl
-post-xfer exec = /srv/cloudstore/rsync-xfer-trigger.pl
+#pre-xfer exec = /srv/cloudstore/rsync-xfer-trigger.pl
+#post-xfer exec = /srv/cloudstore/rsync-xfer-trigger.pl
};
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/.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__
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;
chomp $line;
warn $line, $/;
- if ( $line =~ /transfer-log:(.+)/ ) {
- my $transfer = $1;
+ if ( $line =~ /\[(\d+)\] transfer-log:(.+)/ ) {
+ my $pid = $1;
+ my $transfer = $2;
$transfer =~ s|(\d\d\d\d)/(\d\d)/(\d\d)[-\s](\d\d:\d\d:\d\d)|$1-$2-$3T$4|g;
my ( $yyyy,$mm,$dd,undef,$login,undef ) = split( /[\-T\|]/, $transfer, 6 );
my $host = $1 if $login =~ s/\+(.+)//;
my %data;
@data{@transfer_names} = @v ; # FIXME validate?
+ $data{pid} = $pid;
+ # overwrite pid from transfer log with consistant one for start/stop
+
print ">>> data ",dump( \%data ) if $ENV{DEBUG};
$store->rsync_transfer( \%data );
=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 {