luci-app-ipsec: rename to luci-app-strongswan-swanctl

Signed-off-by: Lukas Voegl <redacted>

diff --git a/applications/luci-app-strongswan-ipsec/Makefile b/applications/luci-app-strongswan-ipsec/Makefile
deleted file mode 100644 (file)
index 5dbbe21..0000000
--- a/applications/luci-app-strongswan-ipsec/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2021 Nicholas Smith (nicholas@nbembedded.com)
-# This is free software, licensed under the GNU General Public License v2.
-
-include $(TOPDIR)/rules.mk
-
-PKG_LICENSE:=GPL-2.0-or-later
-PKG_MAINTAINER:=Nicholas Smith <nicholas@nbembedded.com>
-
-LUCI_TITLE:=LuCI support for IPSec via Strongswan
-LUCI_DESCRIPTION:=Allows configuration of Strongswan IPSec settings
-LUCI_DEPENDS:=+strongswan-ipsec
-
-include ../../luci.mk
-
-# call BuildPackage - OpenWrt buildroot signature

diff --git a/applications/luci-app-strongswan-ipsec/root/usr/share/luci/menu.d/luci-app-strongswan-ipsec.json b/applications/luci-app-strongswan-ipsec/root/usr/share/luci/menu.d/luci-app-strongswan-ipsec.json
deleted file mode 100644 (file)
index 8fc3e9c..0000000
--- a/applications/luci-app-strongswan-ipsec/root/usr/share/luci/menu.d/luci-app-strongswan-ipsec.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-       "admin/vpn/strongswan-ipsec": {
-               "title": "Strongswan IPSec",
-               "order": 90,
-               "action": {
-                       "type": "view",
-                       "path": "strongswan-ipsec"
-               },
-               "depends": {
-                       "acl": [
-                               "luci-app-strongswan-ipsec"
-                       ]
-               }
-       }
-}

diff --git a/applications/luci-app-strongswan-ipsec/root/usr/share/rpcd/acl.d/luci-app-strongswan-ipsec.json b/applications/luci-app-strongswan-ipsec/root/usr/share/rpcd/acl.d/luci-app-strongswan-ipsec.json
deleted file mode 100644 (file)
index 3b940b8..0000000
--- a/applications/luci-app-strongswan-ipsec/root/usr/share/rpcd/acl.d/luci-app-strongswan-ipsec.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-       "luci-app-strongswan-ipsec": {
-               "description": "Grant access to luci-app-strongswan-ipsec",
-               "read": {
-                       "uci": [ "ipsec" ]
-               },
-               "write": {
-                       "uci": [ "ipsec" ]
-               }
-       }
-}

diff --git a/applications/luci-app-strongswan-swanctl/Makefile b/applications/luci-app-strongswan-swanctl/Makefile
new file mode 100644 (file)
index 0000000..0e847c7
--- /dev/null
+++ b/applications/luci-app-strongswan-swanctl/Makefile
@@ -0,0 +1,17 @@
+# Copyright 2021 Nicholas Smith (nicholas@nbembedded.com)
+# Copyright (C) 2023 TDT AG <development@tdt.de>
+#
+# This is free software, licensed under the GNU General Public License v2.
+
+include $(TOPDIR)/rules.mk
+
+PKG_LICENSE:=GPL-2.0-or-later
+PKG_MAINTAINER:=Nicholas Smith <nicholas@nbembedded.com>, Lukas Voegl <lvoegl@tdt.de>
+
+LUCI_TITLE:=LuCI support for strongSwan via swanctl
+LUCI_DESCRIPTION:=Configuration for strongSwan based on swanctl
+LUCI_DEPENDS:=+strongswan-swanctl
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature

