1 files changed, 47 insertions, 48 deletions

diff --git a/misc/mklist/mklist.pl b/misc/mklist/mklist.pl
index 105178a..37c05e5 100755
--- a/misc/mklist/mklist.pl
+++ b/misc/mklist/mklist.pl
@@ -9,11 +9,11 @@ our $VERSION = '0.01';
 
 =head1 NAME
 
-mklist.pl - Create a new list 
+mklist.pl - Create a new list
 
 =head1 SYNOPSIS
 
-B<mklist.pl> {B<mailman>|B<schleuder>} < email
+B<mklist.pl> {B<mailman>|B<schleuder>} [size] < email
 
 =cut
 
@@ -21,23 +21,27 @@ B<mklist.pl> {B<mailman>|B<schleuder>} < email
 #######################################################################
 #
 
-use Mail::GnuPG;
-use MIME::Parser;
-use File::Spec::Functions;
+use File::Spec::Functions qw/catfile catdir/;
 use Fcntl qw/:flock SEEK_END/;
 use POSIX qw/setuid setgid/;
 use Pod::Usage;
 use Config::Auto;
-use lib '../../../panel/lib';
+use lib 'lib';
+use Mail::GnuPG;
+use MIME::Parser;
 use Fripost::Schema;
 
 my $transport = shift;
 pod2usage(2) unless defined $transport and
                     grep { $transport eq $_}
                          qw/mailman schleuder/;
-                         use Cwd;
+my $configdir = catdir('/','etc','mklist');
+my $config = Config::Auto::parse( catfile($configdir, 'config'),
+                                  format => "equal" );
 
-my $config = Config::Auto::parse( './config', format => "equal" );
+my $size = shift;
+die "Email size $size is bigger than the maximum authorized (".$config->{max_size}.").\n"
+    if defined $config->{max_size} and defined $size and $size > $config->{max_size};
 
 # Drop root privileges
 unless ($<) {
@@ -66,7 +70,7 @@ my ($list, $owner, $password);
              $msg->mime_type eq 'multipart/signed' and
              $msg->parts;
 
-    my $gpg = Mail::GnuPG::->new;
+    my $gpg = Mail::GnuPG::->new( keydir => catdir($configdir,'gnupg-'.$transport) );
     die "Error: The message is not GPG/MIME signed.\n"
         unless $gpg->is_signed( $msg );
 
@@ -78,7 +82,7 @@ my ($list, $owner, $password);
 
     die "Error: 0x$key ($addr) is not authorized to create lists.\n"
         unless grep { $key eq $_ }
-                    (ref $config->{authorized_pubkeys} eq 'ARRAY' ? 
+                    (ref $config->{authorized_pubkeys} eq 'ARRAY' ?
                          @{$config->{authorized_pubkeys}} :
                          $config->{authorized_pubkeys}
                     );
@@ -100,7 +104,7 @@ my ($l,$d) = split /\@/, $list, 2;
 #######################################################################
 #
 # Ensure that the root DN has been created, otherwise doing the below is
-# useless. 
+# useless.
 
 {
     # It's pointless to have a global variable here, since after the list
@@ -116,34 +120,32 @@ my ($l,$d) = split /\@/, $list, 2;
 #
 # Create the list
 
-#if ($transport eq 'mailman') {
-#    system ( '/var/lib/mailman/bin/newlist', '-q'
-#           , '-u', 'smtp.fripost.org' # TODO: that should be $mydestination
-#           , $list
-#           , $owner 
-#           , $password
-#    );
-#    die "newlist exited with status $?\n" if $?;
-#}
-#
-#elsif ($transport eq 'schleuder') {
-#    system ( '/usr/bin/schleuder-newlist'
-#           , $list
-#           , '-email', $list
-#           , '-realname', $l
-#           , '-nointeractive'
-#           , '-adminaddress', $owner
-#           , '-initmember', $owner
-#           , '-initmemberkey', # TODO: that needs to be a file
-#    );
-#    die "schleuder-newlist exited with status $?\n" if $?;
-#    system ( '/usr/bin/ruby', '/opt/webschleuder/contrib/enable_webschleuder.rb'
-#           , $list
-#           , $password
-#    );
-#    # TODO: try not to use the password in the command argument
-#    die "enable_webschleuder exited with status $?\n" if $?;
-#}
+if ($transport eq 'mailman') {
+    system ( '/var/lib/mailman/bin/newlist', '-q'
+           , '-u', 'smtp.fripost.org' # TODO: that should be $mydestination
+           , $list
+           , $owner
+           , $password
+    );
+    die "newlist died with status $?\n" if $?;
+}
+
+elsif ($transport eq 'schleuder') {
+    system ( '/usr/bin/schleuder-newlist'
+           , $list
+           , '-email', $list
+           , '-realname', $l
+           , '-nointeractive'
+           , '-adminaddress', $owner
+    );
+    die "schleuder-newlist died with status $?\n" if $?;
+    my $pid = open PW, '|-', '/opt/webschleuder/contrib/enable_webschleuder.rb', $list
+              or die "Cannot open: $!";
+    print PW $password or die "Cannot print: $!";
+    close PW;
+    my $r = $? >> 8;
+    die "enable_webschleuder died with status $r\n" if $r;
+}
 
 # List the commands that are to be added to the LDAP directory and the lookup table.
 my @cmds = $transport eq 'mailman' ? qw/admin bounces confirm join leave owner request subscribe unsubscribe/ :
@@ -167,9 +169,7 @@ my @cmds = $transport eq 'mailman' ? qw/admin bounces confirm join leave owner r
 # Create/update the Postfix lookup table.
 
 {
-    
-    my $db = File::Spec::Functions::catfile( $config->{postfix_data_dir},
-                                             'transport_'.$transport );
+    my $db = catfile( $config->{postfix_data_dir}, $transport, 'transport' );
     my $new = not (-e $db);
     open my $fh, '>>', $db or die "Cannot open $db: $!";
     flock $fh, LOCK_EX or die "Cannot lock $db: $!";
@@ -178,17 +178,16 @@ my @cmds = $transport eq 'mailman' ? qw/admin bounces confirm join leave owner r
         print $fh "# Do not modify this file! Use $0 to create lists instead.\n"
             or die "Cannot print: $!";
     }
-    
-    
-    print $fh  "\n# ".$list."  -  ".localtime."\n";
+
+    print $fh  "\n# ".$list."  -  ".(localtime)."\n";
     &print_transport($fh, undef);
     foreach (@cmds) { &print_transport($fh, $_); }
-    
+
     close $fh or die "Cannot close $db: $!";
-    
+
     # Compile the lookup table (Postfix takes care of the race condition here).
     system ('/usr/sbin/postmap', '-c', $config->{postfix_config_dir}, $db);
-    die "postmap exited with status $?\n" if $?;
+    die "postmap died with status $?\n" if $?;
 }