diff --git a/lamp/Chart.yaml b/lamp/Chart.yaml index 5c9ad02..769cfef 100644 --- a/lamp/Chart.yaml +++ b/lamp/Chart.yaml @@ -1,8 +1,9 @@ apiVersion: v1 description: Modular and transparent LAMP stack chart supporting PHP-FPM, Release Cloning, LoadBalancer, Ingress, SSL and lots more! name: lamp -version: 1.1.5 -appVersion: 7 +version: 1.1.6 +appVersion: "7" home: https://github.com/lead4good/lamp-helm-repository maintainers: - name: lead4good + - name: roadfox diff --git a/lamp/files/httpd/httpd.conf b/lamp/files/httpd/httpd.conf index 59f6202..fe58ff3 100644 --- a/lamp/files/httpd/httpd.conf +++ b/lamp/files/httpd/httpd.conf @@ -203,8 +203,8 @@ LoadModule rewrite_module modules/mod_rewrite.so # It is usually good practice to create a dedicated user and group for # running httpd, as with most system services. # -User xfs -Group xfs +User www-data +Group www-data diff --git a/lamp/templates/deployment.yaml b/lamp/templates/deployment.yaml index 399fc5a..2364710 100644 --- a/lamp/templates/deployment.yaml +++ b/lamp/templates/deployment.yaml @@ -633,7 +633,7 @@ spec: {{ if .Values.svn.enabled }} - name: svn image: lead4good/svn-sync - command: [/bin/sh, -c, "chown xfs:xfs /svn/ && su -s /bin/sh -c '/bin/sh /entrypoint.sh /sync.sh' xfs"] + command: [/bin/sh, -c, "chown www-data:www-data /svn/ && su -s /bin/sh -c '/bin/sh /entrypoint.sh /sync.sh' www-data"] env: - name: SYNC_USER valueFrom: diff --git a/lamp/templates/ingress-services.yaml b/lamp/templates/ingress-services.yaml index 121601c..934b357 100644 --- a/lamp/templates/ingress-services.yaml +++ b/lamp/templates/ingress-services.yaml @@ -1,7 +1,7 @@ {{- if and .Values.ingress.enabled (or .Values.phpmyadmin.enabled .Values.webdav.enabled) }} -{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19.0" .Capabilities.KubeVersion.Version -}} apiVersion: networking.k8s.io/v1 -{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- else if semverCompare ">=1.14.0" .Capabilities.KubeVersion.Version -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/lamp/templates/ingress-www.yaml b/lamp/templates/ingress-www.yaml index 2320926..032a68b 100644 --- a/lamp/templates/ingress-www.yaml +++ b/lamp/templates/ingress-www.yaml @@ -1,7 +1,7 @@ {{- if and .Values.ingress.enabled .Values.ingress.subdomainWWW }} -{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19.0" .Capabilities.KubeVersion.Version -}} apiVersion: networking.k8s.io/v1 -{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- else if semverCompare ">=1.14.0" .Capabilities.KubeVersion.Version -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/lamp/templates/ingress.yaml b/lamp/templates/ingress.yaml index 56e75b6..4a0fb76 100644 --- a/lamp/templates/ingress.yaml +++ b/lamp/templates/ingress.yaml @@ -1,7 +1,7 @@ {{- if .Values.ingress.enabled }} -{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19.0" .Capabilities.KubeVersion.Version -}} apiVersion: networking.k8s.io/v1 -{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- else if semverCompare ">=1.14.0" .Capabilities.KubeVersion.Version -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1