From 853f3c786b056ce64f1fdb20c4d5e6347ebfd10c Mon Sep 17 00:00:00 2001 From: CEE Date: Wed, 3 Jan 2024 02:09:49 +0900 Subject: [PATCH] ngixn fpm --- charts/nextcloud/Chart.yaml | 2 +- charts/nextcloud/templates/_helpers.tpl | 54 ++++++ .../templates/nextcloud-deployment.yaml | 77 ++++----- charts/nextcloud/templates/nginx-config.yaml | 155 ++++++++++++++++++ 4 files changed, 238 insertions(+), 50 deletions(-) create mode 100644 charts/nextcloud/templates/nginx-config.yaml diff --git a/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml index 61537da..11b5b06 100644 --- a/charts/nextcloud/Chart.yaml +++ b/charts/nextcloud/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: nextcloud -version: 4.5.37 +version: 4.5.38 appVersion: 28.0.1 description: A file sharing server that puts the control and security of your own data back into your hands. keywords: diff --git a/charts/nextcloud/templates/_helpers.tpl b/charts/nextcloud/templates/_helpers.tpl index 1d006f5..3f5630f 100644 --- a/charts/nextcloud/templates/_helpers.tpl +++ b/charts/nextcloud/templates/_helpers.tpl @@ -214,3 +214,57 @@ files <<< {{ toYaml .Values.nextcloud.extraVolumeMounts }} {{- end }} {{- end -}} + +{{/* +Create volume mounts for the nextcloud container as well as the cron sidecar container. +*/}} +{{- define "nextcloud.probes" -}} +{{- with .Values.livenessProbe }} +{{- if .enabled }} +livenessProbe: + httpGet: + path: /status.php + port: {{ $.Values.nextcloud.containerPort }} + httpHeaders: + - name: Host + value: {{ $.Values.nextcloud.host | quote }} + initialDelaySeconds: {{ .initialDelaySeconds }} + periodSeconds: {{ .periodSeconds }} + timeoutSeconds: {{ .timeoutSeconds }} + successThreshold: {{ .successThreshold }} + failureThreshold: {{ .failureThreshold }} +{{- end }} +{{- end }} +{{- with .Values.readinessProbe }} +{{- if .enabled }} +readinessProbe: + httpGet: + path: /status.php + port: {{ $.Values.nextcloud.containerPort }} + httpHeaders: + - name: Host + value: {{ $.Values.nextcloud.host | quote }} + initialDelaySeconds: {{ .initialDelaySeconds }} + periodSeconds: {{ .periodSeconds }} + timeoutSeconds: {{ .timeoutSeconds }} + successThreshold: {{ .successThreshold }} + failureThreshold: {{ .failureThreshold }} +{{- end }} +{{- end }} +{{- with .Values.startupProbe }} +{{- if .enabled }} +startupProbe: + httpGet: + path: /status.php + port: {{ $.Values.nextcloud.containerPort }} + httpHeaders: + - name: Host + value: {{ $.Values.nextcloud.host | quote }} + initialDelaySeconds: {{ .initialDelaySeconds }} + periodSeconds: {{ .periodSeconds }} + timeoutSeconds: {{ .timeoutSeconds }} + successThreshold: {{ .successThreshold }} + failureThreshold: {{ .failureThreshold }} + {{- end }} + {{- end }} +{{- end -}} diff --git a/charts/nextcloud/templates/nextcloud-deployment.yaml b/charts/nextcloud/templates/nextcloud-deployment.yaml index 89e3b9c..2d1668d 100644 --- a/charts/nextcloud/templates/nextcloud-deployment.yaml +++ b/charts/nextcloud/templates/nextcloud-deployment.yaml @@ -74,54 +74,7 @@ spec: - name: http containerPort: {{ .Values.nextcloud.containerPort }} protocol: TCP - {{- with .Values.livenessProbe }} - {{- if .enabled }} - livenessProbe: - httpGet: - path: /status.php - port: {{ $.Values.nextcloud.containerPort }} - httpHeaders: - - name: Host - value: {{ $.Values.nextcloud.host | quote }} - initialDelaySeconds: {{ .initialDelaySeconds }} - periodSeconds: {{ .periodSeconds }} - timeoutSeconds: {{ .timeoutSeconds }} - successThreshold: {{ .successThreshold }} - failureThreshold: {{ .failureThreshold }} - {{- end }} - {{- end }} - {{- with .Values.readinessProbe }} - {{- if .enabled }} - readinessProbe: - httpGet: - path: /status.php - port: {{ $.Values.nextcloud.containerPort }} - httpHeaders: - - name: Host - value: {{ $.Values.nextcloud.host | quote }} - initialDelaySeconds: {{ .initialDelaySeconds }} - periodSeconds: {{ .periodSeconds }} - timeoutSeconds: {{ .timeoutSeconds }} - successThreshold: {{ .successThreshold }} - failureThreshold: {{ .failureThreshold }} - {{- end }} - {{- end }} - {{- with .Values.startupProbe }} - {{- if .enabled }} - startupProbe: - httpGet: - path: /status.php - port: {{ $.Values.nextcloud.containerPort }} - httpHeaders: - - name: Host - value: {{ $.Values.nextcloud.host | quote }} - initialDelaySeconds: {{ .initialDelaySeconds }} - periodSeconds: {{ .periodSeconds }} - timeoutSeconds: {{ .timeoutSeconds }} - successThreshold: {{ .successThreshold }} - failureThreshold: {{ .failureThreshold }} - {{- end }} - {{- end }} + {{- include "nextcloud.probes" . | trim | nindent 10 }} {{- end }}{{/* end-if not nginx.enabled */}} resources: {{- toYaml .Values.resources | nindent 12 }} @@ -131,6 +84,27 @@ spec: {{- end }} volumeMounts: {{- include "nextcloud.volumeMounts" . | trim | nindent 12 }} + {{- if .Values.nginx.enabled }} + - name: {{ .Chart.Name }}-nginx + image: "{{ .Values.nginx.image.repository }}:{{ .Values.nginx.image.tag }}" + imagePullPolicy: {{ .Values.nginx.image.pullPolicy }} + ports: + - name: http + protocol: TCP + containerPort: {{ .Values.nextcloud.containerPort }} + {{- include "nextcloud.probes" . | trim | nindent 10 }} + resources: + {{- toYaml .Values.nginx.resources | nindent 12 }} + {{- with .Values.nginx.securityContext }} + securityContext: + {{- toYaml . | nindent 12 }} + {{- end }} + volumeMounts: + {{- include "nextcloud.volumeMounts" . | trim | nindent 12 }} + {{- with .Values.nextcloud.extraVolumeMounts }} + {{- toYaml . | nindent 12 }} + {{- end }} + {{- end }}{{/* end-if nginx.enabled */}} {{- if .Values.cronjob.enabled }} - name: {{ .Chart.Name }}-cron image: {{ include "nextcloud.image" . }} @@ -174,7 +148,7 @@ spec: {{- with .Values.nextcloud.extraInitContainers }} {{- toYaml . | nindent 8 }} {{- end }} - - name: fmp-volume-permission + - name: fpm-volume-permission image: busybox imagePullPolicy: IfNotPresent command: [ 'chown','-R', '33:33', {{ .Values.persistence.nextcloudData.mountPath | squote }}, {{ .Values.persistence.nextcloudCustomApps.mountPath | squote }} ] @@ -276,6 +250,11 @@ spec: {{/* data <<< */}} + {{- if .Values.nginx.enabled }} + - name: nextcloud-nginx-config + configMap: + name: {{ template "nextcloud.fullname" . }}-nginxconfig + {{- end }} {{- with .Values.nextcloud.extraVolumes }} {{- toYaml . | nindent 8 }} {{- end }} diff --git a/charts/nextcloud/templates/nginx-config.yaml b/charts/nextcloud/templates/nginx-config.yaml new file mode 100644 index 0000000..df5b64c --- /dev/null +++ b/charts/nextcloud/templates/nginx-config.yaml @@ -0,0 +1,155 @@ +{{- define "default.conf" }} + upstream php-handler { + server 127.0.0.1:9000; + } + + server { + listen {{ .Values.nginx.containerPort | default "80" }}; + + # HSTS settings + # WARNING: Only add the preload option once you read about + # the consequences in https://hstspreload.org/. This option + # will add the domain to a hardcoded list that is shipped + # in all major browsers and getting removed from this list + # could take several months. + #add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;" always; + + # set max upload size + client_max_body_size 10G; + fastcgi_buffers 64 4K; + + # Enable gzip but do not remove ETag headers + gzip on; + gzip_vary on; + gzip_comp_level 4; + gzip_min_length 256; + gzip_proxied expired no-cache no-store private no_last_modified no_etag auth; + gzip_types application/atom+xml application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy; + + # Pagespeed is not supported by Nextcloud, so if your server is built + # with the `ngx_pagespeed` module, uncomment this line to disable it. + #pagespeed off; + + # HTTP response headers borrowed from Nextcloud `.htaccess` + add_header Referrer-Policy "no-referrer" always; + add_header X-Content-Type-Options "nosniff" always; + add_header X-Download-Options "noopen" always; + add_header X-Frame-Options "SAMEORIGIN" always; + add_header X-Permitted-Cross-Domain-Policies "none" always; + add_header X-Robots-Tag "noindex, nofollow" always; + add_header X-XSS-Protection "1; mode=block" always; + + # Remove X-Powered-By, which is an information leak + fastcgi_hide_header X-Powered-By; + + # Path to the root of your installation + root /var/www/html; + + # Specify how to handle directories -- specifying `/index.php$request_uri` + # here as the fallback means that Nginx always exhibits the desired behaviour + # when a client requests a path that corresponds to a directory that exists + # on the server. In particular, if that directory contains an index.php file, + # that file is correctly served; if it doesn't, then the request is passed to + # the front-end controller. This consistent behaviour means that we don't need + # to specify custom rules for certain paths (e.g. images and other assets, + # `/updater`, `/ocm-provider`, `/ocs-provider`), and thus + # `try_files $uri $uri/ /index.php$request_uri` + # always provides the desired behaviour. + index index.php index.html /index.php$request_uri; + + # Rule borrowed from `.htaccess` to handle Microsoft DAV clients + location = / { + if ( $http_user_agent ~ ^DavClnt ) { + return 302 /remote.php/webdav/$is_args$args; + } + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Make a regex exception for `/.well-known` so that clients can still + # access it despite the existence of the regex rule + # `location ~ /(\.|autotest|...)` which would otherwise handle requests + # for `/.well-known`. + location ^~ /.well-known { + # The following 6 rules are borrowed from `.htaccess` + + location = /.well-known/carddav { return 301 /remote.php/dav/; } + location = /.well-known/caldav { return 301 /remote.php/dav/; } + # Anything else is dynamically handled by Nextcloud + location ^~ /.well-known { return 301 /index.php$uri; } + + try_files $uri $uri/ =404; + } + + # Rules borrowed from `.htaccess` to hide certain paths from clients + location ~ ^/(?:build|tests|config|lib|3rdparty|templates|data)(?:$|/) { return 404; } + location ~ ^/(?:\.|autotest|occ|issue|indie|db_|console) { return 404; } + + # Ensure this block, which passes PHP files to the PHP process, is above the blocks + # which handle static assets (as seen below). If this block is not declared first, + # then Nginx will encounter an infinite rewriting loop when it prepends `/index.php` + # to the URI, resulting in a HTTP 500 error response. + location ~ \.php(?:$|/) { + # Required for legacy support + rewrite ^/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|oc[ms]-provider\/.+|.+\/richdocumentscode\/proxy) /index.php$request_uri; + + fastcgi_split_path_info ^(.+?\.php)(/.*)$; + set $path_info $fastcgi_path_info; + + try_files $fastcgi_script_name =404; + + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $path_info; + #fastcgi_param HTTPS on; + + fastcgi_param modHeadersAvailable true; # Avoid sending the security headers twice + fastcgi_param front_controller_active true; # Enable pretty urls + fastcgi_pass php-handler; + + fastcgi_intercept_errors on; + fastcgi_request_buffering off; + } + + location ~ \.(?:css|js|svg|gif)$ { + try_files $uri /index.php$request_uri; + expires 6M; # Cache-Control policy borrowed from `.htaccess` + access_log off; # Optional: Don't log access to assets + } + + location ~ \.woff2?$ { + try_files $uri /index.php$request_uri; + expires 7d; # Cache-Control policy borrowed from `.htaccess` + access_log off; # Optional: Don't log access to assets + } + + location / { + try_files $uri $uri/ /index.php$request_uri; + } + } +{{- end }} + +{{- if .Values.nginx.enabled -}} +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ template "nextcloud.fullname" . }}-nginxconfig + labels: + app.kubernetes.io/name: {{ include "nextcloud.name" . }} + helm.sh/chart: {{ include "nextcloud.chart" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} +data: +{{- if .Values.nginx.config.default }} + default.conf: |- + {{- template "default.conf" $ }} +{{- end }} +{{- if .Values.nginx.config.custom }} + zz-custom.conf: |- +{{ .Values.nginx.config.custom | indent 4 }} +{{- end }} +{{- end }}