diff options
| -rw-r--r-- | config/apache_mod_security-dev/apache_mod_security.inc | 2 | ||||
| -rw-r--r-- | pkg_config.10.xml | 12 |
2 files changed, 12 insertions, 2 deletions
diff --git a/config/apache_mod_security-dev/apache_mod_security.inc b/config/apache_mod_security-dev/apache_mod_security.inc index 1ef78819..72c1f9b4 100644 --- a/config/apache_mod_security-dev/apache_mod_security.inc +++ b/config/apache_mod_security-dev/apache_mod_security.inc @@ -34,7 +34,7 @@ require_once("service-utils.inc"); $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) +if ($pf_version == "2.1" || $pf_version == "2.2") define('APACHEDIR', '/usr/pbi/proxy_mod_security-' . php_uname("m")); else define('APACHEDIR', '/usr/local'); diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 277c6d68..61deb348 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -189,6 +189,7 @@ </package> <package> <name>Apache with mod_security-dev</name> + <internal_name>apache-mod_security-devel</internal_name> <pkginfolink>https://doc.pfsense.org/index.php/ProxyServerModSecurity_package</pkginfolink> <website>http://www.modsecurity.org/</website> <descr><![CDATA[ModSecurity is a web application firewall that can work either embedded or as a reverse proxy.<br> @@ -196,10 +197,14 @@ In addition this package allows URL forwarding which can be convenient for hosting multiple websites behind pfSense using 1 IP address.<br> <b>Backup your location config before updating from 0.2.x to 0.3 package version.</b>]]></descr> <category>Network Management</category> - <version>2.4.9_2pkg v0.43</version> + <version>0.43</version> <status>ALPHA</status> <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/apache_mod_security-dev/apache_virtualhost.xml</config_file> + <run_depends>${APACHEMODDIR}/mod_security2.so:www/mod_security ${APACHEMODDIR}/mod_memcache.so:www/mod_memcache</run_depends> + <port_uses>USE_APACHE=24</port_uses> + <port_category>net</port_category> + <conflicts>apache-mod_security</conflicts> <depends_on_package_pbi>proxy_mod_security-2.4.9_4-##ARCH##.pbi git-2.2.1-##ARCH##.pbi</depends_on_package_pbi> <configurationfile>apache_virtualhost.xml</configurationfile> <build_pbi> @@ -213,6 +218,7 @@ </package> <package> <name>Proxy Server with mod_security</name> + <internal_name>apache-mod_security</internal_name> <pkginfolink>https://doc.pfsense.org/index.php/ProxyServerModSecurity_package</pkginfolink> <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> @@ -221,6 +227,10 @@ <status>ALPHA</status> <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/apache_mod_security/apache_mod_security.xml</config_file> + <run_depends>${APACHEMODDIR}/mod_security2.so:www/mod_security ${APACHEMODDIR}/mod_memcache.so:www/mod_memcache</run_depends> + <port_uses>USE_APACHE=22</port_uses> + <port_category>net</port_category> + <conflicts>apache-mod_security-devel</conflicts> <depends_on_package_pbi>proxy_mod_security-2.2.27_5-##ARCH##.pbi</depends_on_package_pbi> <configurationfile>apache_mod_security.xml</configurationfile> <build_pbi> |