Use new module

diff --git a/apache/apache-lib.pl b/apache/apache-lib.pl
index c5fcfa2..78091f9 100644 (file)
--- a/apache/apache-lib.pl
+++ b/apache/apache-lib.pl
@@ -2,12 +2,12 @@
 # Common functions for apache configuration
 
 
+BEGIN { push(@INC, ".."); };
+use WebminCore;
 $directive_type_count = 20;
 
 if ($module_name ne 'htaccess') {
-       do '../web-lib.pl';
        &init_config();
-       do '../ui-lib.pl';
        %access = &get_module_acl();
        @access_types = $access{'types'} eq '*' ? (0 .. $directive_type_count)
                                        : split(/\s+/, $access{'types'});

diff --git a/apache/config-debian-linux-3.1-* b/apache/config-debian-linux-3.1-*
index 2169271..e74bab6 100644 (file)
--- a/apache/config-debian-linux-3.1-*
+++ b/apache/config-debian-linux-3.1-*
@@ -19,3 +19,4 @@ auto_mods=1
 defines_file=/etc/apache2/envvars
 apachectl_path=/usr/sbin/apache2ctl
 show_names=0
+apply_cmd=/usr/sbin/apache2ctl graceful