--- Kolab.pm	2005-06-30 17:30:38.000000000 +0200
+++ Kolab.pm.gentoo2	2005-06-30 17:31:09.000000000 +0200
@@ -356,51 +356,55 @@
 
     if ($haschanged{'slapd'}) {
         &log('K', 'Restarting OpenLDAP...');
-        system("$ap::config->{bindir}/openpkg rc openldap restart &");
+        system("$ap::config->{sysconfdir}/init.d/slurpd restart &");
     }
 
     if ($haschanged{'saslauthd'}) {
         &log('K', 'Restarting SASLAuthd...');
-        system("$ap::config->{bindir}/openpkg rc sasl stop; sleep 1; $ap::config->{sbindir}/saslauthd -a ldap -n 5");
+        system("$ap::config->{sysconfdir}/init.d/saslauthd restart");
     }
 
     if ($haschanged{'apache'}) {
         &log('K', 'Reloading Apache...');
-        system("$ap::config->{sbindir}/apachectl graceful");
+        system("$ap::config->{sysconfdir}/init.d/apache restart");
     }
 
     if ($haschanged{'postfix'}) {
         &log('K', 'Reloading Postfix...');
-        system("$ap::config->{sbindir}/postfix reload");
+        system("$ap::config->{sysconfdir}/init.d/postfix restart");
     }
 
     if ($haschanged{'imapd'}) {
         &log('K', 'Restarting imapd...');
-	# Would it be enough with a reload here? /steffen
-        system("$ap::config->{bindir}/openpkg rc imapd restart");
+        system("$ap::config->{sysconfdir}/init.d/cyrus restart");
     }
 
     if ($haschanged{'amavisd'}) {
         &log('K', 'Restarting amavisd...');
-        system("$ap::config->{bindir}/openpkg rc amavisd restart");
+        system("$ap::config->{sysconfdir}/init.d/amavisd restart");
     }
 
     if ($haschanged{'clamav'}) {
         &log('K', 'Restarting clamav...');
-        system("$ap::config->{bindir}/openpkg rc clamav restart");
+        system("$ap::config->{sysconfdir}/init.d/clamd restart");
     }
 
-    if ($config{'proftpd-ftp'} =~ /true/i) {
-        Kolab::log('K', 'Starting ProFTPd if not running');
-        system("$ap::config->{bindir}/openpkg rc proftpd start");
-        if ($haschanged{'proftpd'}) {
-            &log('K', 'Reloading ProFTPd...');
-            kill('SIGHUP', `cat $ap::config->{ftpserver_pidfile}`);
-        }
-    } else {
-        &log('K', 'Stopping ProFTPd, if running...');
-        system("$ap::config->{bindir}/openpkg rc proftpd stop");
-    }
+    if ($haschanged{'proftpd-ftp'}) {
+        &log('K', 'Restarting proftpd...');
+        system("$ap::config->{sysconfdir}/init.d/proftpd restart");
+    }
+
+#     if ($config{'proftpd-ftp'} =~ /true/i) {
+#         Kolab::log('K', 'Starting ProFTPd if not running');
+#         system("$ap::config->{bindir}/openpkg rc proftpd start");
+#         if ($haschanged{'proftpd'}) {
+#             &log('K', 'Reloading ProFTPd...');
+#             kill('SIGHUP', `cat $prefix$ap::config->{localstatedir}/proftpd/proftpd.pid`);
+#         }
+#     } else {
+#         &log('K', 'Stopping ProFTPd, if running...');
+#         system("$ap::config->{bindir}/openpkg rc proftpd stop");
+#     }
 
     %Kolab::Conf::haschanged = ();