From 28d616f74b40f1445fd505f2ca361ee58e1a0986 Mon Sep 17 00:00:00 2001 From: billz Date: Thu, 9 Oct 2025 09:57:50 -0700 Subject: [PATCH 1/2] Add captive portal details --- manifest.json | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/manifest.json b/manifest.json index 093ea3d..24157b2 100644 --- a/manifest.json +++ b/manifest.json @@ -213,6 +213,88 @@ "www-data ALL=(ALL) NOPASSWD:/bin/systemctl * tor@default.service", "www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/torrc /etc/tor/torrc" ] + }, + { + "id": "7", + "name": "Wireshark", + "version": "v1.0.0", + "description": "A TShark (Wireshark) packet capture plugin for RaspAP", + "author": "Bill Z", + "author_uri": "https://github.com/billz", + "plugin_uri": "https://github.com/RaspAP/Wireshark", + "plugin_docs": "http://docs.raspap.com/Wireshark", + "license": "GPL-3.0", + "namespace": "RaspAP\\Plugins\\Wireshark", + "default_locale": "en_US", + "dependencies": { + "tshark": "4.4.7" + }, + "icon": "ra-wireshark", + "install_path": "plugins-available", + "manifest_version": "1.0", + "sudoers": [ + "www-data ALL=(ALL) NOPASSWD:/usr/bin/tshark *", + "www-data ALL=(ALL) NOPASSWD:/bin/cat /tmp/*.pcap", + "www-data ALL=(ALL) NOPASSWD:/bin/cat /tmp/*.pcapng", + "www-data ALL=(ALL) NOPASSWD:/bin/rm /tmp/*.pcap", + "www-data ALL=(ALL) NOPASSWD:/bin/rm /tmp/*.pcapng" + ] + }, + { + "id": "8", + "name": "Captive portal", + "version": "v1.0.0", + "description": "A Captive Portal add-on for RaspAP", + "author": "Bill Z", + "author_uri": "https://github.com/billz", + "plugin_uri": "https://github.com/RaspAP/", + "plugin_docs": "https://docs.raspap.com/features-insiders/captive/", + "license": "GPL-3.0", + "namespace": "RaspAP\\Plugins\\Captive", + "dpkgs": { + "nodogsplash_5.0.2-1_arm64.deb", + "nodogsplash_5.0.2-1_armhf.deb" + }, + "configuration": [ + { + "source": "config/nodogsplash.conf", + "destination": "/etc/nodogsplash/" + }, + { + "source": "config/splash.html", + "destination": "/etc/nodogsplash/" + }, + { + "source": "config/status.html", + "destination": "/etc/nodogsplash/" + }, + { + "source": "config/status.html", + "destination": "/etc/nodogsplash/" + }, + { + "source": "config/splash.css", + "destination": "/etc/nodogsplash/" + }, + { + "source": "config/RaspAP-logo.svg", + "destination": "/etc/nodogsplash/images/" + } + ], + "default_locale": "en_US", + "dependencies": { + "libmicrohttpd-dev": "1.0.1-4", + "libjson-c-dev": "0.18+ds-1" + }, + "icon": "fas fa-right-to-bracket", + "install_path": "plugins-available", + "manifest_version": "1.0", + "sudoers": [ + "www-data ALL=(ALL) NOPASSWD:/bin/systemctl * nodogsplash.service", + "www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/nodogsplash.conf /etc/nodogsplash/nodogsplash.conf", + "www-data ALL=(ALL) NOPASSWD:/usr/bin/ndsctl *" + ] } ] } + From 1474414fbed0f971d3fd8ca7d246c0fa5f678799 Mon Sep 17 00:00:00 2001 From: billz Date: Fri, 10 Oct 2025 04:59:32 -0700 Subject: [PATCH 2/2] Update plugin meta, config paths --- manifest.json | 44 +++++++++----------------------------------- 1 file changed, 9 insertions(+), 35 deletions(-) diff --git a/manifest.json b/manifest.json index 24157b2..1405726 100644 --- a/manifest.json +++ b/manifest.json @@ -214,32 +214,6 @@ "www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/torrc /etc/tor/torrc" ] }, - { - "id": "7", - "name": "Wireshark", - "version": "v1.0.0", - "description": "A TShark (Wireshark) packet capture plugin for RaspAP", - "author": "Bill Z", - "author_uri": "https://github.com/billz", - "plugin_uri": "https://github.com/RaspAP/Wireshark", - "plugin_docs": "http://docs.raspap.com/Wireshark", - "license": "GPL-3.0", - "namespace": "RaspAP\\Plugins\\Wireshark", - "default_locale": "en_US", - "dependencies": { - "tshark": "4.4.7" - }, - "icon": "ra-wireshark", - "install_path": "plugins-available", - "manifest_version": "1.0", - "sudoers": [ - "www-data ALL=(ALL) NOPASSWD:/usr/bin/tshark *", - "www-data ALL=(ALL) NOPASSWD:/bin/cat /tmp/*.pcap", - "www-data ALL=(ALL) NOPASSWD:/bin/cat /tmp/*.pcapng", - "www-data ALL=(ALL) NOPASSWD:/bin/rm /tmp/*.pcap", - "www-data ALL=(ALL) NOPASSWD:/bin/rm /tmp/*.pcapng" - ] - }, { "id": "8", "name": "Captive portal", @@ -247,14 +221,14 @@ "description": "A Captive Portal add-on for RaspAP", "author": "Bill Z", "author_uri": "https://github.com/billz", - "plugin_uri": "https://github.com/RaspAP/", - "plugin_docs": "https://docs.raspap.com/features-insiders/captive/", + "plugin_uri": "https://github.com/RaspAP/Captive", + "plugin_docs": "https://docs.raspap.com/captive/", "license": "GPL-3.0", "namespace": "RaspAP\\Plugins\\Captive", - "dpkgs": { + "dpkgs": [ "nodogsplash_5.0.2-1_arm64.deb", "nodogsplash_5.0.2-1_armhf.deb" - }, + ], "configuration": [ { "source": "config/nodogsplash.conf", @@ -262,23 +236,23 @@ }, { "source": "config/splash.html", - "destination": "/etc/nodogsplash/" + "destination": "/etc/nodogsplash/htdocs/" }, { "source": "config/status.html", - "destination": "/etc/nodogsplash/" + "destination": "/etc/nodogsplash/htdocs/" }, { "source": "config/status.html", - "destination": "/etc/nodogsplash/" + "destination": "/etc/nodogsplash/htdocs/" }, { "source": "config/splash.css", - "destination": "/etc/nodogsplash/" + "destination": "/etc/nodogsplash/htdocs/" }, { "source": "config/RaspAP-logo.svg", - "destination": "/etc/nodogsplash/images/" + "destination": "/etc/nodogsplash/htdocs/images/" } ], "default_locale": "en_US",