diff --git a/misc/theme-tukan/src/opnsense/www/themes/tukan/assets/stylesheets/main.scss b/misc/theme-tukan/src/opnsense/www/themes/tukan/assets/stylesheets/main.scss index 949c59b3d..4b4e895ac 100644 --- a/misc/theme-tukan/src/opnsense/www/themes/tukan/assets/stylesheets/main.scss +++ b/misc/theme-tukan/src/opnsense/www/themes/tukan/assets/stylesheets/main.scss @@ -9815,4 +9815,4 @@ h3 { #chart, #chart_intf_in, #chart_intf_out, #chart_top_ports, #chart_top_sources, #traffic_graph_widget_chart_in, #traffic_graph_widget_chart_out { background-color: #FFF; border: 1px solid #c2c2c2; -} \ No newline at end of file +} diff --git a/misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/main.css b/misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/main.css index 0165e736e..053c60059 100644 --- a/misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/main.css +++ b/misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/main.css @@ -5956,7 +5956,7 @@ main.page-content.col-lg-12 { padding-left: 90px; } -webkit-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.75); -moz-box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.75); box-shadow: 5px 5px 6px 0px rgba(0, 0, 0, 0.75);} - + button.toggle-sidebar.glyphicon.glyphicon-chevron-left, button.toggle-sidebar.glyphicon.glyphicon-chevron-right{ position:absolute; -webkit-transition: all 0.1s ease; @@ -6320,7 +6320,7 @@ stroke: rgb(143, 143, 143) !important; } .tokenize > .tokens-container > .token > .dismiss::after { color:#000 !important; } - + .tokenize.focus > .tokens-container { border-color: #00A7FF !important; background-color:none !important; @@ -6334,9 +6334,9 @@ stroke: rgb(143, 143, 143) !important; } .tokenize > .tokens-container > .tokenize > .tokens-container > .token-search { color:#FFFFFF !important; } -.tokenize > .tokens-container > .token-search > input { +.tokenize > .tokens-container > .token-search > input { border:none !important;} - + .bootgrid-table th > .column-header-anchor, .bootgrid-table th > .column-header-anchor > .icon, .bootgrid-table th > .column-header-anchor > .glyphicon { color: #000 !important; } .bootgrid-table th:hover { @@ -6373,4 +6373,4 @@ stroke: rgb(143, 143, 143) !important; } .glyphicon.glyphicon-play.text-muted, .glyphicon.glyphicon-remove.text-muted, .glyphicon.glyphicon-remove-sign.text-muted, .glyphicon.glyphicon-info-sign.text-muted, .fa.fa-play.text-muted::before { color: #000 !important;} #system_log-widgets.content-box {border:none; box-shadow: none;} -#chart,#chart_intf_in,#chart_intf_out,#chart_top_ports,#chart_top_sources,#traffic_graph_widget_chart_in,#traffic_graph_widget_chart_out { background-color: #FFF; border: 1px solid #c2c2c2; } \ No newline at end of file +#chart,#chart_intf_in,#chart_intf_out,#chart_top_ports,#chart_top_sources,#traffic_graph_widget_chart_in,#traffic_graph_widget_chart_out { background-color: #FFF; border: 1px solid #c2c2c2; } diff --git a/www/nginx/src/etc/nginx/views/opnsense_error_404.html b/www/nginx/src/etc/nginx/views/opnsense_error_404.html index 872bf103d..54200472c 100644 --- a/www/nginx/src/etc/nginx/views/opnsense_error_404.html +++ b/www/nginx/src/etc/nginx/views/opnsense_error_404.html @@ -20,4 +20,4 @@

The resource you want to access is not available.

Please contact the webmaster if you think this is an error.

- \ No newline at end of file + diff --git a/www/nginx/src/etc/nginx/views/opnsense_server_error.html b/www/nginx/src/etc/nginx/views/opnsense_server_error.html index e43586293..6a3267f4a 100644 --- a/www/nginx/src/etc/nginx/views/opnsense_server_error.html +++ b/www/nginx/src/etc/nginx/views/opnsense_server_error.html @@ -20,4 +20,4 @@

Sorry, but something went wrong on our side.

There is nothing you can do except waiting until we fix the issue.

- \ No newline at end of file + diff --git a/www/nginx/src/opnsense/mvc/app/controllers/OPNsense/Nginx/Api/ServiceController.php b/www/nginx/src/opnsense/mvc/app/controllers/OPNsense/Nginx/Api/ServiceController.php index 1506ee913..77c0ef122 100644 --- a/www/nginx/src/opnsense/mvc/app/controllers/OPNsense/Nginx/Api/ServiceController.php +++ b/www/nginx/src/opnsense/mvc/app/controllers/OPNsense/Nginx/Api/ServiceController.php @@ -49,8 +49,8 @@ class ServiceController extends ApiMutableServiceControllerBase { return array('status' => 'failed'); } - - + + /** * reconfigure with optional stop, generate config and start / reload * @return array response message diff --git a/www/nginx/src/opnsense/mvc/app/controllers/OPNsense/Nginx/Api/SettingsController.php b/www/nginx/src/opnsense/mvc/app/controllers/OPNsense/Nginx/Api/SettingsController.php index 54fc12e3a..28f5eb716 100644 --- a/www/nginx/src/opnsense/mvc/app/controllers/OPNsense/Nginx/Api/SettingsController.php +++ b/www/nginx/src/opnsense/mvc/app/controllers/OPNsense/Nginx/Api/SettingsController.php @@ -197,7 +197,7 @@ class SettingsController extends ApiMutableModelControllerBase { return $this->setBase('custompolicy', 'custom_policy', $uuid); } - + // http server public function searchhttpserverAction() { @@ -251,7 +251,7 @@ class SettingsController extends ApiMutableModelControllerBase { return $this->setBase('naxsi_rule', 'naxsi_rule', $uuid); } - + // http url rewriting public function searchhttprewriteAction() { diff --git a/www/nginx/src/opnsense/mvc/app/controllers/OPNsense/Nginx/forms/naxsi_custom_policy.xml b/www/nginx/src/opnsense/mvc/app/controllers/OPNsense/Nginx/forms/naxsi_custom_policy.xml index f19224893..26f6fe026 100644 --- a/www/nginx/src/opnsense/mvc/app/controllers/OPNsense/Nginx/forms/naxsi_custom_policy.xml +++ b/www/nginx/src/opnsense/mvc/app/controllers/OPNsense/Nginx/forms/naxsi_custom_policy.xml @@ -28,4 +28,4 @@ - \ No newline at end of file + diff --git a/www/nginx/src/opnsense/mvc/app/models/OPNsense/Nginx/Nginx.xml b/www/nginx/src/opnsense/mvc/app/models/OPNsense/Nginx/Nginx.xml index e4f3ac0f3..cdb43e7de 100644 --- a/www/nginx/src/opnsense/mvc/app/models/OPNsense/Nginx/Nginx.xml +++ b/www/nginx/src/opnsense/mvc/app/models/OPNsense/Nginx/Nginx.xml @@ -322,7 +322,7 @@ Y - + Y @@ -417,7 +417,7 @@ Y - + Y diff --git a/www/nginx/src/opnsense/mvc/app/views/OPNsense/Nginx/index.volt b/www/nginx/src/opnsense/mvc/app/views/OPNsense/Nginx/index.volt index 054098de5..b1d8109f9 100644 --- a/www/nginx/src/opnsense/mvc/app/views/OPNsense/Nginx/index.volt +++ b/www/nginx/src/opnsense/mvc/app/views/OPNsense/Nginx/index.volt @@ -204,8 +204,8 @@ $( document ).ready(function() { - - + +
@@ -380,4 +380,3 @@ $( document ).ready(function() { {{ partial("layout_partials/base_dialog",['fields': httprewrite,'id':'httprewritedlg', 'label':lang._('Edit URL Rewrite')]) }} {{ partial("layout_partials/base_dialog",['fields': naxsi_custom_policy,'id':'custompolicydlg', 'label':lang._('Edit WAF Policy')]) }} {{ partial("layout_partials/base_dialog",['fields': naxsi_rule,'id':'naxsiruledlg', 'label':lang._('Edit Naxsi Rule')]) }} - diff --git a/www/nginx/src/opnsense/scripts/nginx/setup.php b/www/nginx/src/opnsense/scripts/nginx/setup.php index 83a6de332..7cb8592ae 100755 --- a/www/nginx/src/opnsense/scripts/nginx/setup.php +++ b/www/nginx/src/opnsense/scripts/nginx/setup.php @@ -69,9 +69,9 @@ foreach ($http_servers as $http_server) { foreach ($http_server['ca'] as $caref) { $ca = find_ca($caref); if (isset($ca)) { - export_pem_file( - '/usr/local/etc/nginx/key/' . $hostname . '_ca.pem', - $ca['crt'] + export_pem_file( + '/usr/local/etc/nginx/key/' . $hostname . '_ca.pem', + $ca['crt'] ); } } @@ -103,4 +103,3 @@ foreach ($nginx->userlist->__items as $user_list) { unset($file); } } - diff --git a/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/http.conf b/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/http.conf index 89e0e4c3a..7cf830c59 100644 --- a/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/http.conf +++ b/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/http.conf @@ -36,10 +36,10 @@ keepalive_timeout {{ OPNsense.Nginx.http.keepalive_timeout }}; # TODO add when core is ready for allowing nginx to serve the web interface # include nginx_web.conf; - + {% include "OPNsense/Nginx/upstream.conf" ignore missing with context %} -{% set listen_list = [] %} +{% set listen_list = [] %} {% for server in helpers.toList('OPNsense.Nginx.http_server') %} {% set single_servername = server.servername.split(",")[0] %} server { diff --git a/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/naxsirule.conf b/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/naxsirule.conf index 2366ff49b..bc543f3fa 100644 --- a/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/naxsirule.conf +++ b/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/naxsirule.conf @@ -59,4 +59,4 @@ {% endif %} {% if naxsi_ruletype == 'main' %} {{ naxsi_rule(custom_policy_uuid, main_rule, "MainRule") }} -{% endif %} \ No newline at end of file +{% endif %} diff --git a/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/nginx.conf b/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/nginx.conf index 0eec2d502..480fe8fd6 100644 --- a/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/nginx.conf +++ b/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/nginx.conf @@ -27,4 +27,3 @@ http { {% include "OPNsense/Nginx/mail.conf" ignore missing with context %} # } {% endif %} - diff --git a/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/ruleset.conf b/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/ruleset.conf index 002eaf115..d08db7a21 100644 --- a/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/ruleset.conf +++ b/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/ruleset.conf @@ -26,4 +26,4 @@ {% endfor %} {% endif %} {% endfor %} -{% endif %} \ No newline at end of file +{% endif %} diff --git a/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/upstream.conf b/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/upstream.conf index 483893219..d1fb7db35 100644 --- a/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/upstream.conf +++ b/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/upstream.conf @@ -9,7 +9,7 @@ {% for upstream_serveruuid in upstream.serverentries.split(',') %} upstream upstream{{ upstream_uuid.replace('-','') }} { {% set upstream_server = helpers.getUUID(upstream_serveruuid) %} -server {% if ':' in upstream_server.server %}[{% endif %}{{ upstream_server.server }}{% if ':' in upstream_server.server %}]{% endif +server {% if ':' in upstream_server.server %}[{% endif %}{{ upstream_server.server }}{% if ':' in upstream_server.server %}]{% endif %}{% if upstream_server.port is defined %}:{{ upstream_server.port }}{% endif %}{% if upstream_server.priority is defined %} weight={{ upstream_server.priority }}{% endif %}{% if upstream_server.max_conns is defined %} max_conns={{ upstream_server.max_conns }}{% endif diff --git a/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/webgui.conf b/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/webgui.conf index 69a53031f..dd6649bf6 100644 --- a/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/webgui.conf +++ b/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/webgui.conf @@ -181,7 +181,7 @@ server { fastcgi_param TLS-Protocol $ssl_protocol; fastcgi_param TLS-SNI-Host $ssl_server_name; fastcgi_intercept_errors off; - fastcgi_pass unix:/var/run/php-webgui.socket; + fastcgi_pass unix:/var/run/php-webgui.socket; } location @guirequest { root /usr/local/opnsense/www; @@ -192,7 +192,7 @@ server { fastcgi_param TLS-Protocol $ssl_protocol; fastcgi_param TLS-SNI-Host $ssl_server_name; fastcgi_intercept_errors off; - fastcgi_pass unix:/var/run/php-webgui.socket; + fastcgi_pass unix:/var/run/php-webgui.socket; } location ~ ^/ui/(?[^\?]+)(?\?(.*))? { root /usr/local/opnsense/www;