Merge branch 'main' into renovate/wordpress-6.6.2-php8.2-fpm-alpine

Signed-off-by: ffais <[email protected]>
smartcommunitylab · Oct 16, 2024 · f097c9a · f097c9a
2 parents 52a99d4 + 56c98ee
commit f097c9a
Show file tree

Hide file tree

Showing 11 changed files with 130 additions and 236 deletions.
diff --git a/dockerfiles/php-fpm-healtcheck-Dockerfile b/dockerfiles/php-fpm-healtcheck-Dockerfile
diff --git a/dockerfiles/php-fpm-healthcheck b/dockerfiles/php-fpm-healthcheck
diff --git a/dockerfiles/php-fpm-redis-Dockerfile b/dockerfiles/php-fpm-redis-Dockerfile
diff --git a/wordpress/Chart.yaml b/wordpress/Chart.yaml
@@ -10,6 +10,6 @@ dependencies:
     repository: oci://registry-1.docker.io/bitnamicharts
     condition: mariadb.enabled
   - name: redis
-    version: "20.2.0"
+    version: "20.2.1"
     repository: oci://registry-1.docker.io/bitnamicharts
     condition: redis.enabled
diff --git a/wordpress/confs/mariadb-init-script.sh b/wordpress/confs/mariadb-init-script.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 mysql -P 3306 -uroot -p${MARIADB_ROOT_PASSWORD} -e "CREATE DATABASE ${WORDPRESS_DB_NAME}";
 mysql -P 3306 -uroot -p${MARIADB_ROOT_PASSWORD} -e "CREATE USER '${WORDPRESS_DB_USER}'@'%' IDENTIFIED BY '${WORDPRESS_DB_PASSWORD}'";
-mysql -P 3306 -uroot -p${MARIADB_ROOT_PASSWORD} -e "GRANT SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,ALTER ON ${WORDPRESS_DB_NAME}.* TO '${WORDPRESS_DB_USER}'@'%';";
+mysql -P 3306 -uroot -p${MARIADB_ROOT_PASSWORD} -e "GRANT SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,ALTER,CREATE TEMPORARY TABLES,INDEX,LOCK TABLES ON ${WORDPRESS_DB_NAME}.* TO '${WORDPRESS_DB_USER}'@'%';";
diff --git a/wordpress/confs/wordpress/init-script.sh b/wordpress/confs/wordpress/init-script.sh
@@ -29,4 +29,5 @@ echo "Check if wordpress is installed"
 if ! wp core is-installed 2>/dev/null; then
   echo "WP is not installed. Let's try installing it."
   wp core install --url="$wpUrl" --title="$wpTitle" --admin_user="$wpAdminUsername" --admin_email="$wpAdminEmail" --skip-email --admin_password="$wpAdminPassword" --path=/var/www/html/
+  wp rewrite structure '/%postname%'
 fi
diff --git a/wordpress/templates/nginx-configurations-configmap.yaml b/wordpress/templates/nginx-configurations-configmap.yaml
@@ -5,7 +5,7 @@ metadata:
 data:
   wordpress.conf: |
     server { 
-      listen 8080 default_server;
+      listen 8080 default_server http2;
 
       server_name localhost;
 
@@ -16,6 +16,17 @@ data:
       client_max_body_size {{ .Values.nginx.confsOverride.maxBodySize }};
       fastcgi_buffers 64 4K;
 
+      location ~ /\.ht {
+        deny  all;
+        return 403;
+      }
+
+      ## disable all access to the following directories
+      location ~ ^/(config|tmp|core|lang) {
+        deny all;
+        return 404; # replace with 404 to not show these directories exist
+      }
+
       gzip on;
       gzip_vary on;
       gzip_comp_level 4;

diff --git a/wordpress/templates/nginx-deployment.yaml b/wordpress/templates/nginx-deployment.yaml
@@ -41,10 +41,14 @@ spec:
             - name: http
               containerPort: {{ .Values.nginx.service.port }}
               protocol: TCP
+          {{- with .Values.nginx.livenessProbe }}
           livenessProbe:
-            {{- toYaml .Values.nginx.livenessProbe | nindent 12 }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.nginx.readinessProbe }}
           readinessProbe:
-            {{- toYaml .Values.nginx.readinessProbe | nindent 12 }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           resources:
             {{- toYaml .Values.nginx.resources | nindent 12 }}
           {{- if or .Values.persistence.enabled .Values.nginx.volumeMounts }}

diff --git a/wordpress/templates/php-deployment.yaml b/wordpress/templates/php-deployment.yaml
@@ -44,6 +44,8 @@ spec:
               value: {{ print "tcp://127.0.0.1:9000" .Values.php.poolConfigOverride.pmStatusPath | quote }}
             - name: PHP_FPM_WEB_LISTEN_ADDRESS
               value: "0.0.0.0:9253"
+            - name: PHP_FPM_FIX_PROCESS_COUNT
+              value: "true"
           resources:
             {{- toYaml .Values.php.exporter.resources | nindent 12 }}
           ports:
@@ -74,12 +76,18 @@ spec:
             - name: fastcgi
               containerPort: {{ .Values.php.service.port }}
               protocol: TCP
+          {{- with .Values.php.startupProbe }}
           startupProbe:
-            {{- toYaml .Values.php.startupProbe | nindent 12 }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.php.livenessProbe }}
           livenessProbe:
-            {{- toYaml .Values.php.livenessProbe | nindent 12 }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.php.readinessProbe }}
           readinessProbe:
-            {{- toYaml .Values.php.readinessProbe | nindent 12 }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           resources:
             {{- toYaml .Values.php.resources | nindent 12 }}
           {{- if or .Values.persistence.enabled .Values.php.volumeMounts }}

diff --git a/wordpress/templates/wordpress-backup-azure-cronjob.yaml b/wordpress/templates/wordpress-backup-azure-cronjob.yaml
@@ -70,7 +70,7 @@ spec:
                 value: /tmp/plan
             envFrom:
               - secretRef:
-                  name: {{ .Release.Name }}-azure-creds
+                  name: {{ .Values.jobs.backup.azure.existingSecret }}
               - configMapRef:
                   name: {{ .Release.Name }}-wordpress-vars
             resources: