Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
W
Wiki
Manage
Activity
Members
Labels
Plan
Issues
53
Issue boards
Milestones
Wiki
Code
Merge requests
6
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
MDM Lab
Wiki
Commits
8910f6fe
Commit
8910f6fe
authored
1 year ago
by
Remi PLANEL
Browse files
Options
Downloads
Patches
Plain Diff
config nginx as configmap
parent
8fae94a8
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#117820
passed with warnings with stages
in 7 minutes and 21 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
deploy/df-wiki/templates/configmap-nginx-conf.yaml
+20
-0
20 additions, 0 deletions
deploy/df-wiki/templates/configmap-nginx-conf.yaml
deploy/df-wiki/templates/deployment.yaml
+14
-0
14 additions, 0 deletions
deploy/df-wiki/templates/deployment.yaml
nginx.conf
+1
-1
1 addition, 1 deletion
nginx.conf
with
35 additions
and
1 deletion
deploy/df-wiki/templates/configmap-nginx-conf.yaml
0 → 100644
+
20
−
0
View file @
8910f6fe
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
This diff is collapsed.
Click to expand it.
deploy/df-wiki/templates/deployment.yaml
+
14
−
0
View file @
8910f6fe
...
@@ -49,6 +49,13 @@ spec:
...
@@ -49,6 +49,13 @@ spec:
port
:
http
port
:
http
resources
:
resources
:
{{
- toYaml .Values.resources | nindent 12
}}
{{
- toYaml .Values.resources | nindent 12
}}
volumeMounts
:
-
mountPath
:
/tmp
name
:
tmp
-
name
:
nginx-config
mountPath
:
/etc/nginx/conf.d/
{{
- with .Values.nodeSelector
}}
{{
- with .Values.nodeSelector
}}
nodeSelector
:
nodeSelector
:
{{
- toYaml . | nindent 8
}}
{{
- toYaml . | nindent 8
}}
...
@@ -61,3 +68,10 @@ spec:
...
@@ -61,3 +68,10 @@ spec:
tolerations
:
tolerations
:
{{
- toYaml . | nindent 8
}}
{{
- toYaml . | nindent 8
}}
{{
- end
}}
{{
- end
}}
volumes
:
-
emptyDir
:
{}
name
:
tmp
-
name
:
nginx-config
configMap
:
name
:
nginx-config
This diff is collapsed.
Click to expand it.
nginx.conf
+
1
−
1
View file @
8910f6fe
...
@@ -2,7 +2,7 @@ server_tokens off;
...
@@ -2,7 +2,7 @@ server_tokens off;
server
{
server
{
listen
8080
;
listen
8080
;
server_name
localhost
;
server_name
localhost
;
location
/wiki
/
{
location
/wiki
{
alias
/etc/nginx/html/
;
alias
/etc/nginx/html/
;
index
index.html
index.htm
;
index
index.html
index.htm
;
try_files
$uri
$uri
/
$uri
/index.html
/index.html
;
try_files
$uri
$uri
/
$uri
/index.html
/index.html
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment