aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@mpb-geekgod.geekgod.com>2009-06-18 17:40:02 -0400
committerScott Ullrich <sullrich@mpb-geekgod.geekgod.com>2009-06-18 17:40:02 -0400
commit6e522a3a37dfda52289883b27dd9737136dceeda (patch)
tree312bfde42c5367103163b6efa34f0298fc6c3b24
parent102a8558132b61c919cda2bd9952cb5a1cacbf27 (diff)
downloadpfsense-packages-6e522a3a37dfda52289883b27dd9737136dceeda.tar.gz
pfsense-packages-6e522a3a37dfda52289883b27dd9737136dceeda.tar.bz2
pfsense-packages-6e522a3a37dfda52289883b27dd9737136dceeda.zip
* Store httpdocs root in /usr/local/apache
* Add apache_mod_security_physical.inc for Marks bits
-rw-r--r--config/apache_mod_security/apache_mod_security.inc11
-rw-r--r--config/apache_mod_security/apache_mod_security_physical.inc0
-rw-r--r--config/apache_mod_security/apache_mod_security_settings.xml92
3 files changed, 99 insertions, 4 deletions
diff --git a/config/apache_mod_security/apache_mod_security.inc b/config/apache_mod_security/apache_mod_security.inc
index e6922689..0a7a6df8 100644
--- a/config/apache_mod_security/apache_mod_security.inc
+++ b/config/apache_mod_security/apache_mod_security.inc
@@ -1,14 +1,17 @@
<?php
-
// Syntax:ProxyPreserveHost On|Off
+require_once("apache_mod_security_physical.inc");
+
function apache_mod_security_install() {
-
+ conf_mount_rw();
+ if(!is_dir("/usr/local/apache"))
+ safe_mkdir("/usr/local/apache");
}
function apache_mod_security_deinstall() {
-
+
}
function generate_apache_configuration() {
@@ -215,7 +218,7 @@ ServerAdmin {$global_site_email}
# documents. By default, all requests are taken from this directory, but
# symbolic links and aliases may be used to point to other locations.
#
-DocumentRoot "/usr/local/www/apache22/data"
+DocumentRoot "/usr/local/apache"
#
# Each directory to which Apache has access can be configured with respect
diff --git a/config/apache_mod_security/apache_mod_security_physical.inc b/config/apache_mod_security/apache_mod_security_physical.inc
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/config/apache_mod_security/apache_mod_security_physical.inc
diff --git a/config/apache_mod_security/apache_mod_security_settings.xml b/config/apache_mod_security/apache_mod_security_settings.xml
new file mode 100644
index 00000000..beae08e1
--- /dev/null
+++ b/config/apache_mod_security/apache_mod_security_settings.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE packagegui SYSTEM "./schema/packages.dtd">
+<?xml-stylesheet type="text/xsl" href="./xsl/package.xsl"?>
+<packagegui>
+ <copyright>
+ <![CDATA[
+/* $Id$ */
+/* ========================================================================== */
+/*
+ apache_mod_security_settings.xml
+ part of pfSense (http://www.pfSense.com)
+ Copyright (C) 2008 Scott Ullrich
+ All rights reserved.
+ */
+/* ========================================================================== */
+/*
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ */
+/* ========================================================================== */
+ ]]>
+ </copyright>
+ <name>apache_mod_security_settings</name>
+ <version>1.0</version>
+ <title>Settings</title>
+ <aftersaveredirect>pkg_edit.php?xml=apache_mod_security_settings.xml&amp;id=0</aftersaveredirect>
+ <include_file>/usr/local/pkg/apache_mod_security.inc</include_file>
+ <tabs>
+ <tab>
+ <text>Proxy Server Settings</text>
+ <url>/pkg.php?xml=apache_mod_security.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>Site Proxies</text>
+ <url>/pkg.php?xml=apache_mod_security.xml</url>
+ <active/>
+ </tab>
+ <tab>
+ <text>Physical Hosting</text>
+ <url>/pkg.php?xml=apache_mod_security_physical_hosting.xml</url>
+ <active/>
+ </tab>
+ </tabs>
+ <fields>
+ <field>
+ <fielddescr>Global site E-mail administrator</fielddescr>
+ <fieldname>globalsiteadminemail</fieldname>
+ <description>Enter the site administrators e-mail address (EX: webmaster@xyz234hosting.com)</description>
+ <type>input</type>
+ </field>
+ <field>
+ <fielddescr>Global site URL (FQDN)</fielddescr>
+ <fieldname>globalsiteurl</fieldname>
+ <description>Enter the site global site URL (EX: www.xyz234hosting.com)<br/>NOTE: Leave blank to use this devices hostname.</description>
+ <type>input</type>
+ </field>
+ <field>
+ <fielddescr>Bind to IP Address</fielddescr>
+ <fieldname>globalbindtoipaddr</fieldname>
+ <description>This is the IP address the Proxy Server will listen on. </description>
+ <type>input</type>
+ </field>
+ <field>
+ <fielddescr>Bind to port</fielddescr>
+ <fieldname>globalbindtoport</fieldname>
+ <description>This is the port the Proxy Server will listen on. </description>
+ <type>input</type>
+ </field>
+ </fields>
+ <custom_php_validation_command>
+ </custom_php_validation_command>
+ <custom_php_resync_config_command>
+ </custom_php_resync_config_command>
+</packagegui> \ No newline at end of file