upstream/opnsense-plugins
1
0
Fork 0
mirror of https://github.com/opnsense/plugins.git synced 2026-02-03 20:40:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

www/nginx: some bugfixes; add a rule for the upcoming naxsi release; add restart action to acme (#742)

Browse source 
* www/nginx: some bugfixes; add a rule for the upcoming naxsi release
* www/nginx: theme the two other error pages like the waf error page
* security/acme-client: allow to restart nginx (if installed)
* add .idea to gitignore
* bump versions and upcase nginx
This commit is contained in:
Fabian Franz BSc 2018-07-23 22:52:25 +02:00 committed by GitHub
parent 7ef2d30d83
commit e27f0eaa1e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 104 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -1,2 +1,4 @@
*/*/work
*.pyc
.idea/

2
net/haproxy/Makefile
View file

@ -1,5 +1,5 @@
PLUGIN_NAME= haproxy
PLUGIN_VERSION= 2.7
PLUGIN_VERSION= 2.8
PLUGIN_REVISION= 2
PLUGIN_COMMENT= Reliable, high performance TCP/HTTP load balancer
PLUGIN_DEPENDS= haproxy-devel

1
security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml
View file

@ -677,6 +677,7 @@
<OptionValues>
<restart_gui>Restart OPNsense Web UI</restart_gui>
<restart_haproxy>Restart HAProxy (OPNsense plugin)</restart_haproxy>
<restart_nginx>Restart Nginx (OPNsense plugin)</restart_nginx>
<configd>System or Plugin Command (select below)</configd>
</OptionValues>
</type>

7
security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php
View file

@ -1056,8 +1056,8 @@ function import_certificate($certObj, $modelObj)
// Write changes to config
// TODO: Legacy code, should be replaced with code from OPNsense framework
write_config("${import_log_message} Let's Encrypt SSL certificate: ${cert_cn}");
log_error("AcmeClient: ${import_log_message} Let's Encrypt SSL certificate: ${cert_cn}");
write_config("${import_log_message} Let's Encrypt X.509 certificate: ${cert_cn}");
log_error("AcmeClient: ${import_log_message} Let's Encrypt X.509 certificate: ${cert_cn}");
// Update (acme) certificate object (through MVC framework)
$uuid = $certObj->attributes()->uuid;
@ -1138,6 +1138,9 @@ function run_restart_actions($certlist, $modelObj)
case 'restart_haproxy':
$response = $backend->configdRun("haproxy restart");
break;
case 'restart_nginx':
$response = $backend->configdRun("nginx restart");
break;
case 'configd':
// Make sure a configd command was specified.
if (empty((string)$action->configd)) {

2
www/nginx/Makefile
View file

@ -1,5 +1,5 @@
PLUGIN_NAME= nginx
PLUGIN_VERSION= 0.2
PLUGIN_VERSION= 0.3
PLUGIN_COMMENT= Nginx HTTP server and reverse proxy
PLUGIN_DEPENDS= nginx
PLUGIN_MAINTAINER= franz.fabian.94@gmail.com

44
www/nginx/src/etc/nginx/views/opnsense_error_404.html
View file

File diff suppressed because one or more lines are too long

44
www/nginx/src/etc/nginx/views/opnsense_server_error.html
View file

File diff suppressed because one or more lines are too long

18
www/nginx/src/opnsense/service/templates/OPNsense/Nginx/naxsirule.conf
View file

@ -47,15 +47,17 @@
{% if naxsi_ruletype == 'basic' %}
{# current policy in loop is available as custom_policy, the uuid as custom_policy_uuid #}
{% for naxsi_rule_uuid in custom_policy.naxsi_rules.split(',') %}
{% if naxsi_rule_uuid not in added_policies %}
{% set basic_rule = helpers.getUUID(naxsi_rule_uuid) %}
{% if basic_rule.ruletype == 'basic' %}
{{ naxsi_rule(custom_policy_uuid, basic_rule, "BasicRule") }}
{% do added_policies.append(naxsi_rule_uuid) %}
{% if custom_policy.naxsi_rules is defined %}
{% for naxsi_rule_uuid in custom_policy.naxsi_rules.split(',') %}
{% if naxsi_rule_uuid not in added_policies %}
{% set basic_rule = helpers.getUUID(naxsi_rule_uuid) %}
{% if basic_rule.ruletype == 'basic' %}
{{ naxsi_rule(custom_policy_uuid, basic_rule, "BasicRule") }}
{% do added_policies.append(naxsi_rule_uuid) %}
{% endif %}
{% endif %}
{% endif %}
{% endfor %}
{% endfor %}
{% endif %}
{% endif %}
{% if naxsi_ruletype == 'main' %}
{{ naxsi_rule(custom_policy_uuid, main_rule, "MainRule") }}

3
www/nginx/src/opnsense/service/templates/OPNsense/Nginx/php-www.conf
View file

@ -3,6 +3,9 @@
user = www
group = www
listen = /var/run/php-www.socket
listen.owner = www
listen.group = www
listen.mode = 0660
pm = dynamic
pm.max_children = 5
pm.start_servers = 2

1
www/nginx/src/opnsense/service/templates/OPNsense/Nginx/ruleset.conf
View file

@ -1,3 +1,4 @@
MainRule wl:19;
{% set naxsi_ruletype = 'main' %}
{% set main_policies = [] %}
{% set main_rules = [] %}