ispman/bin ispman-agent, 1.69.2.1, 1.69.2.2 ispman.ldap2apache, 1.9.4.1, 1.9.4.2 ispman.listMailboxes, 1.4.6.2, 1.4.6.3 ispman.delete_vhost, 1.1, NONE ispman.make_vhosts_conf, 1.1, NONE ispman.modify_vhost, 1.1, NONE ispman.reloadApache, 1.1, NONE

Update of /cvsroot/ispman/ispman/bin
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv27827/bin

Modified Files:
      Tag: dev_1_3-cyrus_virtdomain
	ispman-agent ispman.ldap2apache ispman.listMailboxes 
Removed Files:
      Tag: dev_1_3-cyrus_virtdomain
	ispman.delete_vhost ispman.make_vhosts_conf 
	ispman.modify_vhost ispman.reloadApache 
Log Message:
Merged to current HEAD, still needs debuging though.


Index: ispman.ldap2apache
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman.ldap2apache,v
retrieving revision 1.9.4.1
retrieving revision 1.9.4.2
diff -u -d -r1.9.4.1 -r1.9.4.2
--- ispman.ldap2apache	18 Sep 2006 01:58:57 -0000	1.9.4.1
+++ ispman.ldap2apache	2 Oct 2006 08:09:38 -0000	1.9.4.2
@@ -14,7 +14,7 @@
     if ( $opts{'h'} ) {
         print "$FindBin::Script -d debugLevel[1|2|3] [-a]\n";
         print
-"\t-a\tMake vhosts.conf will all vhosts and not just the ones where webhost is this host\n";
+          "\t-a\tMake vhosts.conf will all vhosts and not just the ones where webhost is this host\n";
         print "\n";
         exit;
     }
@@ -41,7 +41,6 @@
 $ldapBaseDN  = $ispman->getConf('ldapBaseDN');
 $install_dir = $ispman->getConf("installDir");
 require "$install_dir/lib/http.lib";
-$template = $ispman->getTemplate("$install_dir/templates/vhosts.conf.template");
 
 my $filter = "objectclass=ispmanVirtualHost";
 
@@ -61,7 +60,7 @@
         $vhosts->{$_}{'ispmanDomain'} );
 }
 
-&make_vhosts_conf($template);
+&make_vhosts_conf();
 
 if ( $ispman->getConf("apacheVhostsStyle") =~ /dir/m ) {
     for ( keys %$vhosts ) {

Index: ispman.listMailboxes
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman.listMailboxes,v
retrieving revision 1.4.6.2
retrieving revision 1.4.6.3
diff -u -d -r1.4.6.2 -r1.4.6.3
--- ispman.listMailboxes	18 Sep 2006 01:58:57 -0000	1.4.6.2
+++ ispman.listMailboxes	2 Oct 2006 08:09:38 -0000	1.4.6.3
@@ -11,6 +11,7 @@
         print "Example: $FindBin::Script -h localhost user.\*_example_com\n";
         exit;
     }
+
 }
 
 require "mailbox_actions.lib";

Index: ispman-agent
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman-agent,v
retrieving revision 1.69.2.1
retrieving revision 1.69.2.2
diff -u -d -r1.69.2.1 -r1.69.2.2
--- ispman-agent	11 Sep 2006 23:31:24 -0000	1.69.2.1
+++ ispman-agent	2 Oct 2006 08:09:38 -0000	1.69.2.2
@@ -172,7 +172,16 @@
 # Stanislav Sinyagin <ssinyagin-/[email protected]>
 # Jobs are ordered by priority. #1 goes first.
 # Default priority is 100.
-%jobPriorities = ( 'createMailbox' => 1 );
+%jobPriorities = (
+    'createMailbox'                => 1,
+    'createDomainDirectories'      => 10,
+    'AddVirtualHostDirectories'    => 11,
+    'AddVirtualHost'               => 12,
+    'createHomeDirectory'          => 13,
+    'deleteHomeDirectory'          => 20,
+    'DeleteVirtualHostDirectories' => 21,
+    'deleteDomainDirectories'      => 22
+);
 
 sub jobPriority {
     my $job = shift;

--- ispman.delete_vhost DELETED ---

--- ispman.make_vhosts_conf DELETED ---

--- ispman.reloadApache DELETED ---

--- ispman.modify_vhost DELETED ---


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV