diff --git a/README.md b/README.md index 4f588d96e..aa6d028b5 100644 --- a/README.md +++ b/README.md @@ -76,6 +76,7 @@ security/intrusion-detection-content-snort-vrt -- IDS Snort VRT ruleset (needs r security/openconnect -- OpenConnect Client security/tinc -- Tinc VPN security/tor -- The Onion Router +sysutils/api-backup -- Provide the functionality to download the config.xml sysutils/boot-delay -- Apply a persistent 10 second boot delay sysutils/lcdproc-sdeclcd -- LCDProc for SDEC LCD devices sysutils/node_exporter -- Prometheus exporter for machine metrics diff --git a/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/main.css b/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/main.css index 7172563be..211c559e8 100644 --- a/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/main.css +++ b/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/main.css @@ -5960,7 +5960,7 @@ main.page-content.col-lg-12 { #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > a.list-group-item:hover, a.list-group-item:focus, #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > a.list-group-item.collapsed:focus, #navigation.col-sidebar-left > div > nav > #mainmenu > div > div.collapse.in > a.list-group-item:focus, -#navigation.col-sidebar-left > div > nav > #mainmenu > div > div.active-menu.collapse.in >a.list-group-item.active { +#navigation.col-sidebar-left > div > nav > #mainmenu > div > div.active-menu.collapse.in >a.list-group-item.active { color: #ec6d12 !important; background-color: #2a2a2a !important; } diff --git a/sysutils/api-backup/Makefile b/sysutils/api-backup/Makefile index abef4dd09..4e0db7f42 100644 --- a/sysutils/api-backup/Makefile +++ b/sysutils/api-backup/Makefile @@ -1,7 +1,7 @@ -PLUGIN_NAME= api-backup -PLUGIN_VERSION= 0.0.1 -PLUGIN_COMMENT= Provide the functionality to download the config.xml -PLUGIN_MAINTAINER= franz.fabian.94@gmail.com -PLUGIN_DEVEL= YES +PLUGIN_NAME= api-backup +PLUGIN_VERSION= 0.0.1 +PLUGIN_COMMENT= Provide the functionality to download the config.xml +PLUGIN_MAINTAINER= franz.fabian.94@gmail.com +PLUGIN_DEVEL= yes .include "../../Mk/plugins.mk" diff --git a/sysutils/api-backup/pkg-descr b/sysutils/api-backup/pkg-descr index 578a3db51..45972dda8 100644 --- a/sysutils/api-backup/pkg-descr +++ b/sysutils/api-backup/pkg-descr @@ -1 +1 @@ -Provide the functionality to download the config.xml \ No newline at end of file +Provide the functionality to download the config.xml diff --git a/sysutils/api-backup/src/opnsense/mvc/app/controllers/OPNsense/Backup/Api/BackupController.php b/sysutils/api-backup/src/opnsense/mvc/app/controllers/OPNsense/Backup/Api/BackupController.php index cb5b14b79..4f282ac20 100644 --- a/sysutils/api-backup/src/opnsense/mvc/app/controllers/OPNsense/Backup/Api/BackupController.php +++ b/sysutils/api-backup/src/opnsense/mvc/app/controllers/OPNsense/Backup/Api/BackupController.php @@ -44,4 +44,4 @@ class BackupController extends ApiControllerBase { $this->response->send(); } -} \ No newline at end of file +} diff --git a/www/nginx/src/opnsense/mvc/app/views/OPNsense/Nginx/ban.volt b/www/nginx/src/opnsense/mvc/app/views/OPNsense/Nginx/ban.volt index e2071c5fb..45284c742 100644 --- a/www/nginx/src/opnsense/mvc/app/views/OPNsense/Nginx/ban.volt +++ b/www/nginx/src/opnsense/mvc/app/views/OPNsense/Nginx/ban.volt @@ -57,4 +57,4 @@ $(function () { }); - \ No newline at end of file + diff --git a/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/location.conf b/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/location.conf index aa4d1cf3a..a4173cc8c 100644 --- a/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/location.conf +++ b/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/location.conf @@ -107,7 +107,7 @@ location {{ location.matchtype }} {{ location.urlpattern }} { proxy_cache_revalidate {% if location.cache_revalidate is defined and location.cache_revalidate == '1' %}on{% else %}off{% endif %}; proxy_cache_methods GET HEAD{% if location.cache_methods is defined and location.cache_methods != '' %} {{ location.cache_methods.replace(',', ' ') }}{% endif %}; {% endif %} -{% if location.path_prefix is defined and location.path_prefix != '' %} +{% if location.path_prefix is defined and location.path_prefix != '' %} proxy_pass http{% if upstream.tls_enable == '1' %}s{% endif %}://upstream{{ location.upstream.replace('-','') }}{{ location.path_prefix }}; {% else %} proxy_pass http{% if upstream.tls_enable == '1' %}s{% endif %}://upstream{{ location.upstream.replace('-','') }};