Skip to content
Snippets Groups Projects

ISSUE-1481: Remove deprecated secret vhosts-config

Merged Juan Paulo Breinlinger requested to merge ISSUE-1481-1 into master
Files
2
@@ -83,8 +83,6 @@ spec:
mountPath: /var/www/html/pages-user-instructions
- name: httpd-pid
mountPath: /var/httpd
- name: vhost-config
mountPath: /etc/httpd/conf.d/vhost
{{- range until $count }}
- name: {{ $.Values.virtualHosts.secret.prefix }}-{{.}}
mountPath: /etc/httpd/conf.d/vhost.{{.}}.d
@@ -101,7 +99,7 @@ spec:
# reload configuration if a change in configuration directories has been detected
# /vhost.COUNT.d is where the vhosts-secret is mounted
# /etc/httpd/ssl is for renewal of the wildcard certificate for *.pages(-dev).cern.ch
inotifywait -m -r -e create -e modify -e delete --format '%w%f' /vhosts-config /etc/httpd/ssl |
inotifywait -m -r -e create -e modify -e delete --format '%w%f' /vhost.*.d /etc/httpd/ssl |
while read dir action file;
do
httpd_pid=`cat /var/httpd/httpd.pid`
@@ -114,8 +112,6 @@ spec:
requests:
memory: 50Mi
volumeMounts:
- name: vhost-config
mountPath: /vhosts-config
{{- range until $count }}
- name: {{ $.Values.virtualHosts.secret.prefix }}-{{.}}
mountPath: /vhost.{{.}}.d
@@ -131,9 +127,6 @@ spec:
name: httpd-config
- name: httpd-pid
emptyDir: {}
- name: vhost-config
secret:
secretName: vhosts-config
{{- range until $count }}
- name: {{ $.Values.virtualHosts.secret.prefix }}-{{.}}
secret:
Loading