diff --git a/el9/templates/deployment.yaml b/el9/templates/deployment.yaml index 1235ea56a41d7f357c025c21475e967173fe8916..63cb7a16b285f797ccbeebaadb5637950e2c096d 100644 --- a/el9/templates/deployment.yaml +++ b/el9/templates/deployment.yaml @@ -62,7 +62,7 @@ spec: checksum/php-config: {{ include (print $.Template.BasePath "/php-configmap.yaml") . | sha256sum }} checksum/php-fpm-config: {{ include (print $.Template.BasePath "/php-fpm-configmap.yaml") . | sha256sum }} checksum/php-fpm-config: {{ include (print $.Template.BasePath "/php-fpm-pool-configmap.yaml") . | sha256sum }} - checksum/mailrc-config: {{ include (print $.Template.BasePath "/mailrc-configmap.yaml") . | sha256sum }} + checksum/mail-config: {{ include (print $.Template.BasePath "/mail-configmap.yaml") . | sha256sum }} spec: {{- if .Values.nodeSelector }} nodeSelector: {{- .Values.nodeSelector | toYaml | nindent 8 }} @@ -151,9 +151,10 @@ spec: # mount only `httpd.conf`, to avoid hiding other files installed by the image # inside `/etc/httpd/conf/` subPath: httpd.conf - - name: mailrc-config - mountPath: /etc/mail.rc - subPath: mail.rc + - name: mail-config + mountPath: /etc/s-nail.rc + subPath: s-nail.rc + readOnly: true # emptyDir for OIDC cache - name: oidc-cache mountPath: /var/cache/httpd/mod_auth_openidc/cache @@ -191,9 +192,10 @@ spec: - name: php-fpm-pool-config mountPath: /etc/php-fpm.d/www.conf subPath: www.conf - - name: mailrc-config - mountPath: /etc/mail.rc - subPath: mail.rc + - name: mail-config + mountPath: /etc/s-nail.rc + subPath: s-nail.rc + readOnly: true # emptyDir for php-fpm socket - name: php-fpm-socket mountPath: /var/run/php-fpm @@ -326,9 +328,9 @@ spec: - name: php-fpm-pool-config configMap: name: php-fpm-pool-config-{{ .Release.Name}} - - name: mailrc-config + - name: mail-config configMap: - name: mailrc-config-{{ .Release.Name}} + name: mail-config-{{ .Release.Name}} # We put OIDC cache in an emptyDir rather than in the container's filesystem in order to make it persistent # between the restarts of the httpd container (in the same pod), e.g. if httpd runs OOM or crashes or node reboots unexpectedly. - name: oidc-cache diff --git a/el9/templates/mailrc-configmap.yaml b/el9/templates/mail-configmap.yaml similarity index 97% rename from el9/templates/mailrc-configmap.yaml rename to el9/templates/mail-configmap.yaml index a17d61c96dcc58e7fd3585db3ca1265136d2942e..6c614bc7ab4b23da2288c6aa1b7a7b074f3a9a25 100644 --- a/el9/templates/mailrc-configmap.yaml +++ b/el9/templates/mail-configmap.yaml @@ -1,12 +1,12 @@ kind: ConfigMap apiVersion: v1 metadata: - name: mailrc-config-{{ .Release.Name }} + name: mail-config-{{ .Release.Name }} data: # configures mailx to send email via SMTP to cernmx.cern.ch # This allows CGI scripts to use the POSIX mailx command to send email. # PHP can also be configured to send email via mailx (see php.ini, sendmail_path). - mail.rc: | + s-nail.rc: | # This is the configuration file for Heirloom mailx (formerly # known under the name "nail". # See mailx(1) for further options.