diff --git a/deploy/df-wiki/templates/configmap-nginx-conf.yaml b/deploy/df-wiki/templates/configmap-nginx-conf.yaml new file mode 100644 index 0000000000000000000000000000000000000000..91f9df70a093f783bc48ac4a01b78548556ea48d --- /dev/null +++ b/deploy/df-wiki/templates/configmap-nginx-conf.yaml @@ -0,0 +1,20 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: nginx-config +data: + default.conf: | + server { + listen 8080; + server_name localhost; + location /wiki { + alias /etc/nginx/html/; + index index.html index.htm; + try_files $uri $uri/ $uri/index.html /index.html =404; + + } + error_page 500 502 503 504 /50x.html; + location = /50x.html { + alias /etc/nginx/html/; + } + } \ No newline at end of file diff --git a/deploy/df-wiki/templates/deployment.yaml b/deploy/df-wiki/templates/deployment.yaml index d6e2fb6e8993d36e271c19b1f731cffe0ac9439f..6ac7bd1976d21d82013e962bbf595021c630a309 100644 --- a/deploy/df-wiki/templates/deployment.yaml +++ b/deploy/df-wiki/templates/deployment.yaml @@ -49,6 +49,13 @@ spec: port: http resources: {{- toYaml .Values.resources | nindent 12 }} + volumeMounts: + - mountPath: /tmp + name: tmp + - name: nginx-config + mountPath: /etc/nginx/conf.d/ + + {{- with .Values.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} @@ -61,3 +68,10 @@ spec: tolerations: {{- toYaml . | nindent 8 }} {{- end }} + volumes: + - emptyDir: {} + name: tmp + - name: nginx-config + configMap: + name: nginx-config + diff --git a/nginx.conf b/nginx.conf index a32514e307f096c36b9a8bd81677e90a2b561cab..daf15e6523f33f4bdbf340815efaae126bf758e3 100644 --- a/nginx.conf +++ b/nginx.conf @@ -2,7 +2,7 @@ server_tokens off; server { listen 8080; server_name localhost; - location /wiki/ { + location /wiki { alias /etc/nginx/html/; index index.html index.htm; try_files $uri $uri/ $uri/index.html /index.html;