diff options
| author | Chris Buechler <cmb@pfsense.org> | 2015-11-14 23:59:43 -0600 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2015-11-14 23:59:43 -0600 |
| commit | f599c9f71234be234ca827a383f067daf96154db (patch) | |
| tree | 2a26903cc5fbb73e7de5055d20cd2aab038e3898 /config/apache_mod_security/apache_mod_security.inc | |
| parent | 3f7d124b1434945d8df87523b0e7a2d25627016f (diff) | |
| parent | 637eb197dc870f14a85fb2da416ca356c8c35a6e (diff) | |
| download | pfsense-packages-f599c9f71234be234ca827a383f067daf96154db.tar.gz pfsense-packages-f599c9f71234be234ca827a383f067daf96154db.tar.bz2 pfsense-packages-f599c9f71234be234ca827a383f067daf96154db.zip | |
Merge pull request #1157 from doktornotor/patch-13
Diffstat (limited to 'config/apache_mod_security/apache_mod_security.inc')
| -rw-r--r-- | config/apache_mod_security/apache_mod_security.inc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/config/apache_mod_security/apache_mod_security.inc b/config/apache_mod_security/apache_mod_security.inc index 69cc2126..63960b9e 100644 --- a/config/apache_mod_security/apache_mod_security.inc +++ b/config/apache_mod_security/apache_mod_security.inc @@ -49,7 +49,10 @@ function apache_mod_security_install() { generate_apache_configuration(); $filename = "apache_mod_security.sh"; - $start = APACHEDIR . "/sbin/httpd -k start"; + if (APACHEDIR != "/usr/local") { + $start = "/sbin/ldconfig -m " . APACHEDIR . "/lib\n"; + } + $start .= APACHEDIR . "/sbin/httpd -k start"; $stop = APACHEDIR . "/sbin/httpd -k stop"; write_rcfile(array( @@ -73,6 +76,9 @@ function apache_mod_security_deinstall() { // Check Apache configuration syntax function apache_mod_security_checkconfig() { global $config, $g; + if (APACHEDIR != "/usr/local") { + mwexec("/sbin/ldconfig -m " . APACHEDIR . "/lib"); + } $status = mwexec(APACHEDIR . "/sbin/httpd -t"); if ($status) { $input_errors[] = "[apache_mod_security]: There was an error parsing the Apache configuration: {$status}"; @@ -550,7 +556,7 @@ LoadModule status_module libexec/{$apache_version}/mod_status.so LoadModule autoindex_module libexec/{$apache_version}/mod_autoindex.so LoadModule asis_module libexec/{$apache_version}/mod_asis.so LoadModule info_module libexec/{$apache_version}/mod_info.so -LoadModule cgi_module libexec/{$apache_version}/mod_cgi.so +# LoadModule cgi_module libexec/{$apache_version}/mod_cgi.so LoadModule vhost_alias_module libexec/{$apache_version}/mod_vhost_alias.so LoadModule negotiation_module libexec/{$apache_version}/mod_negotiation.so LoadModule dir_module libexec/{$apache_version}/mod_dir.so |