trustchain-oc1-orchestral
/
authentik
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'version-2021.5' into next 

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

# Conflicts:
#	web/src/locales/en.po
#	web/src/locales/pseudo-LOCALE.po
This commit is contained in:
Jens Langhammer 2021-05-22 20:01:16 +02:00
parent 50308510b4 9d476a42d1
commit 9b57f0b81d
5 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
authentik/providers/proxy/controllers/k8s/ingress.py
View File

@ -84,7 +84,6 @@ class IngressReconciler(KubernetesObjectReconciler[NetworkingV1beta1Ingress]):
"traefik.ingress.kubernetes.io/affinity": "true",
"nginx.ingress.kubernetes.io/proxy-buffers-number": "4",
"nginx.ingress.kubernetes.io/proxy-buffer-size": "16k",
"nginx.ingress.kubernetes.io/backend-protocol": "HTTPS",
}
annotations.update(
self.controller.outpost.config.kubernetes_ingress_annotations
@ -114,7 +113,7 @@ class IngressReconciler(KubernetesObjectReconciler[NetworkingV1beta1Ingress]):
NetworkingV1beta1HTTPIngressPath(
backend=NetworkingV1beta1IngressBackend(
service_name=self.name,
service_port="https",
service_port="http",
),
path="/akprox",
)
@ -129,7 +128,7 @@ class IngressReconciler(KubernetesObjectReconciler[NetworkingV1beta1Ingress]):
NetworkingV1beta1HTTPIngressPath(
backend=NetworkingV1beta1IngressBackend(
service_name=self.name,
service_port="https",
service_port="http",
),
path="/",
)

2
internal/web/web_proxy.go
View File

@ -18,8 +18,6 @@ func (ws *WebServer) configureProxy() {
}
if req.TLS != nil {
req.Header.Set("X-Forwarded-Proto", "https")
} else {
req.Header.Set("X-Forwarded-Proto", "http")
}
}
rp := &httputil.ReverseProxy{Director: director}

4
web/src/locales/en.po
View File

@ -3476,8 +3476,8 @@ msgid "The URL \"{0}\" was not found."
msgstr "The URL \"{0}\" was not found."
#: src/pages/providers/proxy/ProxyProviderForm.ts
msgid "The external URL you'll access the application at"
msgstr "The external URL you'll access the application at"
msgid "The external URL you'll access the application at. Include any non-standard port."
msgstr "The external URL you'll access the application at. Include any non-standard port."
#: src/pages/policies/dummy/DummyPolicyForm.ts
msgid "The policy takes a random time to execute. This controls the minimum time it will take."

2
web/src/locales/pseudo-LOCALE.po
View File

@ -3468,7 +3468,7 @@ msgid "The URL \"{0}\" was not found."
msgstr ""
#:
msgid "The external URL you'll access the application at"
msgid "The external URL you'll access the application at. Include any non-standard port."
msgstr ""
#:

2
web/src/pages/providers/proxy/ProxyProviderForm.ts
View File

@ -125,7 +125,7 @@ export class ProxyProviderFormPage extends ModelForm<ProxyProvider, number> {
?required=${true}
name="externalHost">
<input type="text" value="${ifDefined(this.instance?.externalHost)}" class="pf-c-form-control" required>
<p class="pf-c-form__helper-text">${t`The external URL you'll access the application at`}</p>
<p class="pf-c-form__helper-text">${t`The external URL you'll access the application at. Include any non-standard port.`}</p>
</ak-form-element-horizontal>
<ak-form-element-horizontal name="forwardAuthMode">
<div class="pf-c-check">