[pkg-kolab] r1425 - pkg-kolab_testsuite

[Mathieu Parent]

Author: sathieu
Date: 2009-11-26 21:10:45 +0000 (Thu, 26 Nov 2009)
New Revision: 1425

Modified:
   pkg-kolab_testsuite/testsuite
Log:
More for openpkg install


Modified: pkg-kolab_testsuite/testsuite
===================================================================
--- pkg-kolab_testsuite/testsuite	2009-11-26 18:59:07 UTC (rev 1424)
+++ pkg-kolab_testsuite/testsuite	2009-11-26 21:10:45 UTC (rev 1425)
@@ -488,22 +488,23 @@
         remote_command($domip, 'DEBIAN_FRONTEND=noninteractive apt-get -y install bison flex gcc make libtool automake autoconf');
         #TODO: that the following names are not in /etc/passwd or /etc/groups, as OpenPKG will want to create them: kolab, kolab-r, kolab-n
         print "* install-kolab.sh\n";
-        remote_command($domip, 'sh install-kolab.sh 2>&1 | tee /root/kolab-install.log');
-        die 'Stopping here for: '.$config{'kolab_installation_method'};
+        remote_command($domip, 'cd /tmp/kolabtemp && sh install-kolab.sh 2>&1 | tee /root/kolab-install.log');
     } else {
         die 'Unknow kolab_installation_method: '.$config{'kolab_installation_method'};
     }
     
     # ====
-    print "* Stopping services:\n";
-    remote_command($domip, '/etc/init.d/apache2 stop');
-    remote_command($domip, '/etc/init.d/kolabd stop');
-    remote_command($domip, '/etc/init.d/kolab-cyrus stop');
-    remote_command($domip, '/etc/init.d/postfix stop');
-    remote_command($domip, '/etc/init.d/saslauthd stop');
-    remote_command($domip, '/etc/init.d/slapd stop');
-    remote_command($domip, '/etc/init.d/amavis stop #optionally');
-
+    if($config{'kolab_installation_method'} eq 'native') {
+        print "* Stopping services:\n";
+        remote_command($domip, '/etc/init.d/apache2 stop');
+        remote_command($domip, '/etc/init.d/kolabd stop');
+        remote_command($domip, '/etc/init.d/kolab-cyrus stop');
+        remote_command($domip, '/etc/init.d/postfix stop');
+        remote_command($domip, '/etc/init.d/saslauthd stop');
+        remote_command($domip, '/etc/init.d/slapd stop');
+        remote_command($domip, '/etc/init.d/amavis stop #optionally');
+    }
+    
     # ====
     print "* Kolab bootstrap:\n";
     my $exp = console_create($domid, $domname);
@@ -824,17 +825,23 @@
 
     # ====
     print "* Starting services:\n";
-    remote_command($domip, '/etc/init.d/amavis start #optionally');
-    remote_command($domip, '/etc/init.d/slapd start');
-    remote_command($domip, '/etc/init.d/saslauthd start');
-    remote_command($domip, '/etc/init.d/postfix start');
-    remote_command($domip, '/etc/init.d/kolab-cyrus start');
-    remote_command($domip, '/etc/init.d/kolabd start');
-    remote_command($domip, '/etc/init.d/apache2 start');
+    if($config{'kolab_installation_method'} eq 'native') {
+        remote_command($domip, '/etc/init.d/amavis start #optionally');
+        remote_command($domip, '/etc/init.d/slapd start');
+        remote_command($domip, '/etc/init.d/saslauthd start');
+        remote_command($domip, '/etc/init.d/postfix start');
+        remote_command($domip, '/etc/init.d/kolab-cyrus start');
+        remote_command($domip, '/etc/init.d/kolabd start');
+        remote_command($domip, '/etc/init.d/apache2 start');
+    } elsif($config{'kolab_installation_method'} eq 'openpkg') {
+        remote_command($domip, '/kolab/bin/openpkg rc all start');
+    }
 
     # ====
-    print "* Installing PHP Unit:\n";
-    remote_command($domip, 'apt-get -qy install phpunit');
+    if($config{'kolab_installation_method'} eq 'native') {
+        print "* Installing PHP Unit:\n";
+        remote_command($domip, 'apt-get -qy install phpunit');
+    }
 }
 
 #-------------------------------------------------------