aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2009-06-24 15:37:57 -0400
committerScott Ullrich <sullrich@pfsense.org>2009-06-24 15:37:57 -0400
commit2ba5674549c73bea49066d5cf9684489a637214c (patch)
tree445dfc09a0b6c551566920e5ad2bc4a55bdf4987
parent857109cf41f72e31d5674696bebdf0c476ee0344 (diff)
downloadpfsense-packages-2ba5674549c73bea49066d5cf9684489a637214c.tar.gz
pfsense-packages-2ba5674549c73bea49066d5cf9684489a637214c.tar.bz2
pfsense-packages-2ba5674549c73bea49066d5cf9684489a637214c.zip
Check config with httpd -t
-rw-r--r--config/apache_mod_security/apache_mod_security.inc10
1 files changed, 10 insertions, 0 deletions
diff --git a/config/apache_mod_security/apache_mod_security.inc b/config/apache_mod_security/apache_mod_security.inc
index 536f2f03..777c5801 100644
--- a/config/apache_mod_security/apache_mod_security.inc
+++ b/config/apache_mod_security/apache_mod_security.inc
@@ -93,9 +93,19 @@ function apache_mod_security_deinstall() {
function apache_mod_security_resync() {
global $config, $g;
generate_apache_configuration();
+ apache_mod_security_checkconfig();
apache_mod_security_restart();
}
+function apache_mod_security_checkconfig() {
+ global $config, $g;
+ $status = `https -t`;
+ if(!strstr($status, "OK")) {
+ $input_error = "apache_mod_security_package: There was an error parsing the Apache configuration: {$status}";
+ log_error("apache_mod_security_package: There was an error parsing the Apache configuration: {$status}";);
+ }
+}
+
// Generate mod_proxy specific configuration
function generate_apache_configuration() {
global $config, $g;