upstream/opnsense-plugins
1
0
Fork 0
mirror of https://github.com/opnsense/plugins.git synced 2026-05-28 04:34:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

www/nginx: merge version 0.3 from master

Browse source
This commit is contained in:
Franco Fichtner 2018-07-27 20:30:55 +02:00
parent d192513114
commit fb9dc5589d
6 changed files with 95 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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 = [] %}