Commit cdf5a843 authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch 'development' of gitlab.metager.de:open-source/MetaGer into development

parents 59d12af8 7343a8b9
......@@ -11,11 +11,8 @@ podDisruptionBudget:
enabled: true
minAvailable: 1
maxUnavailable:
podAnnotations:
prometheus.io/scrape: "true"
prometheus.io/path: /metrics
prometheus.io/port: "80"
deploymentApiVersion: apps/v1
prometheus:
metrics: true
livenessProbe:
initialDelaySeconds: 0
readinessProbe:
......
......@@ -29,10 +29,13 @@ class AppServiceProvider extends ServiceProvider
}
if (stripos($host, "metager.org") !== false) {
\App::setLocale('en');
LaravelLocalization::setLocale('en');
}else if (stripos($host, "metager.es") !== false) {
\App::setLocale('es');
LaravelLocalization::setLocale('es');
}else{
\App::setLocale('de');
LaravelLocalization::setLocale();
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment