ispman/tasks AddVirtualHostDirectories_task.pl,NONE,1.1 AddVirtualHost_task.pl,NONE,1.1 createDomainDirectories_task.pl,NONE,1.1 deleteDomainDirectories_task.pl,NONE,1.1 DeleteVirtualHost_task.pl,1.2,1.3 createMailbox_task.pl,1.1,1.2 deleteMailbox_task.pl,1.1,1.2 setMailboxQuota_task.pl,1.1,1.2

Update of /cvsroot/ispman/ispman/tasks
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14522

Modified Files:
	DeleteVirtualHost_task.pl createMailbox_task.pl 
	deleteMailbox_task.pl setMailboxQuota_task.pl 
Added Files:
	AddVirtualHostDirectories_task.pl AddVirtualHost_task.pl 
	createDomainDirectories_task.pl 
	deleteDomainDirectories_task.pl 
Log Message:


--- NEW FILE: AddVirtualHost_task.pl ---
sub AddVirtualHost_task {
   my $params=shift;
   unless ($params->{'domain'}){
      print "Domain not defined. Cannot continue\n";
      return 0;
   }
   unless ($params->{'ispmanVhostName'}){
      print "Vhostname not defined. Cannot continue\n";
      return 0;
   }
   push @cmd, "perl $FindBin::Bin/ispman.add_vhost $params->{'ispmanVhostName'} $params->{'domain'}";
   push @cmd, "perl $FindBin::Bin/ispman.make_vhosts_conf $params->{'domain'}";
   push @cmd, "perl $FindBin::Bin/ispman.reloadApache";



}

Index: setMailboxQuota_task.pl
===================================================================
RCS file: /cvsroot/ispman/ispman/tasks/setMailboxQuota_task.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- setMailboxQuota_task.pl	30 Dec 2004 00:22:41 -0000	1.1
+++ setMailboxQuota_task.pl	30 Dec 2004 04:15:43 -0000	1.2
@@ -1,7 +1,4 @@
 sub setMailboxQuota_task {
-   my ($mailbox, $quota)=@_;
-   my @cmd=();
-   push @cmd, "perl $FindBin::Bin/ispman.setMailboxQuota -h $hostname $mailbox $quota";
-   executeCommands(@cmd);
-
+   my $params=shift;
+   push @cmd, "perl $FindBin::Bin/ispman.setMailboxQuota -h $hostname $params->{'mailbox'} $params->{'quota'}";
 }

--- NEW FILE: createDomainDirectories_task.pl ---
sub createDomainDirectories_task {
	my $params=shift;

        push @cmd, "mkdir -p $params->{'homeDirectory'}";
        push @cmd, "mkdir -p $params->{'homeDirectory'}/vhosts";
        push @cmd, "mkdir -p $params->{'homeDirectory'}/users";
        push @cmd, "chown -R $params->{'uidNumber'}.$params->{'gidNumber'} $params->{'homeDirectory'}";
       
}


Index: DeleteVirtualHost_task.pl
===================================================================
RCS file: /cvsroot/ispman/ispman/tasks/DeleteVirtualHost_task.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- DeleteVirtualHost_task.pl	29 Dec 2004 23:40:08 -0000	1.2
+++ DeleteVirtualHost_task.pl	30 Dec 2004 04:15:43 -0000	1.3
@@ -1,12 +1,10 @@
 #!/usr/bin/perl
 sub DeleteVirtualHost_task {
-   my ($domain, $vhost)=@_;
-   my @cmd=();
+   my $params=shift;
    
-   push @cmd, "perl $FindBin::Bin/ispman.deletevhost -d $domain $vhost";
+   push @cmd, "perl $FindBin::Bin/ispman.deletevhost -d $params->{'domain'} $params->{'ispmanVhostName'}";
    push @cmd, "/usr/sbin/apachectl restart";
    
-   executeCommands(@cmd);
 
 
 }

Index: deleteMailbox_task.pl
===================================================================
RCS file: /cvsroot/ispman/ispman/tasks/deleteMailbox_task.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- deleteMailbox_task.pl	30 Dec 2004 00:07:38 -0000	1.1
+++ deleteMailbox_task.pl	30 Dec 2004 04:15:43 -0000	1.2
@@ -1,7 +1,5 @@
 sub deleteMailbox_task {
-   my $mailbox=shift;
-   my @cmd=();
-   push @cmd, "perl $FindBin::Bin/ispman.deleteMailbox -h $hostname $mailbox";
-   executeCommands(@cmd);
+   my $params=shift;
+   push @cmd, "perl $FindBin::Bin/ispman.deleteMailbox -h $hostname $params->{'mailbox'}";
 }
 

--- NEW FILE: AddVirtualHostDirectories_task.pl ---
sub AddVirtualHostDirectories_task {
	my $params=shift;


        $homeDirectory=$params->{'homeDirectory'};

        $document_root=($params->{'ispmanVhostDocumentRoot'}=~m!^/!)?$params->{'ispmanVhostDocumentRoot'}: join "/", ($homeDirectory, $params->{'ispmanVhostDocumentRoot'});
        $script_dir=($params->{'ispmanVhostScriptDir'}=~m!^/!)?$params->{'ispmanVhostScriptDir'}: join "/", ($homeDirectory, $params->{'ispmanVhostScriptDir'});
        $log_dir=($params->{'ispmanVhostLogdir'}=~m!^/!)?$params->{'ispmanVhostLogdir'}: join "/", ($homeDirectory, $params->{'ispmanVhostLogdir'});
        $stat_dir=($params->{'ispmanVhostStatdir'}=~m!^/!)?$params->{'ispmanVhostStatdir'}: join "/", ($homeDirectory, $params->{'ispmanVhostStatdir'});

        $owner=$params->{'uidNumber'};
        $group=$params->{'gidNumber'};





        push @cmd, "mkdir -p $document_root; chown -R $owner.$group $document_root" unless -d $document_root;
        push @cmd, "mkdir -p $script_dir; chown -R $owner.$group $script_dir" unless -d $script_dir;
        push @cmd, "mkdir -p $log_dir; chown -R $owner.$group $log_dir" unless -d $log_dir;
        push @cmd, "mkdir -p $stat_dir; chown -R $owner.$group $stat_dir" unless -d $stat_dir;



}


--- NEW FILE: deleteDomainDirectories_task.pl ---
sub deleteDomainDirectories_task {
   my $params=shift;

   # Lets do some checks here for sanity.

   # home Directory Exists?
   unless ($params->{"homeDirectory"}){
      print "Homedirectory not specified\n";
      return 0;
   }
   unless ( -d $params->{"homeDirectory"}){
      print "Homedirectory does not exists\n";
      return 0;
   }

   unless ($params->{"homeDirectory"}=~m!^/\w+\d*?/\w+\d*/!){
      print "Home directory too shallow. Too afraid to delete it\n";
      return 0;
   }

   unless ($params->{'uidNumber'} || $params->{'gidNumber'}){
      print "uidNumber and/or gidNumber missing.. Not continuing\n";
      return 0;
   }
   # Do a backup if you have to
   # push  @cmd, "cp -a $params->{"homeDirectory"} /some/backup/dir/";

   # Use this command
   #push @cmd, "find '$params->{"homeDirectory"}' -depth -uid $params->{'uidNumber'} -gid $params->{'gidNumber'} -type d -exec rm -rf {} \\;";

   # Or simply this one
   push @cmd, "rm -rf $params->{'homeDirectory'}";

}



Index: createMailbox_task.pl
===================================================================
RCS file: /cvsroot/ispman/ispman/tasks/createMailbox_task.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- createMailbox_task.pl	30 Dec 2004 00:22:41 -0000	1.1
+++ createMailbox_task.pl	30 Dec 2004 04:15:43 -0000	1.2
@@ -1,7 +1,6 @@
 sub createMailbox_task {
-    my $mailbox=shift;
-    my @cmd=();
-    push @cmd, "perl $FindBin::Bin/ispman.createMailbox -h $hostname $mailbox";
-    executeCommands(@cmd);
+    my $params=shift;
+
+    push @cmd, "perl $FindBin::Bin/ispman.createMailbox -h $hostname $params->{'mailbox'}";
 }
 



-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt