Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
open-source
MetaGer
Commits
bee09293
Commit
bee09293
authored
Oct 03, 2021
by
Dominik Hebeler
Browse files
switched to custom certificate
parent
2906db0d
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
bee09293
...
...
@@ -92,7 +92,6 @@ stop_review:
-
auto-deploy delete rollout
-
auto-deploy persist_environment_url
variables
:
ADDITIONAL_HOSTS
:
"
www.metager3.de,test.metager.de"
HELM_UPGRADE_VALUES_FILE
:
.gitlab/development-values.yaml
ROLLOUT_RESOURCE_TYPE
:
deployment
environment
:
...
...
@@ -120,7 +119,7 @@ development:
production
:
variables
:
ADDITIONAL_HOSTS
:
"
www.metager.de,metager.org,www.metager.org,metager.es,www.metager.es,klassik.
metager.org"
ADDITIONAL_HOSTS
:
"
metager.org
,metager.es
"
HELM_UPGRADE_VALUES_FILE
:
.gitlab/production-values.yaml
ROLLOUT_RESOURCE_TYPE
:
deployment
environment
:
...
...
.gitlab/development-values.yaml
View file @
bee09293
...
...
@@ -50,8 +50,11 @@ podAnnotations:
prometheus.io/port
:
"
80"
deploymentApiVersion
:
apps/v1
ingress
:
tls
:
enabled
:
true
acme
:
false
secretName
:
"
metager-tls"
annotations
:
cert-manager.io/cluster-issuer
:
letsencrypt-prod
nginx.ingress.kubernetes.io/client-body-buffer-size
:
"
30m"
nginx.ingress.kubernetes.io/proxy-body-size
:
"
30m"
nginx.ingress.kubernetes.io/configuration-snippet
:
|
...
...
@@ -64,6 +67,3 @@ ingress:
if ($arg_out = "results-with-style") {
more_set_headers "X-Frame-Options: allow-from https://scripts.zdv.uni-mainz.de/";
}
if ($host = "www.metager3.de") {
return 301 https://metager3.de$request_uri;
}
.gitlab/production-values.yaml
View file @
bee09293
...
...
@@ -52,23 +52,9 @@ resources:
ingress
:
tls
:
enabled
:
true
custom
:
tls
:
-
hosts
:
-
metager.de
-
www.metager.de
secretName
:
metager-de-tls
-
hosts
:
-
metager.org
-
www.metager.org
-
klassik.metager.org
secretName
:
metager-org-tls
-
hosts
:
-
metager.es
-
www.metager.es
secretName
:
production-auto-deploy-tls
acme
:
false
secretName
:
"
metager-tls"
annotations
:
cert-manager.io/cluster-issuer
:
letsencrypt-prod
nginx.ingress.kubernetes.io/client-body-buffer-size
:
"
30m"
nginx.ingress.kubernetes.io/proxy-body-size
:
"
30m"
nginx.ingress.kubernetes.io/configuration-snippet
:
|
...
...
@@ -80,16 +66,4 @@ ingress:
more_set_headers "Permissions-Policy: interest-cohort=()";
if ($arg_out = "results-with-style") {
more_set_headers "X-Frame-Options: allow-from https://scripts.zdv.uni-mainz.de/";
}
if ($host = "www.metager.de") {
return 301 https://metager.de$request_uri;
}
if ($host = "www.metager.org") {
return 301 https://metager.org$request_uri;
}
if ($host = "www.metager.es") {
return 301 https://metager.es$request_uri;
}
if ($host = "klassik.metager.org") {
return 301 https://metager.de$request_uri;
}
}
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment