From 837c1606c65cc4c3377d96fb00dbfc2ce279d2e7 Mon Sep 17 00:00:00 2001 From: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Date: Sat, 26 Mar 2022 02:12:45 +0200 Subject: [PATCH] chore(recipes): correct path for nginx (#2284) * chore(recipes): correct path for nginx * update some docs * chore(kimai): cleanup and bump * nonroot --- charts/incubator/kimai/Chart.yaml | 2 +- charts/incubator/kimai/templates/common.yaml | 19 +-------- .../incubator/kimai/templates/configmap.yaml | 42 ------------------- charts/incubator/kimai/values.yaml | 1 - charts/stable/recipes/Chart.yaml | 2 +- charts/stable/recipes/templates/common.yaml | 4 +- docs/apps/stable/filebrowser/defaultcres.md | 5 +++ docs/apps/stable/filebrowser/notes.md | 4 -- docs/apps/stable/koel/defaultcreds.md | 5 +++ docs/apps/stable/koel/notes.md | 4 -- docs/apps/stable/nextpvr/defaultcreds.md | 5 +++ docs/apps/stable/nextpvr/notes.md | 4 -- docs/apps/stable/qbittorrent/defaultcreds.md | 5 +++ docs/apps/stable/qbittorrent/vpn.md | 5 +++ 14 files changed, 30 insertions(+), 77 deletions(-) delete mode 100644 charts/incubator/kimai/templates/configmap.yaml create mode 100644 docs/apps/stable/filebrowser/defaultcres.md delete mode 100644 docs/apps/stable/filebrowser/notes.md create mode 100644 docs/apps/stable/koel/defaultcreds.md delete mode 100644 docs/apps/stable/koel/notes.md create mode 100644 docs/apps/stable/nextpvr/defaultcreds.md delete mode 100644 docs/apps/stable/nextpvr/notes.md create mode 100644 docs/apps/stable/qbittorrent/defaultcreds.md create mode 100644 docs/apps/stable/qbittorrent/vpn.md diff --git a/charts/incubator/kimai/Chart.yaml b/charts/incubator/kimai/Chart.yaml index 96ffc3ebcd2..c30d3c986e1 100644 --- a/charts/incubator/kimai/Chart.yaml +++ b/charts/incubator/kimai/Chart.yaml @@ -25,7 +25,7 @@ sources: - https://github.com/kevinpapst/kimai2 - https://github.com/tobybatch/kimai2 - https://hub.docker.com/r/kimai/kimai2 -version: 0.0.2 +version: 0.0.3 annotations: truecharts.org/catagories: | - productivity diff --git a/charts/incubator/kimai/templates/common.yaml b/charts/incubator/kimai/templates/common.yaml index eecba2d2028..a17e923ef88 100644 --- a/charts/incubator/kimai/templates/common.yaml +++ b/charts/incubator/kimai/templates/common.yaml @@ -1,18 +1 @@ -{{- include "common.setup" . }} - -{{/* Append the hardcoded settings */}} -{{- define "kimai.harcodedValues" -}} -persistence: - kimai-config: - enabled: "true" - mountPath: "/etc/nginx/conf.d/default.conf" - subPath: "nginx-config" - type: "custom" - volumeSpec: - configMap: - name: {{ printf "%v-config" (include "common.names.fullname" .) }} -{{- end -}} -{{- $_ := mergeOverwrite .Values (include "kimai.harcodedValues" . | fromYaml) -}} - -{{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{- include "common.all" . }} diff --git a/charts/incubator/kimai/templates/configmap.yaml b/charts/incubator/kimai/templates/configmap.yaml deleted file mode 100644 index a6452a5dd75..00000000000 --- a/charts/incubator/kimai/templates/configmap.yaml +++ /dev/null @@ -1,42 +0,0 @@ ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "common.names.fullname" . }}-config - labels: - {{- include "common.labels" . | nindent 4 }} -data: - nginx-config: |- - server { - listen 80; - index index.php; - server_name nginx; - server_tokens off; - root /opt/kimai/public; - - # cache static asset files - location ~* \.(ico|css|js|gif|jpe?g|png)(\?[0-9]+)?$ { - expires max; - log_not_found off; - } - - # for health checks - location /health { - return 200 'alive'; - add_header Content-Type text/plain; - } - - location / { - try_files $uri $uri/ /index.php$is_args$args; - } - - location ~ ^/index\.php(/|$) { - fastcgi_hide_header X-Powered-By; - fastcgi_pass localhost:9000; - fastcgi_split_path_info ^(.+\.php)(/.*)$; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name; - fastcgi_param DOCUMENT_ROOT $realpath_root; - internal; - } - } diff --git a/charts/incubator/kimai/values.yaml b/charts/incubator/kimai/values.yaml index 8e6172035b2..a0df7664f5f 100644 --- a/charts/incubator/kimai/values.yaml +++ b/charts/incubator/kimai/values.yaml @@ -4,7 +4,6 @@ image: pullPolicy: IfNotPresent securityContext: - runAsNonRoot: false readOnlyRootFilesystem: false podSecurityContext: diff --git a/charts/stable/recipes/Chart.yaml b/charts/stable/recipes/Chart.yaml index e4442e988be..6b0ca189d2c 100644 --- a/charts/stable/recipes/Chart.yaml +++ b/charts/stable/recipes/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "1.1.3" description: Recipes is a Django application to manage, tag and search recipes using either built in models or external storage providers hosting PDF's, Images or other files. name: recipes -version: 6.0.10 +version: 6.0.11 kubeVersion: ">=1.16.0-0" keywords: - recipes diff --git a/charts/stable/recipes/templates/common.yaml b/charts/stable/recipes/templates/common.yaml index 21e879a998b..b68b3c0a511 100644 --- a/charts/stable/recipes/templates/common.yaml +++ b/charts/stable/recipes/templates/common.yaml @@ -5,8 +5,8 @@ persistence: recipes-config: enabled: "true" - mountPath: "/app/config.json" - subPath: "config.json" + mountPath: "/etc/nginx/nginx.conf" + subPath: "nginx.conf" type: "custom" volumeSpec: configMap: diff --git a/docs/apps/stable/filebrowser/defaultcres.md b/docs/apps/stable/filebrowser/defaultcres.md new file mode 100644 index 00000000000..be8a8175f5a --- /dev/null +++ b/docs/apps/stable/filebrowser/defaultcres.md @@ -0,0 +1,5 @@ +# Default Username/Password + +__Email__: `admin` + +__Password__: `admin` diff --git a/docs/apps/stable/filebrowser/notes.md b/docs/apps/stable/filebrowser/notes.md deleted file mode 100644 index 93085793f0c..00000000000 --- a/docs/apps/stable/filebrowser/notes.md +++ /dev/null @@ -1,4 +0,0 @@ -# Default Username/Password - -__email__: `admin` -__password__: `admin` diff --git a/docs/apps/stable/koel/defaultcreds.md b/docs/apps/stable/koel/defaultcreds.md new file mode 100644 index 00000000000..a663ea8bd3d --- /dev/null +++ b/docs/apps/stable/koel/defaultcreds.md @@ -0,0 +1,5 @@ +# Default Username/Password + +__Email__: `admin@koel.dev` + +__Password__: `KoelIsCool` diff --git a/docs/apps/stable/koel/notes.md b/docs/apps/stable/koel/notes.md deleted file mode 100644 index 29879c7dc62..00000000000 --- a/docs/apps/stable/koel/notes.md +++ /dev/null @@ -1,4 +0,0 @@ -# Default Username/Password - -__email__: `admin@koel.dev` -__password__: `KoelIsCool` diff --git a/docs/apps/stable/nextpvr/defaultcreds.md b/docs/apps/stable/nextpvr/defaultcreds.md new file mode 100644 index 00000000000..d72242cbdea --- /dev/null +++ b/docs/apps/stable/nextpvr/defaultcreds.md @@ -0,0 +1,5 @@ +# Default Username/Password + +__E-mail__: `admin` + +__Password__: `password` diff --git a/docs/apps/stable/nextpvr/notes.md b/docs/apps/stable/nextpvr/notes.md deleted file mode 100644 index 3154ea6b1be..00000000000 --- a/docs/apps/stable/nextpvr/notes.md +++ /dev/null @@ -1,4 +0,0 @@ -# Default Username/Password - -__email__: `admin` -__password__: `password` diff --git a/docs/apps/stable/qbittorrent/defaultcreds.md b/docs/apps/stable/qbittorrent/defaultcreds.md new file mode 100644 index 00000000000..3d01700b602 --- /dev/null +++ b/docs/apps/stable/qbittorrent/defaultcreds.md @@ -0,0 +1,5 @@ +# Default Username/Password + +__Username__: `admin` + +__Password__: `adminadmin` diff --git a/docs/apps/stable/qbittorrent/vpn.md b/docs/apps/stable/qbittorrent/vpn.md new file mode 100644 index 00000000000..8684858b0ee --- /dev/null +++ b/docs/apps/stable/qbittorrent/vpn.md @@ -0,0 +1,5 @@ +# Using VPN + +When using VPN, in order for qbittorent to use it, you have to set the correct interface in the WebUI. + +The setting should be under Settings (Gear Icon) > Advanced > Network Interface