Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/nginx-website/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ name: nginx-website
maintainers:
- email: jenkins-infra-team@googlegroups.com
name: jenkins-infra-team
version: 0.6.1
version: 0.7.0
5 changes: 3 additions & 2 deletions charts/nginx-website/templates/nginx-configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ data:
{{ .Values.nginx.httpDirectives | indent 4 }}
{{ end }}
server {
listen {{ .Values.service.port }};
server_name {{ .Values.nginx.serverName }};
listen {{ .Values.service.port }};
server_name {{ .Values.nginx.serverName }};
server_tokens off;
{{- if .Values.nginx.overrideLocations }}
{{ .Values.nginx.overrideLocations | indent 6 }}
{{- else }}
Expand Down
5 changes: 4 additions & 1 deletion charts/nginx-website/tests/custom_values_locations_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@ tests:
value: RELEASE-NAME-nginx-website
- matchRegex:
path: data["default.conf"]
pattern: 'listen 8080;'
pattern: 'listen 8080;'
- matchRegex:
path: data["default.conf"]
pattern: 'server_tokens off;'
- matchRegex:
path: data["default.conf"]
pattern: 'location /starwars'
5 changes: 4 additions & 1 deletion charts/nginx-website/tests/custom_values_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,10 @@ tests:
pattern: '# default.conf'
- matchRegex:
path: data["default.conf"]
pattern: 'listen 8080;'
pattern: 'listen 8080;'
- matchRegex:
path: data["default.conf"]
pattern: 'server_tokens off;'
- matchRegex:
path: data["default.conf"]
pattern: 'root /custom;'
Expand Down
7 changes: 5 additions & 2 deletions charts/nginx-website/tests/defaults_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,13 @@ tests:
pattern: '# default.conf'
- matchRegex:
path: data["default.conf"]
pattern: 'listen 80;'
pattern: 'listen 80;'
- matchRegex:
path: data["default.conf"]
pattern: 'server_name localhost;'
pattern: 'server_name localhost;'
- matchRegex:
path: data["default.conf"]
pattern: 'server_tokens off;'
- matchRegex:
path: data["default.conf"]
pattern: 'root /usr/share/nginx/html;'
Expand Down