configure zfs quota and uid/git for shares

[cloudstore.git] / rsync-piper.pl

diff --git a/rsync-piper.pl b/rsync-piper.pl
index 2ecc095..b23ab25 100755 (executable)
--- a/rsync-piper.pl
+++ b/rsync-piper.pl
@@ -15,14 +15,13 @@ use lib 'lib';
 use WarnColor;
 use CloudStore::Store;
 
-my $dir   = $ENV{RSYNC_DIR}  || '/srv/cloudstore';
-my $port  = $ENV{RSYNC_PORT} || 6501;
-my $users = "users";
-my $default_quota = $ENV{QUOTA} || 200 * 1024; # 200 Kb for test.sh
+my $slice = $ARGV[0] || 's1';
 
-my $log_fifo = "$dir/var/$port.log";
-my $pid_file = "$dir/var/$port.pid";
-my $cfg_file = "$dir/var/$port.conf";
+my ( undef, $dir, $port, undef ) = getgrnam($slice);
+
+my $log_fifo = "$dir/$port.log";
+my $pid_file = "$dir/$port.pid";
+my $cfg_file = "$dir/$port.conf";
 
 my $rsync = 'rsync';
 $rsync = 'bin/rsync' if -x 'bin/rsync'; # use 3.1dev version!
@@ -58,8 +57,6 @@ if ( $ENV{SQL} ) {
 
 my $store = CloudStore::Store->new;
 
-mkdir "$dir/var" if ! -e "$dir/var";
-
 unlink $log_fifo if -f $log_fifo;
 mkfifo $log_fifo, 0700 unless -p $log_fifo;
 
@@ -71,7 +68,7 @@ my $rsync_config = qq{
 use chroot = no
 
 #max connections = 4
-lock file = $dir/var/$port.lock
+lock file = $dir/$port.lock
 
 #syslog facility = local5
 log file  = $log_fifo
@@ -90,38 +87,33 @@ post-xfer exec = /srv/cloudstore/rsync-xfer-trigger.pl
 
 };
 
-foreach my $path ( glob "$users/*" ) {
+open(my $p, '<', '/var/lib/extrausers/passwd');
+while(<$p>) {
+       chomp;
 
-       my $login = $path;
-       $login =~ s{^.+/([^/]+)$}{$1}; 
+       my ( $login, undef, $uid, $gid, $email, $path, $shell ) = split(/:/,$_,7);
 
-       if ( -d $path && -d "$path/blob" && -f "$path/secrets" ) {
-               my @secrets = map { chomp; $_ } read_file "$path/secrets";
+       if ( -d $path && -f "$path/.secrets" ) {
+               my @secrets = map { chomp; $_ } read_file "$path/.secrets";
                my $auth_users = join(', ', map { s/:.+$//; $_ } @secrets );
 
                $rsync_config .= <<__RSYNC_MODULE__;
 
 [$login]
-       path = $dir/users/$login/blob
+       path = $path
        auth users = $auth_users
-       secrets file = $dir/users/$login/secrets
+       secrets file = $path/.secrets
        read only = false
+       uid = $uid
+       gid = $gid
+       filter = - /.secrets
+#      refuse options = c delete
+#      dont compress = *
 
 __RSYNC_MODULE__
 
                print "INFO: added $login = $auth_users\n";
 
-               my $quota = $default_quota;
-               $quota = read_file("$path/quota") * 1 if -e "$path/quota";
-
-               $store->user_set({
-                       login => $login,
-                       path => $path,
-                       secrets => [ @secrets ],
-                       quota => $quota,
-                       port => $port,
-               });
-
        } else {
                warn "skipped $login: $!";
        }
@@ -211,6 +203,7 @@ while(1) {
                        my ( $yyyy,$mm,$dd,undef,$login,undef ) = split( /[\-T\|]/, $transfer, 6 );
                        my $host = $1 if $login =~ s/\+(.+)//;
 
+if(0) {
                        my $path = "users/$login/log";
                        mkdir $path unless -d $path;
                        $path .= "/$yyyy-$mm-$dd";
@@ -219,6 +212,7 @@ while(1) {
                        print $log join('|',@transfer),"\n" if $new_log; # store header
                        print $log "$transfer\n";
                        close $log;
+}
 
                        my @v = split(/\|/,$transfer,$#transfer + 1);
                        my %data;