resolved merge conflicts
This commit is contained in:
commit
7af9a554b4
1 changed files with 11 additions and 4 deletions
|
|
@ -8,18 +8,25 @@ GLOBALS:
|
||||||
basic_auth_hash: your_super_secret_password
|
basic_auth_hash: your_super_secret_password
|
||||||
authentik:
|
authentik:
|
||||||
env:
|
env:
|
||||||
|
GROUP_HELP: "Hilfe"
|
||||||
EXTRA_DOMAINS: ", `example.com`"
|
EXTRA_DOMAINS: ", `example.com`"
|
||||||
REDIRECTS: "example.com"
|
REDIRECTS: "example.com"
|
||||||
DEFAULT_LANGUAGE: de
|
DEFAULT_LANGUAGE: de
|
||||||
AUTHENTIK_DISABLE_UPDATE_CHECK: true
|
AUTHENTIK_DISABLE_UPDATE_CHECK: true
|
||||||
APPLICATIONS:
|
APPLICATIONS:
|
||||||
#Calendar: https://nextcloud.example.com/apps/calendar/
|
#Calendar:
|
||||||
#BBB: https://nextcloud.example.com/apps/bbb
|
#url: https://nextcloud.example.com/apps/calendar/
|
||||||
Hilfe: https://wiki.local-it.org/s/kollicloud-wiki/
|
#group: ""
|
||||||
|
#BBB:
|
||||||
|
#url: https://nextcloud.example.com/apps/bbb
|
||||||
|
#group: ""
|
||||||
|
KolliCloud-Anleitung:
|
||||||
|
url: https://wiki.local-it.org/s/kollicloud-wiki/
|
||||||
|
group: "$GROUP_HELP"
|
||||||
EXTRA_ICONS:
|
EXTRA_ICONS:
|
||||||
#Calendar: ~/.abra/recipes/authentik/icons/calendar.svg
|
#Calendar: ~/.abra/recipes/authentik/icons/calendar.svg
|
||||||
#BBB: ~/.abra/recipes/authentik/icons/bbb.png
|
#BBB: ~/.abra/recipes/authentik/icons/bbb.png
|
||||||
Hilfe: ~/.abra/recipes/authentik/icons/help.svg
|
KolliCloud-Anleitung: ~/.abra/recipes/authentik/icons/help.svg
|
||||||
uncomment:
|
uncomment:
|
||||||
- compose.css.yml
|
- compose.css.yml
|
||||||
comment:
|
comment:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue