From 0d981c8bcc0c30e55a6cb5cd4a8d327374cee554 Mon Sep 17 00:00:00 2001 From: hugofnm Date: Thu, 11 Jul 2024 15:02:58 +0200 Subject: [PATCH 1/7] Add Omada Controller --- omada-controller/docker-compose.yml | 28 +++++++++++++++++++ omada-controller/umbrel-app.yml | 42 +++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+) create mode 100644 omada-controller/docker-compose.yml create mode 100644 omada-controller/umbrel-app.yml diff --git a/omada-controller/docker-compose.yml b/omada-controller/docker-compose.yml new file mode 100644 index 0000000000..5cc6202a45 --- /dev/null +++ b/omada-controller/docker-compose.yml @@ -0,0 +1,28 @@ +version: "3.7" + +services: + server: + image: mbentley/omada-controller:5.14@sha256:ce429a64b11bcc8f86fdc5aa1990a54a158de8ce83f92c316bb556f29f732afd + init: true + restart: unless-stopped + stop_grace_period: 60s + network_mode: host # Controller needs lots of ports for device discovery + ulimits: + nofile: + soft: 4096 + hard: 8192 + environment: + - PUID=1000 + - PGID=1000 + - MANAGE_HTTP_PORT=8088 + - MANAGE_HTTPS_PORT=8043 + - PORTAL_HTTP_PORT=8088 + - PORTAL_HTTPS_PORT=8043 + - SHOW_SERVER_LOGS=true + - SHOW_MONGODB_LOGS=false + - SSL_CERT_NAME="tls.crt" + - SSL_KEY_NAME="tls.key" + volumes: + - ${APP_DATA_DIR}/data:/opt/tplink/EAPController/data + - ${APP_DATA_DIR}/logs:/opt/tplink/EAPController/logs + - ${APP_DATA_DIR}/work:/opt/tplink/EAPController/work \ No newline at end of file diff --git a/omada-controller/umbrel-app.yml b/omada-controller/umbrel-app.yml new file mode 100644 index 0000000000..27fe459e1b --- /dev/null +++ b/omada-controller/umbrel-app.yml @@ -0,0 +1,42 @@ +manifestVersion: 1 +id: omada-controller +name: Omada Controller +tagline: On-Premises Omada SDN Controller +icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons/svg/omada.svg +category: Networking +version: "5.14" +port: 8088 +description: >- + Omada Software Controller + + + A Professional and Free On-Premises Omada SDN Controller + + - Centralized Management : Up to 1,500 Omada access points, JetStream switches, and Omada routers. + + - Cloud Access : Manage and monitor with the Omada app or Web UI from anywhere, anytime. + + - Free of Charge : Download and use locally or from the cloud without additional expense. + + - Easy and Intelligent Network Monitoring : The easy-to-use dashboard makes it simple to see the real-time network status and traffic distribution. + + - Real-Time Network Topology : Helps IT admins quickly see and troubleshoot connections at a glance. + + - Easier Network Maintenance : WiFi heatmap simulator, visualizable network report, and batch & multi-site management benefit network maintenance. + + + ⚠️ - This app can take 15-20 minutes to start after installation. + +developer: TP-Link / Matt Bentley +website: https://github.com/mbentley/docker-omada-controller +submitter: hugofnm +repo: https://github.com/hugofnm/umbrel-omada-controller +support: https://github.com/hugofnm/umbrel-omada-controller/issues +gallery: + - 1.jpg + - 2.jpg + - 3.jpg +dependencies: [] +path: "" +defaultUsername: "" +defaultPassword: "" \ No newline at end of file From 1b3221b59e551c783a27a43dd253dff106880265 Mon Sep 17 00:00:00 2001 From: hugofnm Date: Sun, 28 Jul 2024 01:11:14 +0200 Subject: [PATCH 2/7] Update based on suggestions --- omada-controller/data/config/.gitkeep | 0 omada-controller/data/logs/.gitkeep | 0 omada-controller/data/work/.gitkeep | 0 omada-controller/docker-compose.yml | 6 +++--- omada-controller/umbrel-app.yml | 9 ++++----- 5 files changed, 7 insertions(+), 8 deletions(-) create mode 100644 omada-controller/data/config/.gitkeep create mode 100644 omada-controller/data/logs/.gitkeep create mode 100644 omada-controller/data/work/.gitkeep diff --git a/omada-controller/data/config/.gitkeep b/omada-controller/data/config/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/omada-controller/data/logs/.gitkeep b/omada-controller/data/logs/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/omada-controller/data/work/.gitkeep b/omada-controller/data/work/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/omada-controller/docker-compose.yml b/omada-controller/docker-compose.yml index 5cc6202a45..0cb94ca5c2 100644 --- a/omada-controller/docker-compose.yml +++ b/omada-controller/docker-compose.yml @@ -23,6 +23,6 @@ services: - SSL_CERT_NAME="tls.crt" - SSL_KEY_NAME="tls.key" volumes: - - ${APP_DATA_DIR}/data:/opt/tplink/EAPController/data - - ${APP_DATA_DIR}/logs:/opt/tplink/EAPController/logs - - ${APP_DATA_DIR}/work:/opt/tplink/EAPController/work \ No newline at end of file + - ${APP_DATA_DIR}/data/config:/opt/tplink/EAPController/data + - ${APP_DATA_DIR}/data/logs:/opt/tplink/EAPController/logs + - ${APP_DATA_DIR}/data/work:/opt/tplink/EAPController/work \ No newline at end of file diff --git a/omada-controller/umbrel-app.yml b/omada-controller/umbrel-app.yml index 27fe459e1b..f16c8184d1 100644 --- a/omada-controller/umbrel-app.yml +++ b/omada-controller/umbrel-app.yml @@ -2,8 +2,7 @@ manifestVersion: 1 id: omada-controller name: Omada Controller tagline: On-Premises Omada SDN Controller -icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons/svg/omada.svg -category: Networking +category: networking version: "5.14" port: 8088 description: >- @@ -25,11 +24,12 @@ description: >- - Easier Network Maintenance : WiFi heatmap simulator, visualizable network report, and batch & multi-site management benefit network maintenance. - ⚠️ - This app can take 15-20 minutes to start after installation. + ⚠️ - This app is RAM-intensive (4GB recommended) and can take 15-20 minutes to start after installation. developer: TP-Link / Matt Bentley website: https://github.com/mbentley/docker-omada-controller submitter: hugofnm +submission: https://github.com/getumbrel/umbrel-apps/pull/1196 repo: https://github.com/hugofnm/umbrel-omada-controller support: https://github.com/hugofnm/umbrel-omada-controller/issues gallery: @@ -38,5 +38,4 @@ gallery: - 3.jpg dependencies: [] path: "" -defaultUsername: "" -defaultPassword: "" \ No newline at end of file +releaseNotes: "" \ No newline at end of file From f19c8607e684a4c9579057c943360f5590c3323d Mon Sep 17 00:00:00 2001 From: hugofnm Date: Tue, 30 Jul 2024 22:28:23 +0200 Subject: [PATCH 3/7] Change HTTP port --- omada-controller/docker-compose.yml | 4 ++-- omada-controller/umbrel-app.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/omada-controller/docker-compose.yml b/omada-controller/docker-compose.yml index 0cb94ca5c2..b108072bd5 100644 --- a/omada-controller/docker-compose.yml +++ b/omada-controller/docker-compose.yml @@ -14,9 +14,9 @@ services: environment: - PUID=1000 - PGID=1000 - - MANAGE_HTTP_PORT=8088 + - MANAGE_HTTP_PORT=8078 - MANAGE_HTTPS_PORT=8043 - - PORTAL_HTTP_PORT=8088 + - PORTAL_HTTP_PORT=8078 - PORTAL_HTTPS_PORT=8043 - SHOW_SERVER_LOGS=true - SHOW_MONGODB_LOGS=false diff --git a/omada-controller/umbrel-app.yml b/omada-controller/umbrel-app.yml index f16c8184d1..3282648a27 100644 --- a/omada-controller/umbrel-app.yml +++ b/omada-controller/umbrel-app.yml @@ -4,7 +4,7 @@ name: Omada Controller tagline: On-Premises Omada SDN Controller category: networking version: "5.14" -port: 8088 +port: 8078 description: >- Omada Software Controller @@ -24,7 +24,7 @@ description: >- - Easier Network Maintenance : WiFi heatmap simulator, visualizable network report, and batch & multi-site management benefit network maintenance. - ⚠️ - This app is RAM-intensive (4GB recommended) and can take 15-20 minutes to start after installation. + ⚠️ - This app is RAM-intensive (+4GB recommended) and can take 15-20 minutes to start after installation. developer: TP-Link / Matt Bentley website: https://github.com/mbentley/docker-omada-controller From 86dae9126ce7bfa1322f8e4bcd396c134bfca4ca Mon Sep 17 00:00:00 2001 From: hugofnm Date: Wed, 31 Jul 2024 18:24:04 +0200 Subject: [PATCH 4/7] Update repo link --- omada-controller/umbrel-app.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/omada-controller/umbrel-app.yml b/omada-controller/umbrel-app.yml index 3282648a27..b5becf104d 100644 --- a/omada-controller/umbrel-app.yml +++ b/omada-controller/umbrel-app.yml @@ -30,8 +30,8 @@ developer: TP-Link / Matt Bentley website: https://github.com/mbentley/docker-omada-controller submitter: hugofnm submission: https://github.com/getumbrel/umbrel-apps/pull/1196 -repo: https://github.com/hugofnm/umbrel-omada-controller -support: https://github.com/hugofnm/umbrel-omada-controller/issues +repo: https://github.com/hugofnm/umbrel-appstore +support: https://github.com/hugofnm/umbrel-appstore/issues gallery: - 1.jpg - 2.jpg From 096605a8ab64d48b6b6d5190bbe4358d386c86bd Mon Sep 17 00:00:00 2001 From: nmfretz Date: Mon, 5 Aug 2024 09:55:59 +1000 Subject: [PATCH 5/7] Tweak release notes --- omada-controller/umbrel-app.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/omada-controller/umbrel-app.yml b/omada-controller/umbrel-app.yml index b5becf104d..67f412d132 100644 --- a/omada-controller/umbrel-app.yml +++ b/omada-controller/umbrel-app.yml @@ -6,7 +6,7 @@ category: networking version: "5.14" port: 8078 description: >- - Omada Software Controller + ⚠️ This app is RAM-intensive (+4GB recommended) and can take 15-20 minutes to start after installation. A Professional and Free On-Premises Omada SDN Controller @@ -22,10 +22,6 @@ description: >- - Real-Time Network Topology : Helps IT admins quickly see and troubleshoot connections at a glance. - Easier Network Maintenance : WiFi heatmap simulator, visualizable network report, and batch & multi-site management benefit network maintenance. - - - ⚠️ - This app is RAM-intensive (+4GB recommended) and can take 15-20 minutes to start after installation. - developer: TP-Link / Matt Bentley website: https://github.com/mbentley/docker-omada-controller submitter: hugofnm From fe6809a0387818407656e9917b11c6ab51adbefb Mon Sep 17 00:00:00 2001 From: nmfretz Date: Mon, 5 Aug 2024 09:56:13 +1000 Subject: [PATCH 6/7] update developer --- omada-controller/umbrel-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omada-controller/umbrel-app.yml b/omada-controller/umbrel-app.yml index 67f412d132..d3593e85c5 100644 --- a/omada-controller/umbrel-app.yml +++ b/omada-controller/umbrel-app.yml @@ -22,7 +22,7 @@ description: >- - Real-Time Network Topology : Helps IT admins quickly see and troubleshoot connections at a glance. - Easier Network Maintenance : WiFi heatmap simulator, visualizable network report, and batch & multi-site management benefit network maintenance. -developer: TP-Link / Matt Bentley +developer: TP-Link website: https://github.com/mbentley/docker-omada-controller submitter: hugofnm submission: https://github.com/getumbrel/umbrel-apps/pull/1196 From ea1794d01f93e327965fca4a33d2d3afcf754de9 Mon Sep 17 00:00:00 2001 From: nmfretz Date: Mon, 5 Aug 2024 10:00:32 +1000 Subject: [PATCH 7/7] update host network comment --- omada-controller/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omada-controller/docker-compose.yml b/omada-controller/docker-compose.yml index b108072bd5..4b791d8731 100644 --- a/omada-controller/docker-compose.yml +++ b/omada-controller/docker-compose.yml @@ -6,7 +6,7 @@ services: init: true restart: unless-stopped stop_grace_period: 60s - network_mode: host # Controller needs lots of ports for device discovery + network_mode: host # host network mode required for device discovery ulimits: nofile: soft: 4096