apache-modsecurity-dev - fix modsecurity update rules, bump apache version to 2.2.23

4 files changed, 915 insertions, 714 deletions

diff --git a/config/apache_mod_security/apache.template b/config/apache_mod_security/apache.template
new file mode 100644
index 00000000..93de58af
--- /dev/null
+++ b/config/apache_mod_security/apache.template
@@ -0,0 +1,572 @@
+<?php
+	// Mod_security enabled?
+	if($settings['memcachesize'] != "0")  {
+		if(file_exists( APACHEDIR ."/libexec/apache22/mod_memcache.so"))
+			$mod_mem_cache = "LoadModule memcache_module libexec/apache22/mod_memcache.so\n";
+		}
+
+/*
+<IfModule mod_security2.c>
+
+
+    # Turn the filtering engine On or Off
+    SecFilterEngine On
+
+	# XXX Add knobs for these
+	SecRuleEngine On
+	SecRequestBodyAccess On
+	SecResponseBodyAccess On
+
+	SecRequestBodyInMemoryLimit {$secrequestbodyinmemorylimit}
+	SecRequestBodyLimit {$secrequestbodylimit}
+
+	{$mod_security_custom}
+
+	SecResponseBodyMimeTypesClear
+	SecResponseBodyMimeType (null) text/plain text/html text/css text/xml
+
+	# XXX Add knobs for these
+	SecUploadDir /var/spool/apache/private
+	SecUploadKeepFiles Off
+
+    # The audit engine works independently and
+    # can be turned On of Off on the per-server or
+    # on the per-directory basis
+    SecAuditEngine {$secauditengine}
+
+	# XXX Add knobs for these
+    # Make sure that URL encoding is valid
+    SecFilterCheckURLEncoding On
+
+	# XXX Add knobs for these
+    # Unicode encoding check
+    SecFilterCheckUnicodeEncoding On
+
+	# XXX Add knobs for these
+    # Only allow bytes from this range
+    SecFilterForceByteRange 1 255
+
+	# Help prevent the effects of a Slowloris-type of attack
+	# $secreadstatelimit
+
+    # Cookie format checks.
+    SecFilterCheckCookieFormat On
+
+    # The name of the audit log file
+    SecAuditLog logs/audit_log
+    
+    #http-guardian Anti-dos protection
+    {$SecGuardianLog}
+
+    # Should mod_security inspect POST payloads
+    SecFilterScanPOST On
+
+	# Include rules from rules/ directory
+	{$mod_security_rules}
+
+</IfModule>
+
+*/
+
+$apache_dir=APACHEDIR;
+	$apache_config = <<<EOF
+##################################################################################
+# NOTE: This file was generated by the pfSense package management system.        #
+#       Please do not edit this file by hand!   If you need to add functionality #
+#       then edit /usr/local/pkg/apache_mod_security* files.                     #
+#                                                                                #
+#       And don't forget to submit your changes to coreteam@pfsense.org          #
+###################################################################################
+#
+# This is the main Apache HTTP server configuration file.  It contains the
+# configuration directives that give the server its instructions.
+# See <URL:http://httpd.apache.org/docs/2.2> for detailed information.
+# In particular, see 
+# <URL:http://httpd.apache.org/docs/2.2/mod/directives.html>
+# for a discussion of each configuration directive.
+#
+# Do NOT simply read the instructions in here without understanding
+# what they do.  They're here only as hints or reminders.  If you are unsure
+# consult the online docs. You have been warned.  
+#
+# Configuration and logfile names: If the filenames you specify for many
+# of the server's control files begin with "/" (or "drive:/" for Win32), the
+# server will use that explicit path.  If the filenames do *not* begin
+# with "/", the value of ServerRoot is prepended -- so "/var/log/foo_log"
+# with ServerRoot set to "/usr/local" will be interpreted by the
+# server as "/usr/local//var/log/foo_log".
+
+#
+# ServerRoot: The top of the directory tree under which the server's
+# configuration, error, and log files are kept.
+#
+# Do not add a slash at the end of the directory path.  If you point
+# ServerRoot at a non-local disk, be sure to point the LockFile directive
+# at a local disk.  If you wish to share the same ServerRoot for multiple
+# httpd daemons, you will need to change at least LockFile and PidFile.
+#
+ServerRoot "{$apache_dir}"
+
+#
+# Listen: Allows you to bind Apache to specific IP addresses and/or
+# ports, instead of the default. See also the <VirtualHost>
+# directive.
+#
+# Change this to Listen on specific IP addresses as shown below to 
+# prevent Apache from glomming onto all bound IP addresses.
+#
+Listen {$global_listen}
+{$aliases}
+
+#
+# Dynamic Shared Object (DSO) Support
+#
+# To be able to use the functionality of a module which was built as a DSO you
+# have to place corresponding `LoadModule' lines at this location so the
+# directives contained in it are actually available _before_ they are used.
+# Statically compiled modules (those listed by `httpd -l') do not need
+# to be loaded here.
+#
+# Example:
+# LoadModule foo_module modules/mod_foo.so
+#
+# have to place corresponding `LoadModule' lines at this location so the
+# LoadModule foo_module modules/mod_foo.so
+LoadModule authn_file_module libexec/apache22/mod_authn_file.so
+LoadModule authn_dbm_module libexec/apache22/mod_authn_dbm.so
+LoadModule authn_anon_module libexec/apache22/mod_authn_anon.so
+LoadModule authn_default_module libexec/apache22/mod_authn_default.so
+LoadModule authn_alias_module libexec/apache22/mod_authn_alias.so
+LoadModule authz_host_module libexec/apache22/mod_authz_host.so
+LoadModule authz_groupfile_module libexec/apache22/mod_authz_groupfile.so
+LoadModule authz_user_module libexec/apache22/mod_authz_user.so
+LoadModule authz_dbm_module libexec/apache22/mod_authz_dbm.so
+LoadModule authz_owner_module libexec/apache22/mod_authz_owner.so
+LoadModule authz_default_module libexec/apache22/mod_authz_default.so
+LoadModule auth_basic_module libexec/apache22/mod_auth_basic.so
+LoadModule auth_digest_module libexec/apache22/mod_auth_digest.so
+LoadModule file_cache_module libexec/apache22/mod_file_cache.so
+LoadModule cache_module libexec/apache22/mod_cache.so
+LoadModule disk_cache_module libexec/apache22/mod_disk_cache.so
+LoadModule dumpio_module libexec/apache22/mod_dumpio.so
+LoadModule include_module libexec/apache22/mod_include.so
+LoadModule filter_module libexec/apache22/mod_filter.so
+LoadModule charset_lite_module libexec/apache22/mod_charset_lite.so
+LoadModule deflate_module libexec/apache22/mod_deflate.so
+LoadModule log_config_module libexec/apache22/mod_log_config.so
+LoadModule logio_module libexec/apache22/mod_logio.so
+LoadModule env_module libexec/apache22/mod_env.so
+LoadModule mime_magic_module libexec/apache22/mod_mime_magic.so
+LoadModule cern_meta_module libexec/apache22/mod_cern_meta.so
+LoadModule expires_module libexec/apache22/mod_expires.so
+LoadModule headers_module libexec/apache22/mod_headers.so
+LoadModule usertrack_module libexec/apache22/mod_usertrack.so
+LoadModule unique_id_module libexec/apache22/mod_unique_id.so
+LoadModule setenvif_module libexec/apache22/mod_setenvif.so
+LoadModule version_module libexec/apache22/mod_version.so
+LoadModule proxy_module libexec/apache22/mod_proxy.so
+LoadModule proxy_connect_module libexec/apache22/mod_proxy_connect.so
+LoadModule proxy_ftp_module libexec/apache22/mod_proxy_ftp.so
+LoadModule proxy_http_module libexec/apache22/mod_proxy_http.so
+LoadModule proxy_ajp_module libexec/apache22/mod_proxy_ajp.so
+LoadModule proxy_balancer_module libexec/apache22/mod_proxy_balancer.so
+LoadModule ssl_module libexec/apache22/mod_ssl.so
+LoadModule mime_module libexec/apache22/mod_mime.so
+LoadModule status_module libexec/apache22/mod_status.so
+LoadModule autoindex_module libexec/apache22/mod_autoindex.so
+LoadModule asis_module libexec/apache22/mod_asis.so
+LoadModule info_module libexec/apache22/mod_info.so
+#LoadModule cgi_module libexec/apache22/mod_cgi.so
+LoadModule vhost_alias_module libexec/apache22/mod_vhost_alias.so
+LoadModule negotiation_module libexec/apache22/mod_negotiation.so
+LoadModule dir_module libexec/apache22/mod_dir.so
+LoadModule imagemap_module libexec/apache22/mod_imagemap.so
+LoadModule actions_module libexec/apache22/mod_actions.so
+LoadModule speling_module libexec/apache22/mod_speling.so
+LoadModule userdir_module libexec/apache22/mod_userdir.so
+LoadModule alias_module libexec/apache22/mod_alias.so
+LoadModule rewrite_module libexec/apache22/mod_rewrite.so
+LoadModule reqtimeout_module libexec/apache22/mod_reqtimeout.so
+{$mod_mem_cache}
+
+<IfModule !mpm_netware_module>
+<IfModule !mpm_winnt_module>
+#
+# If you wish httpd to run as a different user or group, you must run
+# httpd as root initially and it will switch.  
+#
+# User/Group: The name (or #number) of the user/group to run httpd as.
+# It is usually good practice to create a dedicated user and group for
+# running httpd, as with most system services.
+#
+User www
+Group www
+
+</IfModule>
+</IfModule>
+
+# 'Main' server configuration
+#
+# The directives in this section set up the values used by the 'main'
+# server, which responds to any requests that aren't handled by a
+# <VirtualHost> definition.  These values also provide defaults for
+# any <VirtualHost> containers you may define later in the file.
+#
+# All of these directives may appear inside <VirtualHost> containers,
+# in which case these default settings will be overridden for the
+# virtual host being defined.
+#
+# worker MPM
+<IfModule worker.c>
+{$performance_settings}
+</IfModule>
+#
+# ServerAdmin: Your address, where problems with the server should be
+# e-mailed.  This address appears on some server-generated pages, such
+# as error documents.  e.g. admin@your-domain.com
+#
+ServerAdmin {$global_site_email}
+
+#
+# ServerName gives the name and port that the server uses to identify itself.
+# This can often be determined automatically, but we recommend you specify
+# it explicitly to prevent problems during startup.
+#
+# If your host doesn't have a registered DNS name, enter its IP address here.
+#
+ServerName {$servername}
+
+#
+# DocumentRoot: The directory out of which you will serve your
+# documents. By default, all requests are taken from this directory, but
+# symbolic links and aliases may be used to point to other locations.
+#
+DocumentRoot "{$apache_dir}/www/apache22"
+
+#
+# Each directory to which Apache has access can be configured with respect
+# to which services and features are allowed and/or disabled in that
+# directory (and its subdirectories). 
+#
+# First, we configure the "default" to be a very restrictive set of 
+# features.  
+#
+<Directory />
+    AllowOverride None
+    Order deny,allow
+    Deny from all
+</Directory>
+
+#
+# Note that from this point forward you must specifically allow
+# particular features to be enabled - so if something's not working as
+# you might expect, make sure that you have specifically enabled it
+# below.
+#
+
+#
+# This should be changed to whatever you set DocumentRoot to.
+#
+#<Directory "{$apache_dir}/www/apachemodsecurity/">
+#    #
+#    # Possible values for the Options directive are "None", "All",
+#    # or any combination of:
+#    #   Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
+#    #
+#    # Note that "MultiViews" must be named *explicitly* --- "Options All"
+#    # doesn't give it to you.
+#    #
+#    # The Options directive is both complicated and important.  Please see
+#    # http://httpd.apache.org/docs/2.2/mod/core.html#options
+#    # for more information.
+#    #
+#    Options Indexes FollowSymLinks
+#
+#    #
+#    # AllowOverride controls what directives may be placed in .htaccess files.
+#    # It can be "All", "None", or any combination of the keywords:
+#    #   Options FileInfo AuthConfig Limit
+#    #
+#    AllowOverride None
+#
+#    #
+#    # Controls who can get stuff from this server.
+#    #
+#    Order allow,deny
+#    Allow from all
+#
+#</Directory>
+#
+#
+# DirectoryIndex: sets the file that Apache will serve if a directory
+# is requested.
+#
+#<IfModule dir_module>
+#    DirectoryIndex index.html
+#</IfModule>
+#
+#
+# The following lines prevent .htaccess and .htpasswd files from being 
+# viewed by Web clients. 
+#
+#<FilesMatch "^\.ht">
+#    Order allow,deny
+#    Deny from all
+#    Satisfy All
+#</FilesMatch>
+#
+#
+# ErrorLog: The location of the error log file.
+# If you do not specify an ErrorLog directive within a <VirtualHost>
+# container, error messages relating to that virtual host will be
+# logged here.  If you *do* define an error logfile for a <VirtualHost>
+# container, that host's errors will be logged there and not here.
+#
+ErrorLog "/var/log/httpd-error.log"
+
+#
+# LogLevel: Control the number of messages logged to the error_log.
+# Possible values include: debug, info, notice, warn, error, crit,
+# alert, emerg.
+#
+LogLevel warn
+
+<IfModule log_config_module>
+    #
+    # The following directives define some format nicknames for use with
+    # a CustomLog directive (see below).
+    #
+    LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+    LogFormat "%h %l %u %t \"%r\" %>s %b" common
+
+    <IfModule logio_module>
+      # You need to enable mod_logio.c to use %I and %O
+      LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio
+    </IfModule>
+
+    #
+    # The location and format of the access logfile (Common Logfile Format).
+    # If you do not define any access logfiles within a <VirtualHost>
+    # container, they will be logged here.  Contrariwise, if you *do*
+    # define per-<VirtualHost> access logfiles, transactions will be
+    # logged therein and *not* in this file.
+    #
+    #CustomLog "/var/log/httpd-access.log" common
+
+    #
+    # If you prefer a logfile with access, agent, and referer information
+    # (Combined Logfile Format) you can use the following directive.
+    #
+    CustomLog "/var/log/httpd-access.log" combined
+</IfModule>
+
+#<IfModule alias_module>
+#    #
+#    # Redirect: Allows you to tell clients about documents that used to 
+#    # exist in your server's namespace, but do not anymore. The client 
+#    # will make a new request for the document at its new location.
+#    # Example:
+#    # Redirect permanent /foo http://www.example.com/bar
+#
+#    #
+#    # Alias: Maps web paths into filesystem paths and is used to
+#    # access content that does not live under the DocumentRoot.
+#    # Example:
+#    # Alias /webpath /full/filesystem/path
+#    #
+#    # If you include a trailing / on /webpath then the server will
+#    # require it to be present in the URL.  You will also likely
+#    # need to provide a <Directory> section to allow access to
+#    # the filesystem path.
+#
+#    #
+#    # ScriptAlias: This controls which directories contain server scripts. 
+#    # ScriptAliases are essentially the same as Aliases, except that
+#    # documents in the target directory are treated as applications and
+#    # run by the server when requested rather than as documents sent to the
+#    # client.  The same rules about trailing "/" apply to ScriptAlias
+#    # directives as to Alias.
+#    #
+#    ScriptAlias /cgi-bin/ "/usr/local/www/apache22/cgi-bin/"
+#
+#</IfModule>
+
+#<IfModule cgid_module>
+#    #
+#    # ScriptSock: On threaded servers, designate the path to the UNIX
+#    # socket used to communicate with the CGI daemon of mod_cgid.
+#    #
+#    #Scriptsock /var/run/cgisock
+#</IfModule>
+
+#
+# "/usr/local/www/apache22/cgi-bin" should be changed to whatever your ScriptAliased
+# CGI directory exists, if you have that configured.
+#
+#<Directory "{$apache_dir}/www/apache22/cgi-bin">
+#    AllowOverride None
+#    Options None
+#    Order allow,deny
+#    Allow from all
+#</Directory>
+
+#
+# DefaultType: the default MIME type the server will use for a document
+# if it cannot otherwise determine one, such as from filename extensions.
+# If your server contains mostly text or HTML documents, "text/plain" is
+# a good value.  If most of your content is binary, such as applications
+# or images, you may want to use "application/octet-stream" instead to
+# keep browsers from trying to display binary files as though they are
+# text.
+#
+DefaultType text/plainm
+
+<IfModule mime_module>
+    #
+    # TypesConfig points to the file containing the list of mappings from
+    # filename extension to MIME-type.
+    #
+    TypesConfig etc/apache22/mime.types
+
+    #
+    # AddType allows you to add to or override the MIME configuration
+    # file specified in TypesConfig for specific file types.
+    #
+    #AddType application/x-gzip .tgz
+    #
+    # AddEncoding allows you to have certain browsers uncompress
+    # information on the fly. Note: Not all browsers support this.
+    #
+    #AddEncoding x-compress .Z
+    #AddEncoding x-gzip .gz .tgz
+    #
+    # If the AddEncoding directives above are commented-out, then you
+    # probably should define those extensions to indicate media types:
+    #
+    AddType application/x-compress .Z
+    AddType application/x-gzip .gz .tgz
+
+    #
+    # AddHandler allows you to map certain file extensions to "handlers":
+    # actions unrelated to filetype. These can be either built into the server
+    # or added with the Action directive (see below)
+    #
+    # To use CGI scripts outside of ScriptAliased directories:
+    # (You will also need to add "ExecCGI" to the "Options" directive.)
+    #
+    #AddHandler cgi-script .cgi
+
+    # For type maps (negotiated resources):
+    #AddHandler type-map var
+
+    #
+    # Filters allow you to process content before it is sent to the client.
+    #
+    # To parse .shtml files for server-side includes (SSI):
+    # (You will also need to add "Includes" to the "Options" directive.)
+    #
+    #AddType text/html .shtml
+    #AddOutputFilter INCLUDES .shtml
+</IfModule>
+
+#
+# The mod_mime_magic module allows the server to use various hints from the
+# contents of the file itself to determine its type.  The MIMEMagicFile
+# directive tells the module where the hint definitions are located.
+#
+#MIMEMagicFile etc/apache22/magic
+
+#
+# Customizable error responses come in three flavors:
+# 1) plain text 2) local redirects 3) external redirects
+#
+# Some examples:
+
+{$errordocument}
+
+#ErrorDocument 500 "The server made a boo boo."
+#ErrorDocument 404 /missing.html
+#ErrorDocument 404 "/cgi-bin/missing_handler.pl"
+#ErrorDocument 402 http://www.example.com/subscription_info.html
+#
+
+#
+# EnableMMAP and EnableSendfile: On systems that support it, 
+# memory-mapping or the sendfile syscall is used to deliver
+# files.  This usually improves server performance, but must
+# be turned off when serving from networked-mounted 
+# filesystems or if support for these functions is otherwise
+# broken on your system.
+#
+#EnableMMAP off
+#EnableSendfile off
+
+# Supplemental configuration
+#
+# The configuration files in the etc/apache22/extra/ directory can be 
+# included to add extra features or to modify the default configuration of 
+# the server, or you may simply copy their contents here and change as 
+# necessary.
+
+# Server-pool management (MPM specific)
+#Include etc/apache22/extra/httpd-mpm.conf
+
+# Multi-language error messages
+#Include etc/apache22/extra/httpd-multilang-errordoc.conf
+
+# Fancy directory listings
+#Include etc/apache22/extra/httpd-autoindex.conf
+
+# Language settings
+#Include etc/apache22/extra/httpd-languages.conf
+
+# User home directories
+#Include etc/apache22/extra/httpd-userdir.conf
+
+# Real-time info on requests and configuration
+#Include etc/apache22/extra/httpd-info.conf
+
+# Virtual hosts
+#Include etc/apache22/extra/httpd-vhosts.conf
+
+# Local access to the Apache HTTP Server Manual
+#Include etc/apache22/extra/httpd-manual.conf
+
+# Distributed authoring and versioning (WebDAV)
+#Include etc/apache22/extra/httpd-dav.conf
+
+# Various default settings
+#Include etc/apache22/extra/httpd-default.conf
+
+# Secure (SSL/TLS) connections
+#Include etc/apache22/extra/httpd-ssl.conf
+#
+# Note: The following must must be present to support
+#       starting without SSL on platforms with no /dev/random equivalent
+#       but a statically compiled-in mod_ssl.
+#
+<IfModule ssl_module>
+SSLRandomSeed startup builtin
+SSLRandomSeed connect builtin
+</IfModule>
+
+# Cache settings
+{$mem_cache}
+{$cache_root}
+
+#accf_http are not present on current build
+AcceptFilter http none
+AcceptFilter https none
+
+# Mod security
+{$mod_security}
+
+# Proxysettings
+{$mod_proxy}
+
+# Include anything else
+Include etc/apache22/Includes/*.conf
+
+EOF;
+
+?>
\ No newline at end of file
diff --git a/config/apache_mod_security/apache_mod_security.inc b/config/apache_mod_security/apache_mod_security.inc
index af8159bf..76208c70 100644
--- a/config/apache_mod_security/apache_mod_security.inc
+++ b/config/apache_mod_security/apache_mod_security.inc
@@ -3,15 +3,16 @@
 	apache_mod_security.inc
 	part of apache_mod_security package (http://www.pfSense.com)
 	Copyright (C) 2009, 2010 Scott Ullrich
+	Copyright (C) 2012 Marcello Coutinho
 	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,
+	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
+	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.
 
@@ -26,33 +27,50 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
-
+$shortcut_section = "apache";
+// Check to find out on which system the package is running
+$pf_version=substr(trim(file_get_contents("/etc/version")),0,3);
+if ($pf_version > 2.0)
+	define('APACHEDIR', '/usr/pbi/proxy_mod_security-' . php_uname("m"));
+else
+  define('APACHEDIR', '/usr/local');
+// End of system check
+define ('MODSECURITY_DIR','crs');
 // Rules directory location
-define("rules_directory", "/usr/local/apachemodsecurity/rules");
+define("rules_directory", APACHEDIR . "/". MODSECURITY_DIR);
+function apache_textarea_decode($base64){
+	return preg_replace("/\r\n/","\n",base64_decode($base64));
+}
+
+function apache_get_real_interface_address($iface) {
+	global $config;
+	if ($iface == "All")
+		return array("*", "");
+	if (preg_match("/\d+\.\d+/",$iface))
+		return array($iface, "");
+	$iface = convert_friendly_interface_to_real_interface_name($iface);
+	$line = trim(shell_exec("ifconfig $iface | grep inet | grep -v inet6"));
+	list($dummy, $ip, $dummy2, $netmask) = explode(" ", $line);
+	return array($ip, long2ip(hexdec($netmask)));
+}
 
 // Ensure NanoBSD can write. pkg_mgr will remount RO
 conf_mount_rw();
 
-// Needed mod_security directories
-if(!is_dir("/usr/local/apachemodsecurity"))  	
-	safe_mkdir("/usr/local/apachemodsecurity");
-if(!is_dir("/usr/local/apachemodsecurity/rules")) 
-	safe_mkdir("/usr/local/apachemodsecurity/rules");
-
-// Startup function	
+// Startup function
 function apache_mod_security_start() {
-	exec("/usr/local/sbin/httpd -k start");
+	exec(APACHEDIR . "/sbin/httpd -D NOHTTPACCEPT -k start");
 }
 
 // Shutdown function
 function apache_mod_security_stop() {
-	exec("/usr/local/sbin/httpd -k stop");
+	exec(APACHEDIR . "/sbin/httpd -k stop");
 }
 
 // Restart function
 function apache_mod_security_restart() {
 	if(is_process_running("httpd")) {
-		exec("/usr/local/sbin/httpd -k graceful");
+		exec(APACHEDIR . "/sbin/httpd -k graceful");
 	} else {
 		apache_mod_security_start();		
 	}
@@ -96,7 +114,7 @@ ENDPHP\n";
 function apache_mod_security_deinstall() {
 	global $config, $g;
 	apache_mod_security_stop();
-	exec("/bin/rm -rf /usr/local/apachemodsecurity");
+	exec("/bin/rm -rf " . APACHEDIR . "/". MODSECURITY_DIR);
 	exec("/bin/rm -f /usr/local/etc/rc.d/apache_mod_security.sh");
 }
 
@@ -104,27 +122,33 @@ function apache_mod_security_deinstall() {
 function apache_mod_security_resync() {
 	global $config, $g;
 	apache_mod_security_install();
-	if(!file_exists(rules_directory . "/10_asl_rules.conf"))
-		exec("/usr/bin/fetch -q -o " . rules_directory . "/10_asl_rules.conf http://www.pfsense.com/packages/config/apache_mod_security/rules/10_asl_rules.conf");
-	if(!file_exists(rules_directory . "/a_exclude.conf"))
-		exec("/usr/bin/fetch -q -o " . rules_directory . "/a_exclude.conf http://www.pfsense.com/packages/config/apache_mod_security/rules/a_exclude.conf");
-	if(!file_exists(rules_directory . "/blacklist.conf"))
-		exec("/usr/bin/fetch -q -o " . rules_directory . "/blacklist.conf http://www.pfsense.com/packages/config/apache_mod_security/rules/blacklist.conf");
-	if(!file_exists(rules_directory . "/default.conf"))
-		exec("/usr/bin/fetch -q -o " . rules_directory . "/rules/default.conf http://www.pfsense.com/packages/config/apache_mod_security/rules/default.conf");
-	if(!file_exists(rules_directory . "/recons.conf"))
-		exec("/usr/bin/fetch -q -o " . rules_directory . "/recons.conf http://www.pfsense.com/packages/config/apache_mod_security/rules/recons.conf");
-	if(!file_exists(rules_directory . "/rootkits.conf"))
-		exec("/usr/bin/fetch -q -o " . rules_directory . "/rootkits.conf http://www.pfsense.com/packages/config/apache_mod_security/rules/rootkits.conf");
-	if(!file_exists(rules_directory . "/useragents.conf"))
-		exec("/usr/bin/fetch -q -o " . rules_directory . "/useragents.conf http://www.pfsense.com/packages/config/apache_mod_security/rules/useragents.conf");
+	$dirs=array("base", "experimental","optional", "slr");
+	if (! file_exists(APACHEDIR ."/". MODSECURITY_DIR . "/LICENSE")){
+		exec ("/usr/local/bin/git clone https://github.com/SpiderLabs/owasp-modsecurity-crs.git ".APACHEDIR."/".MODSECURITY_DIR);
+		//chdir (APACHEDIR."/".MODSECURITY_DIR);
+		//exec ("/usr/local/bin/git checkout -q 2.2.8");
+	}
+	$write_config=0;
+	foreach ($dirs as $dir){
+		if ($handle = opendir(APACHEDIR ."/".MODSECURITY_DIR."/{$dir}_rules")) {
+			$write_config++;
+			$config['installedpackages']["modsecurityfiles{$dir}"]['config']=array();
+			while (false !== ($entry = readdir($handle))) {
+				if (preg_match("/(\S+).conf/",$entry,$matches))
+					$config["installedpackages"]["modsecurityfiles{$dir}"]["config"][]=array("file"=>$matches[1]);
+				}
+			closedir($handle);
+			}
+			}
+	if ($write_config > 0)
+		write_config();
 	apache_mod_security_checkconfig();
 	apache_mod_security_restart();
 }
 
 function apache_mod_security_checkconfig() {
 	global $config, $g;
-	$status = mwexec("/usr/local/sbin/httpd -t");
+	$status = mwexec(APACHEDIR ."/sbin/httpd -t");
 	if($status) {
 		$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}");
@@ -135,107 +159,285 @@ function apache_mod_security_checkconfig() {
 function generate_apache_configuration() {
 	global $config, $g;
 	$mod_proxy = "";
+	$write_config=0;
+	// check current config
+	if (is_array($config['installedpackages']['apachesettings']))
+		$settings=$config['installedpackages']['apachesettings']['config'][0];
+	else
+		$settings=array();
 
 	// Set global site e-mail
-	if($config['installedpackages']['apachemodsecuritysettings']['config'][0]['globalsiteadminemail']) {
-		$global_site_email = $config['installedpackages']['apachemodsecuritysettings']['config'][0]['globalsiteadminemail'];
-	} else {
-                $config['installedpackages']['apachemodsecuritysettings']['config'][0]['globalsiteadminemail'] = "admin@admin.com";
-                $global_site_email = $config['installedpackages']['apachemodsecuritysettings']['config'][0]['globalsiteadminemail'];
-                // update configuration with default value in this case
-                write_config($pkg['addedit_string']);
-		log_error("WARNING!  Global site Administrator E-Mail address has not been set.  Defaulting to bogus e-mail address.");
-	}
+	if ($settings['globalsiteadminemail']){
+		$global_site_email = $settings['globalsiteadminemail'];
+		} 
+	else {
+		$global_site_email = "admin@admin.com";
+		$config['installedpackages']['apachesettings']['config'][0]['globalsiteadminemail'] = "admin@admin.com";
+		// update configuration with default value in this case
+		log_error("apache_mod_security_package: WARNING!  Global site Administrator E-Mail address has not been set.  Defaulting to bogus e-mail address.");
+		$write_config ++;
+		}
 
 	// Set ServerName
-	if($config['installedpackages']['apachemodsecuritysettings']['config'][0]['hostname']) {
-		$servername = "ServerName {$config['installedpackages']['apachemodsecuritysettings']['config'][0]['hostname']}\n";
-	} else {
-		$servername = "ServerName " . `hostname` . "\n";
-		$config['installedpackages']['apachemodsecuritysettings']['config'][0]['hostname'] = `hostname`;
-                // update configuration with default value in this case
-                write_config($pkg['addedit_string']);
-	}
+	if($settings['hostname'] != ""){
+		$servername = $settings['hostname'];
+		}
+	else {
+		$servername = php_uname('n');
+		$config['installedpackages']['apachesettings']['config'][0]['hostname'] = `hostname`;
+		// update configuration with default value in this case
+		$write_config ++;
+		}
 
+	//check if servername has an valid ip
+	$ip=gethostbyname(php_uname('n'));
+	if ($ip==php_uname('n')){
+		$error='apache_mod_security_package: Apache cannot start, hostname does not resolv. You can workaround this if you add a dns entry for '.php_uname('n').' or add a Host Overrides entry on services -> Dns Forwarder pointing '.php_uname('n').' to 127.0.0.1.';
+		log_error($error);
+		file_notice("apache_mod_security", $error, "apache_mod_security", "");
+	}
 	// Set global listening directive and ensure nothing is listening on this port already
-	$globalbind = $config['installedpackages']['apachemodsecuritysettings']['config'][0]['globalbindtoipaddr'];
-	$socksstat = split("\n", `/usr/bin/sockstat | awk '{ print $6 }' | grep ":{$globalbind}" | cut -d ":" -f2`);
+	$globalbind_ip = ($settings['globalbindtoipaddr'] ? $settings['globalbindtoipaddr'] : "*");
+	$globalbind_port = $settings['globalbindtoport'];
+	if ($globalbind_port == ""){
+		$globalbind_port ="80";
+		$config['installedpackages']['apachesettings']['config'][0]['globalbindtoipport'] = $globalbind_port;
+		$write_config ++;
+		}
+	$global_listen ="{$globalbind_ip}:{$globalbind_port}";
+	// update configuration with default value in this case
+	if ($write_config > 0)
+		write_config();
+	
+	// check if any daemon is using apache ip/port
+	exec("/usr/bin/sockstat | grep -v ' httpd ' | awk '{ print $6 }' | grep ':{$globalbind_port}'",$socksstat);
+	unset ($already_binded);
 	if(is_array($socksstat)) {
 		foreach($socksstat as $ss) {
-			if($ss == $globalbind) {
-				$already_binded = true;
+			list($ss_ip,$ss_port)=explode(":",$ss);
+			#check if port is in use
+			if($ss_port == $globalbind_port) {
+				#check if it's the same ip or any ip
+				if ($globalbind_ip = "*" || $globalbind_ip == $ss_ip)
+					$already_binded = true;
 				$input_errors[] = "Sorry, there is a process already listening on port {$globalbind}";
+				}
 			}
 		}
-	}
-//	if(!$already_binded) {
-		if($config['installedpackages']['apachemodsecuritysettings']['config'][0]['globalbindtoipaddr']) {
-			$global_listen  =  $config['installedpackages']['apachemodsecuritysettings']['config'][0]['globalbindtoipaddr'];
-			if($config['installedpackages']['apachemodsecuritysettings']['config'][0]['globalbindtoport'])
-				$global_listen .= ":" . $config['installedpackages']['apachemodsecuritysettings']['config'][0]['globalbindtoport'];
-			else 
-				$global_listen .= ":80";
-		} else {
- 	               	$config['installedpackages']['apachemodsecuritysettings']['config'][0]['globalbindtoipaddr'] = "";
-        	        $global_listen  =  $config['installedpackages']['apachemodsecuritysettings']['config'][0]['globalbindtoipaddr'];
-			// update configuration with default value in this case
-			 write_config($pkg['addedit_string']);		
-			if($config['installedpackages']['apachemodsecuritysettings']['config'][0]['globalbindtoport'])
-				$global_listen .= ":" . $config['installedpackages']['apachemodsecuritysettings']['config'][0]['globalbindtoport'];
-			else 
-				$global_listen .= ":80";
-		}
-//	} else {
-//		log_error("Could not start mod_security + mod_proxy on port {$global_listen}.  Process is already bound to this port.");
-//	}
+	if(isset($already_binded))
+		log_error("apache_mod_security_package: Could not start daemon on port {$global_listen}. Another process is already bound to this port.");
+	
+	//performance settings
+	//reference http://httpd.apache.org/docs/2.2/mod/mpm_common.html
+	$keepalive=($settings['keepalive']?$settings['keepalive']:"on");
+	$performance_settings="KeepAlive {$keepalive}\n";
+	if ($settings['maxkeepalivereq'])
+		$performance_settings .= "MaxKeepAliveRequests {$settings['maxkeepalivereq']}\n";
+	if ($settings['keepalivetimeout'])
+		$performance_settings .= "KeepAliveTimeout {$settings['keepalivetimeout']}\n";
+	if ($settings['serverlimit'])
+		$performance_settings .= "ServerLimit {$settings['serverlimit']}\n";
+	if ($settings['startservers'])
+		$performance_settings .= "StartServers {$settings['startservers']}\n";
+	if ($settings['minsparethreads'])
+		$performance_settings .= "MinSpareThreads {$settings['minsparethreads']}\n";
+	if ($settings['maxsparethreads'])
+		$performance_settings .= "MaxSpareThreads {$settings['maxsparethreads']}\n";
+	if ($settings['threadslimit'])
+		$performance_settings .= "ThreadsLimit {$settings['threadslimit']}\n";
+	if ($settings['threadstacksize'])
+		$performance_settings .= "ThreadStackSize {$settings['threadstacksize']}\n";
+	if ($settings['threadsperchild'])
+		$performance_settings .= "ThreadsPerChild {$settings['threadsperchild']}\n";
+	if ($settings['maxclients'])
+		$performance_settings .= "MaxClients {$settings['maxclients']}\n";
+	if ($settings['maxrequestsperchild'])
+		$performance_settings .= "MaxRequestsPerChild {$settings['maxrequestsperchild']}\n";	
 	
 	// Setup mem_cache
-	if(file_exists("/usr/local/libexec/apache22/mod_mem_cache.so")) {
-		if($config['installedpackages']['apachemodsecuritysettings']['config'][0]['mod_mem_cache']) {
-			if($config['installedpackages']['apachemodsecuritysettings']['config'][0]['mod_mem_cache_size'])
-				$mcachesize = $config['installedpackages']['apachemodsecuritysettings']['config'][0]['mod_mem_cache_size'];
-			else 
-				$mcachesize = "100";
-			//$mem_cache = "MCacheSize $mcachesize\n";
+	if(file_exists(APACHEDIR ."/libexec/apache22/mod_memcache.so") && $settings['memcachesize'] != "0") {
+		//$mem_cache = "MCacheSize ".( $settings['memcachesize'] ? $settings['memcachesize'] : "100")."\n";
 		}
-	}
-
+		
 	// CacheRoot Directive
-	if($config['installedpackages']['apachemodsecuritysettings']['config'][0]['mod_disk_cache']) {
+	if($settings['diskcachesize'] != "0") {
 		safe_mkdir("/var/db/apachemodsecuritycache");
 		$cache_root .= "CacheRoot /var/db/apachemodsecuritycache\n";
+		$cache_root .= "CacheMaxFileSize ".($settings['diskcachesize'] ? $settings['diskcachesize'] : "1000000")."\n";
 	}
 
 	// SecRequestBodyInMemoryLimit Directive
-	if($config['installedpackages']['apachemodsecuritysettings']['config'][0]['secrequestbodyinmemorylimit']) 
-		$secrequestbodyinmemorylimit = $config['installedpackages']['apachemodsecuritysettings']['config'][0]['secrequestbodyinmemorylimit'];
-	else 
-		$secrequestbodyinmemorylimit = "131072";
+	$secrequestbodyinmemorylimit = ($settings['secrequestbodyinmemorylimit'] ? $settings['secrequestbodyinmemorylimit'] : "131072");
 
 	// SecRequestBodyLimit
-	if($config['installedpackages']['apachemodsecuritysettings']['config'][0]['secrequestbodylimit']) 
-		$secrequestbodylimit = $config['installedpackages']['apachemodsecuritysettings']['config'][0]['secrequestbodylimit'];
-	else 
-		$secrequestbodylimit = "10485760";
+	$secrequestbodylimit = ($settings['secrequestbodylimit'] ? $settings['secrequestbodylimit'] :"10485760");
 
 	// ErrorDocument
-	if($config['installedpackages']['apachemodsecuritysettings']['config'][0]['errordocument']) 
-		$errordocument = $config['installedpackages']['apachemodsecuritysettings']['config'][0]['errordocument'];
-	else 
-		$errordocument = "";
+	$errordocument = ($settings['errordocument'] ? $settings['errordocument'] : "");
 
 	// SecAuditEngine
-	if($config['installedpackages']['apachemodsecuritysettings']['config'][0]['secauditengine']) 
-		$secauditengine = $config['installedpackages']['apachemodsecuritysettings']['config'][0]['secauditengine'];
-	else 
-		$secauditengine = "RelevantOnly";
+	$secauditengine = ($settings['secauditengine'] ? $settings['secauditengine'] : "RelevantOnly");
 
 	// SecReadStateLimit
-	if($config['installedpackages']['apachemodsecuritysettings']['config'][0]['SecReadStateLimit']) 
-		$secreadstatelimit = "SecReadStateLimit " . $config['installedpackages']['apachemodsecuritysettings']['config'][0]['SecReadStateLimit'] ."\n";
-	else 
-		$secreadstatelimit = "";
+	$secreadstatelimit = ($settings['SecReadStateLimit'] ? $settings['SecReadStateLimit'] :"");
+	
+	//Configure balancers/backends
+	if (is_array($config['installedpackages']['apachebalancer'])){
+		#load conf template
+		include("/usr/local/pkg/apache_balancer.template");
+
+		#check balancer members
+		foreach ($config['installedpackages']['apachebalancer']['config'] as $balancer){
+			if (is_array($balancer['row']) && $balancer['enable'] == 'on'){
+				$balancer_config.="# {$balancer['description']}\n";
+				$balancer_config.="<Proxy balancer://{$balancer['name']}>\n";
+				foreach($balancer['row'] as $server){
+					$options =($server['port'] ? ":{$server['port']}" : "");
+					
+					$options.=($server['routeid'] ? " route={$server['routeid']}" : "");
+					$options.=($server['loadfactor'] ? " loadfactor={$server['loadfactor']}" : "");
+					if (isset($server['ping'])){
+						$options.= " ping={$server['ping']}";
+						$options.=($server['ttl'] ? " ttl={$server['ttl']}" : "");
+						}
+					$balancer_config.="  BalancerMember {$balancer['proto']}://{$server['host']}{$options}\n"; 
+					}
+				#check if stick connections are set
+				if ($balancer['row'][0]['routeid'] !="")
+					$balancer_config.="  ProxySet stickysession=ROUTEID\n";
+				$balancer_config.="</Proxy>\n\n";
+				}
+			}
+		//write balancer conf
+		file_put_contents(APACHEDIR."/etc/apache22/Includes/balancers.conf",$balancer_config,LOCK_EX);
+		}
+		
+	//configure virtual hosts
+	$namevirtualhosts=array();
+	$namevirtualhosts[0]=$global_listen;
+	if (is_array($config['installedpackages']['apachevirtualhost'])){
+		$vh_config= <<<EOF
+##################################################################################
+# NOTE: This file was generated by the pfSense package management system.        #
+#       Please do not edit this file by hand!   If you need to add functionality #
+#       then edit /usr/local/pkg/apache_* files.                                 #
+#                                                                                #
+#       And don't forget to submit your changes to:                              #
+#       https://github.com/pfsense/pfsense-packages                              #
+##################################################################################
 
+
+EOF;
+		$default_port=array('http'=>'80', 'https'=> '443');
+		foreach ($config['installedpackages']['apachevirtualhost']['config'] as $virtualhost){
+			if (is_array($virtualhost['row']) && $virtualhost['enable'] == 'on'){
+				$iface_address = apache_get_real_interface_address($virtualhost['interface']);
+				$ip=$iface_address[0];
+				$port=($virtualhost['port'] ? $virtualhost['port'] : $default_port[$virtualhost['proto']]);
+				if (!in_array("{$ip}:{$port}",$namevirtualhosts))
+					$namevirtualhosts[]="{$ip}:{$port}";
+				
+				$vh_config.="# {$virtualhost['description']}\n";
+				$vh_config.="<VirtualHost {$ip}:{$port}>\n";
+				$vh_config.=" ServerName ". preg_replace ("/\r\n(\S+)/","\n ServerAlias $1",base64_decode($virtualhost['primarysitehostname'])) ."\n";
+				$vh_config.=" ServerAdmin ".($virtualhost['siteemail'] ? $virtualhost['siteemail'] : $settings['globalsiteadminemail'])."\n";
+				#check log
+				switch ($virtualhost['logfile']){
+					case "default":
+						$vh_config.=" ErrorLog /var/log/httpd-error.log\n";
+						$vh_config.=" CustomLog /var/log/httpd.log combined\n"; 
+					break;
+					case "create":
+						if(preg_match("/(\S+)/",base64_decode($virtualhost['primarysitehostname']),$matches))
+						$vh_config.=" ErrorLog /var/log/httpd-{$matches[1]}-error.log\n";
+						$vh_config.=" CustomLog /var/log/httpd-{$matches[1]}.log combined\n"; 
+					break;
+				}
+
+				if($virtualhost['preserveproxyhostname'])
+					$vh_config .= " ProxyPreserveHost on\n";
+
+				#check ssl
+				if(isset($virtualhost["ssl_cert"]) && $virtualhost["ssl_cert"] !="none" && $virtualhost["proto"] == "https") {
+					$vh_config.= " SSLEngine on\n SSLProtocol all -SSLv2\n SSLProxyEngine on\n SSLProxyVerify none\n";
+					$vh_config.= " SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL\n";
+					
+    				$svr_cert = lookup_cert($virtualhost["ssl_cert"]);
+					if ($svr_cert != false) {
+						if(base64_decode($svr_cert['crt'])) {
+							file_put_contents(APACHEDIR . "/etc/apache22/{$virtualhost["ssl_cert"]}.crt",apache_textarea_decode($svr_cert['crt']),LOCK_EX);
+							$vh_config.= " SSLCertificateFile ". APACHEDIR . "/etc/apache22/{$virtualhost["ssl_cert"]}.crt\n";
+							}
+						if(base64_decode($svr_cert['prv'])) {
+							file_put_contents(APACHEDIR . "/etc/apache22/{$virtualhost["ssl_cert"]}.key",apache_textarea_decode($svr_cert['prv']),LOCK_EX);
+							$vh_config.= " SSLCertificateKeyFile ". APACHEDIR . "/etc/apache22/{$virtualhost["ssl_cert"]}.key\n";
+			       			}
+						}
+					$svr_ca =lookup_ca($virtualhost["reverse_int_ca"]);
+					if ($svr_ca != false) {
+							file_put_contents(APACHEDIR . "/etc/apache22/{$virtualhost["reverse_int_ca"]}.crt",apache_textarea_decode($svr_ca['crt']),LOCK_EX);
+							$vh_config.= " SSLCACertificateFile ". APACHEDIR . "/etc/apache22/{$virtualhost["reverse_int_ca"]}.crt\n";
+							}
+					}
+				#Custom Options
+				$vh_config.= apache_textarea_decode($virtualhost['custom'])."\n\n";
+
+				#Check virtualhost locations
+				foreach ($virtualhost['row'] as $backend){
+					$vh_config.=" <Location ".($backend['sitepath'] ? $backend['sitepath'] : "/").">\n";
+					$vh_config.="  ProxyPass        balancer://{$backend['balancer']}{$backend['backendpath']}\n";
+					$vh_config.="  ProxyPassReverse balancer://{$backend['balancer']}{$backend['backendpath']}\n";
+					if ($backend['compress']== "no")
+						$vh_config.="  SetInputFilter   INFLATE\n  SetOutputFilter  INFLATE\n";
+					if (is_array($config['installedpackages']['apachemodsecuritymanipulation'])){
+						foreach($config['installedpackages']['apachemodsecuritymanipulation']['config'] as $manipulation){
+							if ($backend['modsecmanipulation'] == $manipulation['name']){
+								if (is_array($manipulation['row']))
+									foreach ($manipulation['row'] as $secrule)
+										$vh_config.="  {$secrule['type']} {$secrule['value']}\n";
+								}
+							}
+						}
+					$vh_config.=" </Location>\n\n";
+					}
+				$vh_config.="</VirtualHost>\n";
+				}
+			}
+		//write balancer conf
+		file_put_contents(APACHEDIR."/etc/apache22/Includes/virtualhosts.conf",$vh_config,LOCK_EX);
+		}
+	// check/fix perl version on mod_security util files
+	$perl_files= array("httpd-guardian.pl","rules-updater.pl","runav.pl","arachni2modsec.pl","zap2modsec.pl","regression_tests/rulestest.pl");
+	foreach ($perl_files as $perl_file){
+		$file_path=rules_directory."/util/";
+		if (file_exists($file_path.$perl_file)){
+			$script=preg_replace("/#!\S+perl/","#!".APACHEDIR."/bin/perl",file_get_contents($file_path.$perl_file));
+			file_put_contents($file_path.$perl_file,$script,LOCK_EX);
+			}
+		}
+	// check/fix spread libs location
+	$perl_libs= array("libspread.a","libspread.so.1");
+	foreach ($perl_libs as $perl_lib){
+		$file_path=APACHEDIR."/lib/";
+		if (!file_exists("/lib/".$perl_lib) && file_exists("{$file_path}{$perl_lib}")){
+			copy("{$file_path}{$perl_lib}","/lib/{$perl_lib}");
+			if ($perl_lib == "libspread.so.1")
+				copy("{$file_path}{$perl_lib}","/lib/libspread.so");
+			}
+	}
+	
+	//mod_security settings
+	if (is_array($config['installedpackages']['apachemodsecuritysettings']['config'])){
+		$mods_settings=$config['installedpackages']['apachemodsecuritysettings']['config'][0];
+		if ($mods_settings!="")
+			$SecGuardianLog="SecGuardianLog \"|".rules_directory."/util/httpd-guardian\"";
+		}
+	
+	//fix http-guardian.pl block bins
+	//$file_path=APACHEDIR.MODSECURITY_DIR."/util/".$perl_lib;
+	//if (file_exists("/lib/".$perl_lib) && file_exists($file_path.$perl_lib)){
+	
+	//old code	
 	$mod_proxy .= <<<EOF
 
 # Off when using ProxyPass
@@ -281,43 +483,31 @@ EOF;
 
 	$configuredaliases = array();
 	// Read already configured addresses
-        if($config['installedpackages']['apachemodsecuritysettings']['config']['0']) {
-		foreach($config['installedpackages']['apachemodsecuritysettings']['config']['0']['row'] as $row) {
-                	if ($row['ipaddress'] && $row['ipport']) {
+	if (is_array($settings['row'])){
+		foreach($settings['row'] as $row) {
+			if ($row['ipaddress'] && $row['ipport'])
 				$configuredaliases[] = $row; 
-                        }
-               	}
-	} 
-
-
-	// clear list of bound addresses
-        $config['installedpackages']['apachemodsecuritysettings']['config'][0]['row'] = array();
-
+		}
+	}
+		
+	// clear list of bound addresses before updating
+	$config['installedpackages']['apachesettings']['config'][0]['row'] = array();
 	// Process proxy sites
 	// Configure NameVirtualHost directives
-        $aliases = "";
-	$processed = array();
-
-	if($config['installedpackages']['apachemodsecurity']) {
-		foreach($config['installedpackages']['apachemodsecurity']['config'] as $ams) {
-			if($ams['ipaddress'] && $ams['port']) 
-				$local_ip_port = "{$ams['ipaddress']}:{$ams['port']}";
-			else 
-				$local_ip_port = $global_listen;
-			// Do not add entries twice.
-			if(!in_array($local_ip_port, $processed)) {
-				// explicit bind if not global ip:port
-				if ($local_ip_port != $global_listen) {
-					$aliases .= "Listen $local_ip_port\n";
-					// Automatically add this to configuration
-                                	$config['installedpackages']['apachemodsecuritysettings']['config'][0]['row'][] = array('ipaddress' => $ams['ipaddress'], 'ipport' => $ams['port']); 
-				}
-				$mod_proxy .= "NameVirtualHost $local_ip_port\n";
-				$processed[] = $local_ip_port;
+	$aliases = "";
+	//add NameVirtualHost and listening entries to configured virtualhosts 
+	foreach ($namevirtualhosts as $namevirtualhost){
+		// explicit bind if not global ip:port
+		if ($namevirtualhost != $global_listen) {
+			$mod_proxy .= "NameVirtualHost {$namevirtualhost}\n";
+			$aliases .= "Listen $namevirtualhost\n";
+			// Automatically add this to configuration
+			$aplisten=split(":",$namevirtualhost);
+			$config['installedpackages']['apachesettings']['config'][0]['row'][] = array('ipaddress' => $aplisten[0], 'ipport' => $aplisten[1]);
 			}
 		}
-	}
 
+	
 //** Uncomment to allow adding ip/ports not used by any site proxies
 //** Otherwise unused addresses/ports will be automatically deleted from the configuration
 //	foreach ($configuredaliases as $ams) {
@@ -327,7 +517,7 @@ EOF;
 //                        if ($local_ip_port != $global_listen) {
 //                        	$aliases .= "Listen $local_ip_port\n";    
 //                                // Automatically add this to configuration
-//                                $config['installedpackages']['apachemodsecuritysettings']['config'][0]['row'][] = array('ipaddress' => $ams['ipaddress'], 'ipport' => $ams['ipport']);
+//                                $config['installedpackages']['apachesettings']['config'][0]['row'][] = array('ipaddress' => $ams['ipaddress'], 'ipport' => $ams['ipport']);
 //                        }
 //		}
 //	}
@@ -340,17 +530,19 @@ EOF;
 	if($config['installedpackages']['apachemodsecurity']) {
 		foreach($config['installedpackages']['apachemodsecurity']['config'] as $ams) {
 			// Set rowhelper used variables
-                        $additionalsitehostnames = "";
-			foreach($ams['row'] as $row) {
-				if ($row['additionalsitehostnames']) {
-					$additionalsitehostnames .= "{$row['additionalsitehostnames']} ";
-			}				
-			}				
+			$additionalsitehostnames = "";
+			if (is_array($ams['row'])){
+				foreach($ams['row'] as $row) {
+					if ($row['additionalsitehostnames'])
+						$additionalsitehostnames .= "{$row['additionalsitehostnames']} ";
+					}
+				}
 			$backend_sites = ""; 
 			$sslproxyengine = ""; 
 			$backend_sites_count = 0;
 			$balancer_members = ""; // not technically needed.
-			foreach($ams['row'] as $row) {
+			if (is_array($ams['row'])){
+			  foreach($ams['row'] as $row) {
 				if ($row['webserveripaddr']) {
 					$normalised_ipaddr = "";
 					if (substr(trim($row['webserveripaddr']), 0, strlen("https:")) == "https:") {
@@ -369,6 +561,7 @@ EOF;
 					$backend_sites .= $normalised_ipaddr . " ";
                                         $backend_sites_count++;
 				}
+			  }
 			}
 			// Set general items
 			if($ams['siteemail'])
@@ -431,8 +624,8 @@ EOF;
 		}
 	}
 
-	if($config['installedpackages']['apachemodsecuritysettings']['config'][0]['modsecuritycustom'])  
-		$mod_security_custom = $config['installedpackages']['apachemodsecuritysettings']['config'][0]['modsecuritycustom'];
+	if($config['installedpackages']['apachesettings']['config'][0]['modsecuritycustom'])  
+		$mod_security_custom = $config['installedpackages']['apachesettings']['config'][0]['modsecuritycustom'];
 
 	// Process and include rules
 	if(is_dir(rules_directory)) {
@@ -447,574 +640,10 @@ EOF;
 		}
 	}
 
-	// Mod_security enabled?
-	if($config['installedpackages']['apachemodsecuritysettings']['config'][0]['enablemodsecurity'])  {
-		$enable_mod_security = true;
-		$mod_security = <<< EOF
-<IfModule mod_security.c>
-
-    # Turn the filtering engine On or Off
-    SecFilterEngine On
-
-	# XXX Add knobs for these
-	SecRuleEngine On
-	SecRequestBodyAccess On
-	SecResponseBodyAccess On
-
-	SecRequestBodyInMemoryLimit {$secrequestbodyinmemorylimit}
-	SecRequestBodyLimit {$secrequestbodylimit}
-
-	{$mod_security_custom}
+	#include file templates
+	include ("/usr/local/pkg/apache.template");
 
-	SecResponseBodyMimeTypesClear
-	SecResponseBodyMimeType (null) text/plain text/html text/css text/xml
-
-	# XXX Add knobs for these
-	SecUploadDir /var/spool/apache/private
-	SecUploadKeepFiles Off
-
-    # The audit engine works independently and
-    # can be turned On of Off on the per-server or
-    # on the per-directory basis
-    SecAuditEngine {$secauditengine}
-
-	# XXX Add knobs for these
-    # Make sure that URL encoding is valid
-    SecFilterCheckURLEncoding On
-
-	# XXX Add knobs for these
-    # Unicode encoding check
-    SecFilterCheckUnicodeEncoding On
-
-	# XXX Add knobs for these
-    # Only allow bytes from this range
-    SecFilterForceByteRange 1 255
-
-	# Help prevent the effects of a Slowloris-type of attack
-	# $secreadstatelimit
-
-    # Cookie format checks.
-    SecFilterCheckCookieFormat On
-
-    # The name of the audit log file
-    SecAuditLog logs/audit_log
-
-    # Should mod_security inspect POST payloads
-    SecFilterScanPOST On
-
-	# Include rules from rules/ directory
-	{$mod_security_rules}
-
-</IfModule>
-
-EOF;
-
-}
-
-if(file_exists("/usr/local/libexec/apache22/mod_mem_cache.so"))
-	$mod_mem_cacheLoad = "Module mem_cache_module libexec/apache22/mod_mem_cache.so\n";
-
-	$apache_config = <<<EOF
-##################################################################################
-# NOTE: This file was generated by the pfSense package management system.        #
-#       Please do not edit this file by hand!   If you need to add functionality #
-#       then edit /usr/local/pkg/apache_mod_security* files.                     #
-#                                                                                #
-#       And don't forget to submit your changes to coreteam@pfsense.org          #
-###################################################################################
-#
-# This is the main Apache HTTP server configuration file.  It contains the
-# configuration directives that give the server its instructions.
-# See <URL:http://httpd.apache.org/docs/2.2> for detailed information.
-# In particular, see 
-# <URL:http://httpd.apache.org/docs/2.2/mod/directives.html>
-# for a discussion of each configuration directive.
-#
-# Do NOT simply read the instructions in here without understanding
-# what they do.  They're here only as hints or reminders.  If you are unsure
-# consult the online docs. You have been warned.  
-#
-# Configuration and logfile names: If the filenames you specify for many
-# of the server's control files begin with "/" (or "drive:/" for Win32), the
-# server will use that explicit path.  If the filenames do *not* begin
-# with "/", the value of ServerRoot is prepended -- so "/var/log/foo_log"
-# with ServerRoot set to "/usr/local" will be interpreted by the
-# server as "/usr/local//var/log/foo_log".
-
-#
-# ServerRoot: The top of the directory tree under which the server's
-# configuration, error, and log files are kept.
-#
-# Do not add a slash at the end of the directory path.  If you point
-# ServerRoot at a non-local disk, be sure to point the LockFile directive
-# at a local disk.  If you wish to share the same ServerRoot for multiple
-# httpd daemons, you will need to change at least LockFile and PidFile.
-#
-ServerRoot "/usr/local"
-
-#
-# Listen: Allows you to bind Apache to specific IP addresses and/or
-# ports, instead of the default. See also the <VirtualHost>
-# directive.
-#
-# Change this to Listen on specific IP addresses as shown below to 
-# prevent Apache from glomming onto all bound IP addresses.
-#
-Listen {$global_listen}
-{$aliases}
-
-#
-# Dynamic Shared Object (DSO) Support
-#
-# To be able to use the functionality of a module which was built as a DSO you
-# have to place corresponding `LoadModule' lines at this location so the
-# directives contained in it are actually available _before_ they are used.
-# Statically compiled modules (those listed by `httpd -l') do not need
-# to be loaded here.
-#
-# Example:
-# LoadModule foo_module modules/mod_foo.so
-#
-# have to place corresponding `LoadModule' lines at this location so the
-# LoadModule foo_module modules/mod_foo.so
-LoadModule authn_file_module libexec/apache22/mod_authn_file.so
-LoadModule authn_dbm_module libexec/apache22/mod_authn_dbm.so
-LoadModule authn_anon_module libexec/apache22/mod_authn_anon.so
-LoadModule authn_default_module libexec/apache22/mod_authn_default.so
-LoadModule authn_alias_module libexec/apache22/mod_authn_alias.so
-LoadModule authz_host_module libexec/apache22/mod_authz_host.so
-LoadModule authz_groupfile_module libexec/apache22/mod_authz_groupfile.so
-LoadModule authz_user_module libexec/apache22/mod_authz_user.so
-LoadModule authz_dbm_module libexec/apache22/mod_authz_dbm.so
-LoadModule authz_owner_module libexec/apache22/mod_authz_owner.so
-LoadModule authz_default_module libexec/apache22/mod_authz_default.so
-LoadModule auth_basic_module libexec/apache22/mod_auth_basic.so
-LoadModule auth_digest_module libexec/apache22/mod_auth_digest.so
-LoadModule file_cache_module libexec/apache22/mod_file_cache.so
-LoadModule cache_module libexec/apache22/mod_cache.so
-LoadModule disk_cache_module libexec/apache22/mod_disk_cache.so
-LoadModule dumpio_module libexec/apache22/mod_dumpio.so
-LoadModule include_module libexec/apache22/mod_include.so
-LoadModule filter_module libexec/apache22/mod_filter.so
-LoadModule charset_lite_module libexec/apache22/mod_charset_lite.so
-LoadModule deflate_module libexec/apache22/mod_deflate.so
-LoadModule log_config_module libexec/apache22/mod_log_config.so
-LoadModule logio_module libexec/apache22/mod_logio.so
-LoadModule env_module libexec/apache22/mod_env.so
-LoadModule mime_magic_module libexec/apache22/mod_mime_magic.so
-LoadModule cern_meta_module libexec/apache22/mod_cern_meta.so
-LoadModule expires_module libexec/apache22/mod_expires.so
-LoadModule headers_module libexec/apache22/mod_headers.so
-LoadModule usertrack_module libexec/apache22/mod_usertrack.so
-LoadModule unique_id_module libexec/apache22/mod_unique_id.so
-LoadModule setenvif_module libexec/apache22/mod_setenvif.so
-LoadModule version_module libexec/apache22/mod_version.so
-LoadModule proxy_module libexec/apache22/mod_proxy.so
-LoadModule proxy_connect_module libexec/apache22/mod_proxy_connect.so
-LoadModule proxy_ftp_module libexec/apache22/mod_proxy_ftp.so
-LoadModule proxy_http_module libexec/apache22/mod_proxy_http.so
-LoadModule proxy_ajp_module libexec/apache22/mod_proxy_ajp.so
-LoadModule proxy_balancer_module libexec/apache22/mod_proxy_balancer.so
-LoadModule ssl_module libexec/apache22/mod_ssl.so
-LoadModule mime_module libexec/apache22/mod_mime.so
-LoadModule status_module libexec/apache22/mod_status.so
-LoadModule autoindex_module libexec/apache22/mod_autoindex.so
-LoadModule asis_module libexec/apache22/mod_asis.so
-LoadModule info_module libexec/apache22/mod_info.so
-LoadModule cgi_module libexec/apache22/mod_cgi.so
-LoadModule vhost_alias_module libexec/apache22/mod_vhost_alias.so
-LoadModule negotiation_module libexec/apache22/mod_negotiation.so
-LoadModule dir_module libexec/apache22/mod_dir.so
-LoadModule imagemap_module libexec/apache22/mod_imagemap.so
-LoadModule actions_module libexec/apache22/mod_actions.so
-LoadModule speling_module libexec/apache22/mod_speling.so
-LoadModule userdir_module libexec/apache22/mod_userdir.so
-LoadModule alias_module libexec/apache22/mod_alias.so
-LoadModule rewrite_module libexec/apache22/mod_rewrite.so
-{$mod_mem_cache}
-
-<IfModule !mpm_netware_module>
-<IfModule !mpm_winnt_module>
-#
-# If you wish httpd to run as a different user or group, you must run
-# httpd as root initially and it will switch.  
-#
-# User/Group: The name (or #number) of the user/group to run httpd as.
-# It is usually good practice to create a dedicated user and group for
-# running httpd, as with most system services.
-#
-User www
-Group www
-
-</IfModule>
-</IfModule>
-
-# 'Main' server configuration
-#
-# The directives in this section set up the values used by the 'main'
-# server, which responds to any requests that aren't handled by a
-# <VirtualHost> definition.  These values also provide defaults for
-# any <VirtualHost> containers you may define later in the file.
-#
-# All of these directives may appear inside <VirtualHost> containers,
-# in which case these default settings will be overridden for the
-# virtual host being defined.
-#
-
-#
-# ServerAdmin: Your address, where problems with the server should be
-# e-mailed.  This address appears on some server-generated pages, such
-# as error documents.  e.g. admin@your-domain.com
-#
-ServerAdmin {$global_site_email}
-
-#
-# ServerName gives the name and port that the server uses to identify itself.
-# This can often be determined automatically, but we recommend you specify
-# it explicitly to prevent problems during startup.
-#
-# If your host doesn't have a registered DNS name, enter its IP address here.
-#
-{$servername}
-
-#
-# DocumentRoot: The directory out of which you will serve your
-# 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/apachemodsecurity"
-
-#
-# Each directory to which Apache has access can be configured with respect
-# to which services and features are allowed and/or disabled in that
-# directory (and its subdirectories). 
-#
-# First, we configure the "default" to be a very restrictive set of 
-# features.  
-#
-<Directory />
-    AllowOverride None
-    Order deny,allow
-    Deny from all
-</Directory>
-
-#
-# Note that from this point forward you must specifically allow
-# particular features to be enabled - so if something's not working as
-# you might expect, make sure that you have specifically enabled it
-# below.
-#
-
-#
-# This should be changed to whatever you set DocumentRoot to.
-#
-#<Directory "/usr/local/www/apachemodsecurity/">
-#    #
-#    # Possible values for the Options directive are "None", "All",
-#    # or any combination of:
-#    #   Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
-#    #
-#    # Note that "MultiViews" must be named *explicitly* --- "Options All"
-#    # doesn't give it to you.
-#    #
-#    # The Options directive is both complicated and important.  Please see
-#    # http://httpd.apache.org/docs/2.2/mod/core.html#options
-#    # for more information.
-#    #
-#    Options Indexes FollowSymLinks
-#
-#    #
-#    # AllowOverride controls what directives may be placed in .htaccess files.
-#    # It can be "All", "None", or any combination of the keywords:
-#    #   Options FileInfo AuthConfig Limit
-#    #
-#    AllowOverride None
-#
-#    #
-#    # Controls who can get stuff from this server.
-#    #
-#    Order allow,deny
-#    Allow from all
-#
-#</Directory>
-#
-#
-# DirectoryIndex: sets the file that Apache will serve if a directory
-# is requested.
-#
-#<IfModule dir_module>
-#    DirectoryIndex index.html
-#</IfModule>
-#
-#
-# The following lines prevent .htaccess and .htpasswd files from being 
-# viewed by Web clients. 
-#
-#<FilesMatch "^\.ht">
-#    Order allow,deny
-#    Deny from all
-#    Satisfy All
-#</FilesMatch>
-#
-#
-# ErrorLog: The location of the error log file.
-# If you do not specify an ErrorLog directive within a <VirtualHost>
-# container, error messages relating to that virtual host will be
-# logged here.  If you *do* define an error logfile for a <VirtualHost>
-# container, that host's errors will be logged there and not here.
-#
-ErrorLog "/var/log/httpd-error.log"
-
-#
-# LogLevel: Control the number of messages logged to the error_log.
-# Possible values include: debug, info, notice, warn, error, crit,
-# alert, emerg.
-#
-LogLevel warn
-
-<IfModule log_config_module>
-    #
-    # The following directives define some format nicknames for use with
-    # a CustomLog directive (see below).
-    #
-    LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
-    LogFormat "%h %l %u %t \"%r\" %>s %b" common
-
-    <IfModule logio_module>
-      # You need to enable mod_logio.c to use %I and %O
-      LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio
-    </IfModule>
-
-    #
-    # The location and format of the access logfile (Common Logfile Format).
-    # If you do not define any access logfiles within a <VirtualHost>
-    # container, they will be logged here.  Contrariwise, if you *do*
-    # define per-<VirtualHost> access logfiles, transactions will be
-    # logged therein and *not* in this file.
-    #
-    #CustomLog "/var/log/httpd-access.log" common
-
-    #
-    # If you prefer a logfile with access, agent, and referer information
-    # (Combined Logfile Format) you can use the following directive.
-    #
-    CustomLog "/var/log/httpd-access.log" combined
-</IfModule>
-
-#<IfModule alias_module>
-#    #
-#    # Redirect: Allows you to tell clients about documents that used to 
-#    # exist in your server's namespace, but do not anymore. The client 
-#    # will make a new request for the document at its new location.
-#    # Example:
-#    # Redirect permanent /foo http://www.example.com/bar
-#
-#    #
-#    # Alias: Maps web paths into filesystem paths and is used to
-#    # access content that does not live under the DocumentRoot.
-#    # Example:
-#    # Alias /webpath /full/filesystem/path
-#    #
-#    # If you include a trailing / on /webpath then the server will
-#    # require it to be present in the URL.  You will also likely
-#    # need to provide a <Directory> section to allow access to
-#    # the filesystem path.
-#
-#    #
-#    # ScriptAlias: This controls which directories contain server scripts. 
-#    # ScriptAliases are essentially the same as Aliases, except that
-#    # documents in the target directory are treated as applications and
-#    # run by the server when requested rather than as documents sent to the
-#    # client.  The same rules about trailing "/" apply to ScriptAlias
-#    # directives as to Alias.
-#    #
-#    ScriptAlias /cgi-bin/ "/usr/local/www/apache22/cgi-bin/"
-#
-#</IfModule>
-
-#<IfModule cgid_module>
-#    #
-#    # ScriptSock: On threaded servers, designate the path to the UNIX
-#    # socket used to communicate with the CGI daemon of mod_cgid.
-#    #
-#    #Scriptsock /var/run/cgisock
-#</IfModule>
-
-#
-# "/usr/local/www/apache22/cgi-bin" should be changed to whatever your ScriptAliased
-# CGI directory exists, if you have that configured.
-#
-#<Directory "/usr/local/www/apache22/cgi-bin">
-#    AllowOverride None
-#    Options None
-#    Order allow,deny
-#    Allow from all
-#</Directory>
-
-#
-# DefaultType: the default MIME type the server will use for a document
-# if it cannot otherwise determine one, such as from filename extensions.
-# If your server contains mostly text or HTML documents, "text/plain" is
-# a good value.  If most of your content is binary, such as applications
-# or images, you may want to use "application/octet-stream" instead to
-# keep browsers from trying to display binary files as though they are
-# text.
-#
-DefaultType text/plainm
-
-<IfModule mime_module>
-    #
-    # TypesConfig points to the file containing the list of mappings from
-    # filename extension to MIME-type.
-    #
-    TypesConfig etc/apache22/mime.types
-
-    #
-    # AddType allows you to add to or override the MIME configuration
-    # file specified in TypesConfig for specific file types.
-    #
-    #AddType application/x-gzip .tgz
-    #
-    # AddEncoding allows you to have certain browsers uncompress
-    # information on the fly. Note: Not all browsers support this.
-    #
-    #AddEncoding x-compress .Z
-    #AddEncoding x-gzip .gz .tgz
-    #
-    # If the AddEncoding directives above are commented-out, then you
-    # probably should define those extensions to indicate media types:
-    #
-    AddType application/x-compress .Z
-    AddType application/x-gzip .gz .tgz
-
-    #
-    # AddHandler allows you to map certain file extensions to "handlers":
-    # actions unrelated to filetype. These can be either built into the server
-    # or added with the Action directive (see below)
-    #
-    # To use CGI scripts outside of ScriptAliased directories:
-    # (You will also need to add "ExecCGI" to the "Options" directive.)
-    #
-    #AddHandler cgi-script .cgi
-
-    # For type maps (negotiated resources):
-    #AddHandler type-map var
-
-    #
-    # Filters allow you to process content before it is sent to the client.
-    #
-    # To parse .shtml files for server-side includes (SSI):
-    # (You will also need to add "Includes" to the "Options" directive.)
-    #
-    #AddType text/html .shtml
-    #AddOutputFilter INCLUDES .shtml
-</IfModule>
-
-#
-# The mod_mime_magic module allows the server to use various hints from the
-# contents of the file itself to determine its type.  The MIMEMagicFile
-# directive tells the module where the hint definitions are located.
-#
-#MIMEMagicFile etc/apache22/magic
-
-#
-# Customizable error responses come in three flavors:
-# 1) plain text 2) local redirects 3) external redirects
-#
-# Some examples:
-
-{$errordocument}
-
-#ErrorDocument 500 "The server made a boo boo."
-#ErrorDocument 404 /missing.html
-#ErrorDocument 404 "/cgi-bin/missing_handler.pl"
-#ErrorDocument 402 http://www.example.com/subscription_info.html
-#
-
-#
-# EnableMMAP and EnableSendfile: On systems that support it, 
-# memory-mapping or the sendfile syscall is used to deliver
-# files.  This usually improves server performance, but must
-# be turned off when serving from networked-mounted 
-# filesystems or if support for these functions is otherwise
-# broken on your system.
-#
-#EnableMMAP off
-#EnableSendfile off
-
-# Supplemental configuration
-#
-# The configuration files in the etc/apache22/extra/ directory can be 
-# included to add extra features or to modify the default configuration of 
-# the server, or you may simply copy their contents here and change as 
-# necessary.
-
-# Server-pool management (MPM specific)
-#Include etc/apache22/extra/httpd-mpm.conf
-
-# Multi-language error messages
-#Include etc/apache22/extra/httpd-multilang-errordoc.conf
-
-# Fancy directory listings
-#Include etc/apache22/extra/httpd-autoindex.conf
-
-# Language settings
-#Include etc/apache22/extra/httpd-languages.conf
-
-# User home directories
-#Include etc/apache22/extra/httpd-userdir.conf
-
-# Real-time info on requests and configuration
-#Include etc/apache22/extra/httpd-info.conf
-
-# Virtual hosts
-#Include etc/apache22/extra/httpd-vhosts.conf
-
-# Local access to the Apache HTTP Server Manual
-#Include etc/apache22/extra/httpd-manual.conf
-
-# Distributed authoring and versioning (WebDAV)
-#Include etc/apache22/extra/httpd-dav.conf
-
-# Various default settings
-#Include etc/apache22/extra/httpd-default.conf
-
-# Secure (SSL/TLS) connections
-#Include etc/apache22/extra/httpd-ssl.conf
-#
-# Note: The following must must be present to support
-#       starting without SSL on platforms with no /dev/random equivalent
-#       but a statically compiled-in mod_ssl.
-#
-<IfModule ssl_module>
-SSLRandomSeed startup builtin
-SSLRandomSeed connect builtin
-</IfModule>
-
-# Cache settings
-{$mem_cache}
-{$cache_root}
-
-# Mod security
-{$mod_security}
-
-# Proxysettings
-{$mod_proxy}
-
-# Include anything else
-Include etc/apache22/Includes/*.conf
-
-EOF;
-
-	$fd = fopen("/usr/local/etc/apache22/httpd.conf", "w");
-	if(!$fd) {
-		$error_text = "Could not open httpd.conf for writing!";
-		echo $error_text;
-		log_error($error_text);
-		exit;
-	}
-	fwrite($fd, $apache_config);
-	fclose($fd);
+	file_put_contents(APACHEDIR . "/etc/apache22/httpd.conf",$apache_config,LOCK_EX);
 }
 
 ?>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index f79293e4..3444c047 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -214,7 +214,7 @@
 		<website>http://www.modsecurity.org/</website>
 		<descr>ModSecurity is a web application firewall that can work either embedded or as a reverse proxy. It provides protection from a range of attacks against web applications and allows for HTTP traffic monitoring, logging and real-time analysis. In addition this package allows URL forwarding which can be convenient for hosting multiple websites behind pfSense using 1 IP address.</descr>
 		<category>Network Management</category>
-		<version>0.2.2</version>
+		<version>apache 2.2.23 pkg v0.2.3</version>
 		<status>ALPHA</status>
 		<required_version>2.0</required_version>
 		<config_file>http://www.pfsense.com/packages/config/apache_mod_security-dev/apache_virtualhost.xml</config_file>
@@ -225,7 +225,7 @@
 		<depends_on_package>ap22-mod_memcache-0.1.0_4.tbz</depends_on_package>
 		<depends_on_package>apache-2.2.22_5.tbz</depends_on_package>
 		<depends_on_package>ap22-mod_security-2.6.5_1.tbz</depends_on_package>
-		<depends_on_package_pbi>proxy_mod_security-2.2.22_6-i386.pbi</depends_on_package_pbi>
+		<depends_on_package_pbi>proxy_mod_security-2.2.23_6-i386.pbi git-1.8.1.3-i386.pbi</depends_on_package_pbi>
 		<configurationfile>apache_virtualhost.xml</configurationfile>
 		<build_port_path>/usr/ports/devel/gettext</build_port_path>
 		<build_port_path>/usr/ports/misc/help2man</build_port_path>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 32551ce1..b723f195 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -201,7 +201,7 @@
 		<website>http://www.modsecurity.org/</website>
 		<descr>ModSecurity is a web application firewall that can work either embedded or as a reverse proxy. It provides protection from a range of attacks against web applications and allows for HTTP traffic monitoring, logging and real-time analysis. In addition this package allows URL forwarding which can be convenient for hosting multiple websites behind pfSense using 1 IP address.</descr>
 		<category>Network Management</category>
-		<version>0.2.2</version>
+		<version>apache 2.2.23 pkg v0.2.3</version>
 		<status>ALPHA</status>
 		<required_version>2.0</required_version>
 		<config_file>http://www.pfsense.com/packages/config/apache_mod_security-dev/apache_virtualhost.xml</config_file>
@@ -212,7 +212,7 @@
 		<depends_on_package>ap22-mod_memcache-0.1.0_4.tbz</depends_on_package>
 		<depends_on_package>apache-2.2.22_5.tbz</depends_on_package>
 		<depends_on_package>ap22-mod_security-2.6.5_1.tbz</depends_on_package>
-		<depends_on_package_pbi>proxy_mod_security-2.2.22_6-amd64.pbi</depends_on_package_pbi>
+		<depends_on_package_pbi>proxy_mod_security-2.2.23_6-amd64.pbi git-1.8.1.3-i386.pbi</depends_on_package_pbi>
 		<configurationfile>apache_virtualhost.xml</configurationfile>
 		<build_port_path>/usr/ports/devel/gettext</build_port_path>
 		<build_port_path>/usr/ports/misc/help2man</build_port_path>