From 6f8f678288f46d6c82f06c025bdb67ec66a15cab Mon Sep 17 00:00:00 2001 From: Lars Scheibling Date: Sat, 15 Apr 2023 21:18:51 +0000 Subject: [PATCH] Fixed duplicate setting field issue --- .gitlab-ci.yml | 2 +- Chart/Chart.yaml | 2 +- Chart/templates/configmap.yaml | 236 +-------------------------------- Chart/values.yaml | 7 +- 4 files changed, 14 insertions(+), 233 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dc38e81..655fb22 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ variables: - HELM_CHART_VERSION: "0.8.3" + HELM_CHART_VERSION: "0.8.4" stages: - deploy diff --git a/Chart/Chart.yaml b/Chart/Chart.yaml index 034cd4f..0b6d5a9 100644 --- a/Chart/Chart.yaml +++ b/Chart/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: cloudypress description: Helm chart to deploy Wordpress backed by PHP-CLI and Nginx Unit type: application -version: "0.8.3" +version: "0.8.4" appVersion: "6.2.0" diff --git a/Chart/templates/configmap.yaml b/Chart/templates/configmap.yaml index e5109c1..2f0a50c 100644 --- a/Chart/templates/configmap.yaml +++ b/Chart/templates/configmap.yaml @@ -148,14 +148,15 @@ data: {{- end }} {{- if .Values.global.php.adminValues }} {{- range $k, $v := .Values.global.php.adminValues }} - "{{ $k }}": "{{ $v }}", + "{{ $k }}": "{{ $v }}", {{- end }} + {{- else }} + "memory_limit": "512M", + "upload_max_filesize": "512M", + "post_max_size": "512M", + "max_execution_time": "300", + "max_input_time": "300" {{- end }} - "memory_limit": "512M", - "upload_max_filesize": "512M", - "post_max_size": "512M", - "max_execution_time": "300", - "max_input_time": "300" } }, "targets": { @@ -170,226 +171,3 @@ data: } } } - www.conf: |- - [www] - - - {{- if and .Values.global .Values.global.php }} - listen = {{ .Values.global.php.listenAddress | default "127.0.0.1:8123" }} - listen.backlog = {{ .Values.global.php.listenBacklog | default "511" }} - - pm = {{ .Values.global.php.pmMode | default "ondemand" }} - pm.max_children = {{ .Values.global.php.pmMaxChildren | default "100" }} - pm.process_idle_timeout = {{ .Values.global.php.pmProcessIdle | default "30s" }} - pm.max_requests = {{ .Values.global.php.pmMaxRequests | default "1000" }} - security.limit_extensions = {{ .Values.global.php.limitExtensions | default ".php" }} - php_admin_value[expose_php] = {{ .Values.global.php.exposePHP | default "Off" }} - php_admin_value[short_open_tag] = {{ .Values.global.php.shortOpenTag | default "Off" }} - php_admin_value[disable_functions] = {{ .Values.global.php.disableFunctions | default "exec,passthru,shell_exec,system,proc_open,popen,curl_exec,curl_multi_exec,show_source" }} - php_value[log_errors] = {{ .Values.global.php.logErrors | default "On" }} - php_admin_value[date.timezone] = {{ .Values.customer.timezone | default "Europe/Stockholm" }} - - {{- else }} - - listen = 127.0.0.1:8123 - listen.backlog = 511 - - pm = ondemand - pm.max_children = 100 - pm.process_idle_timeout = 30s - pm.max_requests = 1000 - security.limit_extensions = .php - php_admin_value[expose_php] = Off - php_admin_value[short_open_tag] = Off - php_admin_value[disable_functions] = exec,passthru,shell_exec,system,proc_open,popen,curl_exec,curl_multi_exec,show_source - php_value[log_errors] = On - - {{- end }} - - ping.path = /fpm-ping - listen.allowed_clients = 127.0.0.1 - catch_workers_output = yes - php_value[error_log] = /dev/stderr - - - {{- if .Values.global.php.adminValues }} - {{- range $k, $v := .Values.global.php.adminValues }} - php_admin_value[{{ $k }}] = {{ $v }} - {{- end }} - {{- end }} - - - nginx.conf: | - worker_processes auto; - error_log stderr warn; - pid /run/nginx/nginx.pid; - - {{- if and .Values.global .Values.global.nginx }} - {{ .Values.global.nginx.globalAdditions | default "" }} - {{- end }} - - events { - {{- if and .Values.global .Values.global.nginx }} - worker_connections {{ .Values.global.nginx.workerConnections | default "1024" }}; - {{ .Values.global.nginx.eventsAdditions | default "" }} - {{- else }} - worker_connections 1024; - {{- end }} - } - - http { - include mime.types; - default_type application/octet-stream; - - disable_symlinks off; - - log_format main_timed '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for" ' - '$request_time $upstream_response_time $pipe $upstream_cache_status'; - - access_log /dev/stdout main_timed; - error_log /dev/stderr notice; - {{- if and .Values.global .Values.global.nginx }} - keepalive_timeout {{ .Values.global.nginx.keepaliveTimeout | default "61" }}; - {{- else }} - keepalive_timeout 61; - {{- end }} - - client_max_body_size 512m; - client_body_temp_path /tmp/client_temp; - proxy_temp_path /tmp/proxy_temp_path; - fastcgi_temp_path /tmp/fastcgi_temp; - uwsgi_temp_path /tmp/uwsgi_temp; - scgi_temp_path /tmp/scgi_temp; - - server { - listen [::]:8080 default_server; - listen 8080 default_server; - server_name _; - {{- if and .Values.global .Values.global.nginx }} - sendfile {{ .Values.global.nginx.sendfile | default "off" }}; - tcp_nodelay {{ .Values.global.nginx.tcpNodelay | default "on" }}; - absolute_redirect {{ .Values.global.nginx.absoluteRedirects | default "off" }}; - {{- else }} - sendfile off; - tcp_nodelay on; - absolute_redirect off; - {{- end }} - - {{- if and .Values.site .Values.site.webroot }} - root {{ .Values.site.webroot.path | default "/app/web" }}; - index {{ .Values.site.webroot.indexes | default "index.php index.html index.htm" }}; - {{- else }} - root /app/web; - index index.php index.html; - {{- end }} - - - location / { - try_files $uri $uri/ /index.php?q=$uri&$args; - {{- if and .Values.global .Values.global.nginx }} - {{ .Values.global.nginx.rootLocationAdditions | default "" }} - {{- end }} - - } - - location ~* /app/web/app/uploads/.*.php$ { - deny all; - } - - location ~* /wp-content/uploads/.*.php$ { - deny all; - } - - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root /var/lib/nginx/html; - } - - location ~ \.php$ { - {{- if and .Values.global .Values.global.nginx }} - fastcgi_buffer_size {{ .Values.global.nginx.fcgiBufferSize | default "128k" }}; - fastcgi_buffers {{ .Values.global.nginx.fcgiBuffers | default "4 256k" }}; - fastcgi_busy_buffers_size {{ .Values.global.nginx.fcgiBusyBufferSize | default "256k" }}; - fastcgi_read_timeout {{ .Values.global.nginx.fcgiReadTimeout | default "300" }}; - {{- else }} - fastcgi_buffer_size 128k; - fastcgi_buffers 4 256k; - fastcgi_busy_buffers_size 256k; - fastcgi_read_timeout 300; - {{- end }} - - include fastcgi_params; - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass 127.0.0.1:8123; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - {{- if and .Values.global .Values.global.nginx }} - {{ .Values.global.nginx.phpLocationAdditions | default "" }} - {{- end }} - } - - location ~* \.(jpg|jpeg|webp|gif|png|css|svg|js|ico|xml)$ { - expires 5d; - } - - gzip_comp_level 5; - gzip_min_length 256; - gzip_types - application/atom+xml - application/javascript - application/json - application/rss+xml - application/vnd.ms-fontobject - application/x-font-ttf - application/x-font-opentype - application/x-font-truetype - application/x-javascript - application/x-web-app-manifest+json - application/xhtml+xml - application/xml - font/eot - font/opentype - font/otf - image/svg+xml - image/x-icon - image/vnd.microsoft.icon - text/css - text/plain - text/javascript - text/x-component; - - gzip_disable "MSIE [1-6]\.(?!.*SV1)"; - location ~ /\. { - log_not_found off; - deny all; - } - - location ~ ^/(fpm-status|fpm-ping)$ { - access_log off; - allow 127.0.0.1; - deny all; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include fastcgi_params; - fastcgi_pass 127.0.0.1:8123; - } - {{- if and .Values.global .Values.global.nginx }} - {{ .Values.global.nginx.serverAdditions | default "" }} - {{- end }} - - } - - proxy_hide_header X-Powered-By; - fastcgi_hide_header X-Powered-By; - server_tokens off; - - add_header X-Content-Type-Options nosniff; - add_header X-Frame-Options SAMEORIGIN; - add_header X-XSS-Protection "1; mode=block"; - {{- if and .Values.global .Values.global.nginx }} - {{ .Values.global.nginx.httpAdditions }} - {{- end }} - - include /etc/nginx/modules/*.conf; - } diff --git a/Chart/values.yaml b/Chart/values.yaml index 44a3207..f1d40fd 100644 --- a/Chart/values.yaml +++ b/Chart/values.yaml @@ -134,8 +134,11 @@ global: logErrors: "On" adminValues: - upload_max_filesize: "256M" - post_max_size: "256M" + memory_limit: "512M" + upload_max_filesize: "512M" + post_max_size: "512M" + max_execution_time: "300" + max_input_time: "300" nginx: workerConnections: "1024"