diff --git a/applications/luci-app-strongswan-ipsec/htdocs/luci-static/resources/view/ipsec.js b/applications/luci-app-strongswan-swanctl/htdocs/luci-static/resources/view/strongswan-swanctl/swanctl.js
similarity index 95%
rename from applications/luci-app-strongswan-ipsec/htdocs/luci-static/resources/view/ipsec.js
rename to applications/luci-app-strongswan-swanctl/htdocs/luci-static/resources/view/strongswan-swanctl/swanctl.js
index 53acf71e8ee6f2267fc2d80902f2fd3cf606a84a..d2e7103afafac7bfe4ae5103db809ef35d79ca1b 100644 (file)
--- a/applications/luci-app-strongswan-ipsec/htdocs/luci-static/resources/view/ipsec.js
+++ b/applications/luci-app-strongswan-swanctl/htdocs/luci-static/resources/view/strongswan-swanctl/swanctl.js
@@ -8,11 +8,11 @@ return view.extend({
         var m, s, o;
 
         m = new form.Map('ipsec',
-        _('IPsec Configuration'),
-        _("Configure IPsec for secure VPN connections."));
+        _('strongSwan Configuration'),
+        _("Configure strongSwan for secure VPN connections."));
 
-        // IPsec General Settings
-        s = m.section(form.TypedSection, 'ipsec', _('IPsec General Settings'));
+        // strongSwan General Settings
+        s = m.section(form.TypedSection, 'ipsec', _('strongSwan General Settings'));
         s.anonymous = true;
 
         o = s.option(widgets.ZoneSelect, 'zone', _('Zone'), _('Firewall zone that has to match the defined firewall zone'));
@@ -87,7 +87,7 @@ return view.extend({
         o = s.option(form.Value, 'authentication_method', _('Authentication Method'), _('IKE authentication (phase 1)'));
         o.datatype = 'string';
 
-        s = m.section(form.TypedSection, 'ipsec', _('IPsec General Settings'));
+        s = m.section(form.TypedSection, 'ipsec', _('strongSwan General Settings'));
         s.anonymous = true;
 
         o = s.option(form.ListValue, 'encryption_algorithm', _('Encryption Algorithm'), _('Encryption method (aes128, aes192, aes256, 3des)'));

diff --git a/applications/luci-app-strongswan-ipsec/root/etc/config/ipsec b/applications/luci-app-strongswan-swanctl/root/etc/config/ipsec
similarity index 100%
rename from applications/luci-app-strongswan-ipsec/root/etc/config/ipsec
rename to applications/luci-app-strongswan-swanctl/root/etc/config/ipsec

diff --git a/applications/luci-app-strongswan-swanctl/root/usr/share/luci/menu.d/luci-app-strongswan-swanctl.json b/applications/luci-app-strongswan-swanctl/root/usr/share/luci/menu.d/luci-app-strongswan-swanctl.json
new file mode 100644 (file)
index 0000000..2f0c5c5
--- /dev/null
+++ b/applications/luci-app-strongswan-swanctl/root/usr/share/luci/menu.d/luci-app-strongswan-swanctl.json
@@ -0,0 +1,15 @@
+{
+       "admin/vpn/strongswan-swanctl": {
+               "title": "strongSwan IPsec",
+               "order": 90,
+               "action": {
+                       "type": "view",
+                       "path": "strongswan-swanctl/swanctl"
+               },
+               "depends": {
+                       "acl": [
+                               "luci-app-strongswan-swanctl"
+                       ]
+               }
+       }
+}

diff --git a/applications/luci-app-strongswan-swanctl/root/usr/share/rpcd/acl.d/luci-app-strongswan-swanctl.json b/applications/luci-app-strongswan-swanctl/root/usr/share/rpcd/acl.d/luci-app-strongswan-swanctl.json
new file mode 100644 (file)
index 0000000..4f022c9
--- /dev/null
+++ b/applications/luci-app-strongswan-swanctl/root/usr/share/rpcd/acl.d/luci-app-strongswan-swanctl.json
@@ -0,0 +1,11 @@
+{
+       "luci-app-strongswan-swanctl": {
+               "description": "Grant access to luci-app-strongswan-swanctl",
+               "read": {
+                       "uci": [ "ipsec" ]
+               },
+               "write": {
+                       "uci": [ "ipsec" ]
+               }
+       }
+}