From f10d2cf8dfce136629be57667e9d0ac35573f0c8 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Tue, 18 Oct 2022 14:31:56 +0200 Subject: [PATCH] net/sslh: style updates and sync --- LICENSE | 2 ++ README.md | 1 + net/sslh/Makefile | 12 ++++++------ .../OPNsense/Sslh/Api/ServiceController.php | 3 +-- .../OPNsense/Sslh/Api/SettingsController.php | 2 +- .../OPNsense/Sslh/SettingsController.php | 17 +++++++---------- .../mvc/app/models/OPNsense/Sslh/Settings.php | 2 +- .../mvc/app/views/OPNsense/Sslh/settings.volt | 11 +++++------ .../templates/OPNsense/Sslh/sslh.conf.jinja | 9 ++++----- 9 files changed, 28 insertions(+), 31 deletions(-) diff --git a/LICENSE b/LICENSE index 336483a1a..0775e221e 100644 --- a/LICENSE +++ b/LICENSE @@ -39,6 +39,7 @@ Copyright (c) 2017-2021 Michael Muenz Copyright (c) 2021 Nicola Pellegrini Copyright (c) 2022 Nikolaj Brinch Jørgensen Copyright (c) 2021 Nim G +Copyright (c) 2022 Patrik Kernstock Copyright (c) 2004-2012 Scott Ullrich Copyright (c) 2010 Seth Mos Copyright (c) 2008 Shrew Soft Inc. @@ -49,6 +50,7 @@ Copyright (c) 2020 Tobias Boehnert Copyright (c) 2022 Wouter Deurholt Copyright (c) 2010 Yehuda Katz Copyright (c) 2015 YoungJoo.Kim +Copyright (c) 2022 agh1467 Copyright (c) 2020 devNan0 All rights reserved. diff --git a/README.md b/README.md index 2efc92f75..55da66cf5 100644 --- a/README.md +++ b/README.md @@ -62,6 +62,7 @@ net/realtek-re -- Realtek re(4) vendor driver net/relayd -- Relayd Load Balancer net/shadowsocks -- Secure socks5 proxy net/siproxd -- Siproxd is a proxy daemon for the SIP protocol +net/sslh -- sslh configuration front-end (development only) net/tayga -- Tayga NAT64 net/udpbroadcastrelay -- Control ubpbroadcastrelay processes net/upnp -- Universal Plug and Play Service diff --git a/net/sslh/Makefile b/net/sslh/Makefile index d1761cbc5..c4babf32a 100644 --- a/net/sslh/Makefile +++ b/net/sslh/Makefile @@ -1,8 +1,8 @@ -PLUGIN_NAME= sslh -PLUGIN_VERSION= 0.1 -PLUGIN_DEVEL= yes -PLUGIN_COMMENT= sslh configuration front-end -PLUGIN_DEPENDS= sslh -PLUGIN_MAINTAINER= agh1467@protonmail.com +PLUGIN_NAME= sslh +PLUGIN_VERSION= 0.1 +PLUGIN_DEVEL= yes +PLUGIN_COMMENT= sslh configuration front-end +PLUGIN_DEPENDS= sslh +PLUGIN_MAINTAINER= agh1467@protonmail.com .include "../../Mk/plugins.mk" diff --git a/net/sslh/src/opnsense/mvc/app/controllers/OPNsense/Sslh/Api/ServiceController.php b/net/sslh/src/opnsense/mvc/app/controllers/OPNsense/Sslh/Api/ServiceController.php index eb4400f85..18e48b826 100644 --- a/net/sslh/src/opnsense/mvc/app/controllers/OPNsense/Sslh/Api/ServiceController.php +++ b/net/sslh/src/opnsense/mvc/app/controllers/OPNsense/Sslh/Api/ServiceController.php @@ -1,7 +1,7 @@ * * All rights reserved. * @@ -73,5 +73,4 @@ class ServiceController extends ApiMutableServiceControllerBase * @var string $internalServiceName */ protected static $internalServiceName = 'sslh'; - } diff --git a/net/sslh/src/opnsense/mvc/app/controllers/OPNsense/Sslh/Api/SettingsController.php b/net/sslh/src/opnsense/mvc/app/controllers/OPNsense/Sslh/Api/SettingsController.php index 4409cb2a7..59894178e 100644 --- a/net/sslh/src/opnsense/mvc/app/controllers/OPNsense/Sslh/Api/SettingsController.php +++ b/net/sslh/src/opnsense/mvc/app/controllers/OPNsense/Sslh/Api/SettingsController.php @@ -1,7 +1,7 @@ * * All rights reserved. * diff --git a/net/sslh/src/opnsense/mvc/app/controllers/OPNsense/Sslh/SettingsController.php b/net/sslh/src/opnsense/mvc/app/controllers/OPNsense/Sslh/SettingsController.php index 376a76e70..e1d275bb0 100644 --- a/net/sslh/src/opnsense/mvc/app/controllers/OPNsense/Sslh/SettingsController.php +++ b/net/sslh/src/opnsense/mvc/app/controllers/OPNsense/Sslh/SettingsController.php @@ -1,7 +1,7 @@ All rights reserved. Redistribution and use in source and binary forms, with or without @@ -46,19 +46,16 @@ class SettingsController extends \OPNsense\Base\IndexController */ public function indexAction() { - - // Set environment variables for within the Volt templates. - $this->view->setVars( - [ + // Set environment variables for within the Volt templates. + $this->view->setVars([ 'plugin_name' => 'sslh', 'api_name' => 'sslh', 'this_form' => $this->getForm('settings'), // controllers/OPNsense/Sslh/forms/settings.xml - ] - ); + ]); - // pick the template as the next view to render - $this->view->pick('OPNsense/Sslh/settings'); - // views/OPNsense/Sslh/settings.volt + // pick the template as the next view to render + $this->view->pick('OPNsense/Sslh/settings'); + // views/OPNsense/Sslh/settings.volt } } diff --git a/net/sslh/src/opnsense/mvc/app/models/OPNsense/Sslh/Settings.php b/net/sslh/src/opnsense/mvc/app/models/OPNsense/Sslh/Settings.php index 7c24334bc..286759120 100644 --- a/net/sslh/src/opnsense/mvc/app/models/OPNsense/Sslh/Settings.php +++ b/net/sslh/src/opnsense/mvc/app/models/OPNsense/Sslh/Settings.php @@ -1,7 +1,7 @@ All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/net/sslh/src/opnsense/mvc/app/views/OPNsense/Sslh/settings.volt b/net/sslh/src/opnsense/mvc/app/views/OPNsense/Sslh/settings.volt index 6ea142ded..001a42c4c 100644 --- a/net/sslh/src/opnsense/mvc/app/views/OPNsense/Sslh/settings.volt +++ b/net/sslh/src/opnsense/mvc/app/views/OPNsense/Sslh/settings.volt @@ -1,7 +1,6 @@ -{## - # - # OPNsense® is Copyright © 2014 – 2018 by Deciso B.V. - # This file is Copyright © 2022 agh1467@protonmail.com +{# + # Copyright (c) 2014-2018 Deciso B.V. + # Copyright (c) 2022 agh1467 # All rights reserved. # # Redistribution and use in source and binary forms, with or without modification, @@ -24,9 +23,9 @@ # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -#} + #} -{## +{# # This is the template for the settings page. # # This is the main page for this plugin. diff --git a/net/sslh/src/opnsense/service/templates/OPNsense/Sslh/sslh.conf.jinja b/net/sslh/src/opnsense/service/templates/OPNsense/Sslh/sslh.conf.jinja index 1cbae9b6b..eb0c7378a 100644 --- a/net/sslh/src/opnsense/service/templates/OPNsense/Sslh/sslh.conf.jinja +++ b/net/sslh/src/opnsense/service/templates/OPNsense/Sslh/sslh.conf.jinja @@ -1,7 +1,6 @@ -{## - # - # OPNsense® is Copyright © 2014 – 2018 by Deciso B.V. - # This file is Copyright © 2022 agh1467@protonmail.com +{# + # Copyright (c) 2014-2018 Deciso B.V. + # Copyright (c) 2022 agh1467 # All rights reserved. # # Redistribution and use in source and binary forms, with or without modification, @@ -24,7 +23,7 @@ # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -#} + #} {#- /usr/local/etc/sslh.conf -#} {% set plugin_name = 'sslh' %}