diff options
Diffstat (limited to 'config/apache_mod_security-dev')
| -rw-r--r-- | config/apache_mod_security-dev/apache_mod_security.inc | 9 | ||||
| -rw-r--r-- | config/apache_mod_security-dev/apache_virtualhost.xml | 44 |
2 files changed, 34 insertions, 19 deletions
diff --git a/config/apache_mod_security-dev/apache_mod_security.inc b/config/apache_mod_security-dev/apache_mod_security.inc index 31be95cf..2728e2e9 100644 --- a/config/apache_mod_security-dev/apache_mod_security.inc +++ b/config/apache_mod_security-dev/apache_mod_security.inc @@ -569,9 +569,14 @@ EOF; $vh_config.= " SSLCertificateKeyFile ". APACHEDIR . "/etc/apache22/{$virtualhost["ssl_cert"]}.key\n"; } } - $svr_ca =lookup_ca($virtualhost["reverse_int_ca"]); + $svr_ca =lookup_ca($virtualhost["ssl_cert_chain"]); if ($svr_ca != false) { - file_put_contents(APACHEDIR . "/etc/apache22/{$virtualhost["reverse_int_ca"]}.crt",apache_textarea_decode($svr_ca['crt']),LOCK_EX); + file_put_contents(APACHEDIR . "/etc/apache22/{$virtualhost["ssl_cert_chain"]}.crt",apache_textarea_decode($svr_ca['crt']),LOCK_EX); + $vh_config.= " SSLCertificateChainFile ". APACHEDIR . "/etc/apache22/{$virtualhost["ssl_cert_chain"]}.crt\n"; + } + $cli_ca =lookup_ca($virtualhost["reverse_int_ca"]); + if ($cli_ca != false) { + file_put_contents(APACHEDIR . "/etc/apache22/{$virtualhost["reverse_int_ca"]}.crt",apache_textarea_decode($cli_ca['crt']),LOCK_EX); $vh_config.= " SSLCACertificateFile ". APACHEDIR . "/etc/apache22/{$virtualhost["reverse_int_ca"]}.crt\n"; } } diff --git a/config/apache_mod_security-dev/apache_virtualhost.xml b/config/apache_mod_security-dev/apache_virtualhost.xml index 747ef975..488eb822 100644 --- a/config/apache_mod_security-dev/apache_virtualhost.xml +++ b/config/apache_mod_security-dev/apache_virtualhost.xml @@ -52,77 +52,77 @@ <additional_files_needed> <prefix>/usr/local/pkg/</prefix> <chmod>0644</chmod> - <item>http://www.pfsense.com/packages/config/apache_mod_security-dev/apache_mod_security.inc</item> + <item>https://packages.pfsense.org/packages/config/apache_mod_security-dev/apache_mod_security.inc</item> </additional_files_needed> <additional_files_needed> <prefix>/usr/local/pkg/</prefix> <chmod>0644</chmod> - <item>http://www.pfsense.com/packages/config/apache_mod_security-dev/apache_mod_security.template</item> + <item>https://packages.pfsense.org/packages/config/apache_mod_security-dev/apache_mod_security.template</item> </additional_files_needed> <additional_files_needed> <prefix>/usr/local/pkg/</prefix> <chmod>0644</chmod> - <item>http://www.pfsense.com/packages/config/apache_mod_security-dev/apache_mod_security_groups.xml</item> + <item>https://packages.pfsense.org/packages/config/apache_mod_security-dev/apache_mod_security_groups.xml</item> </additional_files_needed> <additional_files_needed> <prefix>/usr/local/pkg/</prefix> <chmod>0644</chmod> - <item>http://www.pfsense.com/packages/config/apache_mod_security-dev/apache_mod_security_settings.xml</item> + <item>https://packages.pfsense.org/packages/config/apache_mod_security-dev/apache_mod_security_settings.xml</item> </additional_files_needed> <additional_files_needed> <prefix>/usr/local/www/</prefix> <chmod>0644</chmod> - <item>http://www.pfsense.com/packages/config/apache_mod_security-dev/apache_mod_security_view_logs.php</item> + <item>https://packages.pfsense.org/packages/config/apache_mod_security-dev/apache_mod_security_view_logs.php</item> </additional_files_needed> <additional_files_needed> <prefix>/usr/local/pkg/</prefix> <chmod>0644</chmod> - <item>http://www.pfsense.com/packages/config/apache_mod_security-dev/apache.template</item> + <item>https://packages.pfsense.org/packages/config/apache_mod_security-dev/apache.template</item> </additional_files_needed> <additional_files_needed> <prefix>/usr/local/pkg/</prefix> <chmod>0644</chmod> - <item>http://www.pfsense.com/packages/config/apache_mod_security-dev/apache_balancer.template</item> + <item>https://packages.pfsense.org/packages/config/apache_mod_security-dev/apache_balancer.template</item> </additional_files_needed> <additional_files_needed> <prefix>/usr/local/pkg/</prefix> <chmod>0644</chmod> - <item>http://www.pfsense.com/packages/config/apache_mod_security-dev/apache_balancer.xml</item> + <item>https://packages.pfsense.org/packages/config/apache_mod_security-dev/apache_balancer.xml</item> </additional_files_needed> <additional_files_needed> <prefix>/usr/local/www/</prefix> <chmod>0644</chmod> - <item>http://www.pfsense.com/packages/config/apache_mod_security-dev/apache_logs_data.php</item> + <item>https://packages.pfsense.org/packages/config/apache_mod_security-dev/apache_logs_data.php</item> </additional_files_needed> <additional_files_needed> <prefix>/usr/local/pkg/</prefix> <chmod>0644</chmod> - <item>http://www.pfsense.com/packages/config/apache_mod_security-dev/apache_mod_security_manipulation.xml</item> + <item>https://packages.pfsense.org/packages/config/apache_mod_security-dev/apache_mod_security_manipulation.xml</item> </additional_files_needed> <additional_files_needed> <prefix>/usr/local/pkg/</prefix> <chmod>0644</chmod> - <item>http://www.pfsense.com/packages/config/apache_mod_security-dev/apache_mod_security_sync.xml</item> + <item>https://packages.pfsense.org/packages/config/apache_mod_security-dev/apache_mod_security_sync.xml</item> </additional_files_needed> <additional_files_needed> <prefix>/usr/local/pkg/</prefix> <chmod>0644</chmod> - <item>http://www.pfsense.com/packages/config/apache_mod_security-dev/apache_settings.xml</item> + <item>https://packages.pfsense.org/packages/config/apache_mod_security-dev/apache_settings.xml</item> </additional_files_needed> <additional_files_needed> <prefix>/usr/local/www/</prefix> <chmod>0644</chmod> - <item>http://www.pfsense.com/packages/config/apache_mod_security-dev/apache_view_logs.php</item> + <item>https://packages.pfsense.org/packages/config/apache_mod_security-dev/apache_view_logs.php</item> </additional_files_needed> <additional_files_needed> <prefix>/usr/local/www/shortcuts/</prefix> <chmod>0755</chmod> - <item>http://www.pfsense.org/packages/config/apache_mod_security-dev/pkg_apache.inc</item> + <item>https://packages.pfsense.org/packages/config/apache_mod_security-dev/pkg_apache.inc</item> </additional_files_needed> <additional_files_needed> <prefix>/usr/local/pkg/</prefix> <chmod>0755</chmod> - <item>http://www.pfsense.org/packages/config/apache_mod_security-dev/apache_location.xml</item> + <item>https://packages.pfsense.org/packages/config/apache_mod_security-dev/apache_location.xml</item> </additional_files_needed> <tabs> <tab> @@ -267,9 +267,19 @@ <show_disable_value>none</show_disable_value> </field> <field> - <fielddescr>Intermediate CA certificate (optional)</fielddescr> + <fielddescr>HTTPS SSL certificate chain</fielddescr> + <fieldname>ssl_cert_chain</fieldname> + <description>Select intermediate CA assigned to server certificate. Not all certificates require this.</description> + <type>select_source</type> + <source><![CDATA[$config['ca']]]></source> + <source_name>descr</source_name> + <source_value>refid</source_value> + <show_disable_value>none</show_disable_value> + </field> + <field> + <fielddescr>Client certificates CA (optional)</fielddescr> <fieldname>reverse_int_ca</fieldname> - <description>Select intermediate CA assigned to certificate. Not all certificates require this.</description> + <description>Select CA assigned to client certificates.</description> <type>select_source</type> <source><![CDATA[$config['ca']]]></source> <source_name>descr</source_name> |