From dc8d68d7840293a851513646bfc531b381ead723 Mon Sep 17 00:00:00 2001 From: Xstar97 Date: Tue, 9 Aug 2022 06:23:31 -0400 Subject: [PATCH] fix(zoneminder): Add path for open button (#3409) * fix(zoneminder): Add path for open button * add path * update desc * bump * cleanup Co-authored-by: Stavros kois --- charts/incubator/zoneminder/Chart.yaml | 28 +++++------ charts/incubator/zoneminder/questions.yaml | 13 ++--- charts/incubator/zoneminder/values.yaml | 57 +++++++++++++--------- 3 files changed, 53 insertions(+), 45 deletions(-) diff --git a/charts/incubator/zoneminder/Chart.yaml b/charts/incubator/zoneminder/Chart.yaml index 1a6bf9c58d7..57328f0dc78 100644 --- a/charts/incubator/zoneminder/Chart.yaml +++ b/charts/incubator/zoneminder/Chart.yaml @@ -1,10 +1,3 @@ -annotations: - truecharts.org/SCALE-support: "true" - truecharts.org/catagories: | - - HomeAutomation - - MediaApp-Video - - MediaServer-Video - - Tools-Utilities apiVersion: v2 appVersion: "latest" dependencies: @@ -12,15 +5,15 @@ dependencies: repository: https://library-charts.truecharts.org version: 10.4.9 deprecated: false -description: "Zoneminder is the top Linux video camera security and surveillance solution. ZoneMinder is intended for use in single or multi-camera video security applications, including commercial or home CCTV, theft prevention and child, family member or home monitoring and other domestic care scenarios such as nanny cam installations. It supports capture, analysis, recording, and monitoring of video data coming from one or more video or network cameras attached to a Linux system. ZoneMinder also support web and semi-automatic control of Pan/Tilt/Zoom cameras using a variety of protocols. It is suitable for use as a DIY home video security system and for commercial or professional video security and surveillance. It can also be integrated into a home automation system via X.10 or other protocols. If you're looking for a low cost CCTV system or a more flexible alternative to cheap DVR systems then give ZoneMinder a try.[br]\n" -home: https://truecharts.org/docs/charts/incubator/zoneminder -icon: https://truecharts.org/img/hotlink-ok/chart-icons/zoneminder.png +description: "Zoneminder is the top Linux video camera security and surveillance solution." +home: https://github.com/truecharts/charts/tree/master/charts/incubator/zoneminder +icon: https://truecharts.org/img/chart-icons/zoneminder.png keywords: - zoneminder - - HomeAutomation - - MediaApp-Video - - MediaServer-Video - - Tools-Utilities + - home + - automation + - cctv + - utilities kubeVersion: ">=1.16.0-0" maintainers: - email: info@truecharts.org @@ -32,4 +25,9 @@ sources: - https://zoneminder.com/ - https://hub.docker.com/r/dlandon/zoneminder.TrueNAS/ type: application -version: 0.0.15 +version: 0.0.16 +annotations: + truecharts.org/SCALE-support: "true" + truecharts.org/catagories: | + - utilities + - cctv diff --git a/charts/incubator/zoneminder/questions.yaml b/charts/incubator/zoneminder/questions.yaml index 83c22571669..acb91d1ad2f 100644 --- a/charts/incubator/zoneminder/questions.yaml +++ b/charts/incubator/zoneminder/questions.yaml @@ -2,6 +2,7 @@ portals: open: # Include{portalLink} + path: "/zm/index.php" questions: # Include{global} # Include{controller} @@ -32,7 +33,7 @@ questions: description: "This port exposes the container port on the service" schema: type: int - default: 8443 + default: 10292 required: true # Include{advancedPortHTTP} - variable: targetPort @@ -41,15 +42,15 @@ questions: schema: type: int default: 443 - - variable: zmninjaeventno - label: 'zmninjaeventno service' + - variable: zmninja + label: 'zmninja service' schema: additional_attrs: true type: dict attrs: # Include{serviceSelector} - - variable: zmninjaeventno - label: "zmninjaeventno Service Port Configuration" + - variable: zmninja + label: "zmninja Service Port Configuration" schema: additional_attrs: true type: dict @@ -59,7 +60,7 @@ questions: description: "This port exposes the container port on the service" schema: type: int - default: 9000 + default: 10293 required: true # Include{advancedPortTCP} - variable: targetPort diff --git a/charts/incubator/zoneminder/values.yaml b/charts/incubator/zoneminder/values.yaml index f6f2a10db2b..3a4a5bc318c 100644 --- a/charts/incubator/zoneminder/values.yaml +++ b/charts/incubator/zoneminder/values.yaml @@ -1,8 +1,40 @@ -env: {} image: pullPolicy: IfNotPresent repository: tccr.io/truecharts/zoneminder tag: latest@sha256:8c95874d836c198e074a9cc4b7df3f85f4a71ab900de9679339182fbe172ef3b + +podSecurityContext: + runAsGroup: 0 + runAsUser: 0 + +securityContext: + readOnlyRootFilesystem: false + runAsNonRoot: false + +service: + main: + ports: + main: + port: 10292 + protocol: HTTPS + targetPort: 443 + zmninja: + enabled: true + ports: + zmninja: + enabled: true + port: 10293 + protocol: TCP + targetPort: 9000 + +probes: + liveness: + path: "/zm" + readiness: + path: "/zm" + startup: + path: "/zm" + persistence: config: enabled: true @@ -10,29 +42,6 @@ persistence: datapath: enabled: true mountPath: /var/cache/zoneminder -podSecurityContext: - runAsGroup: 0 - runAsUser: 0 -securityContext: - readOnlyRootFilesystem: false - runAsNonRoot: false -service: - main: - enabled: true - ports: - main: - enabled: true - port: 8443 - protocol: HTTP - targetPort: 443 - zmninjaeventno: - enabled: true - ports: - zmninjaeventno: - enabled: true - port: 9000 - protocol: TCP - targetPort: 9000 portal: enabled: true