generate config for all rsync modules available on disk

diff --git a/rsync-piper.pl b/rsync-piper.pl
index f990d85..12e1e79 100755 (executable)
--- a/rsync-piper.pl
+++ b/rsync-piper.pl
@@ -13,13 +13,13 @@ use English;
 use lib 'lib';
 use CloudStore::JSON;
 
-my $dir   = $ENV{RSYNC_DIR}  || '/srv/cloudstore/var';
+my $dir   = $ENV{RSYNC_DIR}  || '/srv/cloudstore';
 my $port  = $ENV{RSYNC_PORT} || 6501;
 my $users = "users";
 
-my $log_fifo = "$dir/$port.log";
-my $pid_file = "$dir/$port.pid";
-my $cfg_file = "$dir/$port.conf";
+my $log_fifo = "$dir/var/$port.log";
+my $pid_file = "$dir/var/$port.pid";
+my $cfg_file = "$dir/var/$port.conf";
 
 my $rsync = 'rsync';
 $rsync = 'bin/rsync' if -x 'bin/rsync'; # use 3.1dev version!
@@ -51,7 +51,7 @@ if ( $ENV{SQL} ) {
        exit 1;
 }
 
-mkdir $dir if ! -e $dir;
+mkdir "$dir/var" if ! -e "$dir/var";
 
 mkfifo $log_fifo, 0700 unless -p $log_fifo;
 
@@ -63,7 +63,7 @@ my $rsync_config = qq{
 use chroot = no
 
 #max connections = 4
-lock file = $dir/rsyncd.lock
+lock file = $dir/var/$port.lock
 
 #syslog facility = local5
 log file  = $log_fifo
@@ -77,16 +77,34 @@ pid file  = $pid_file
 # don't check secrets file permission (uid)
 strict modes = no
 
-pre-xfer exec = /srv/cloudstore/pre-xfer.sh
-post-xfer exec = /srv/cloudstore/post-xfer.sh
+#pre-xfer exec = /srv/cloudstore/pre-xfer.sh
+#post-xfer exec = /srv/cloudstore/post-xfer.sh
 
-[dpavlin]
-       path = /srv/cloudstore/users/dpavlin/blob
-       auth users = dpavlin
-       secrets file = /srv/cloudstore/secrets/dpavlin
+};
+
+foreach my $path ( glob "$users/*" ) {
+
+       my $login = $path;
+       $login =~ s{^.+/([^/]+)$}{$1}; 
+
+       if ( -d $path && -d "$path/blob" && -f "$path/secrets" ) {
+               print "INFO: user $login added\n";
+
+               $rsync_config .= <<__RSYNC_MODULE__;
+
+[$login]
+       path = $dir/users/$login/blob
+       auth users = $login
+       secrets file = $dir/users/$login/secrets
        read only = false
 
-};
+__RSYNC_MODULE__
+
+       } else {
+               warn "skipped $login: $!";
+       }
+
+}
 
 write_file $cfg_file, $rsync_config;
 warn "created $cfg_file ", -s $cfg_file, " bytes\n";