mirror of
https://github.com/opencloud-eu/opencloud-compose.git
synced 2026-06-08 20:20:04 +08:00
Compare commits
11 Commits
pin_postgr
...
add-update
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6be2c824ea | ||
|
|
3d82f1b60b | ||
|
|
c55b36b559 | ||
|
|
ce65001eba | ||
|
|
b88b80539b | ||
|
|
6502f1fee7 | ||
|
|
ef64eb6b92 | ||
|
|
07183c14fc | ||
|
|
409d775471 | ||
|
|
ad89914a81 | ||
|
|
5c26c75080 |
@@ -56,10 +56,10 @@ TRAEFIK_SERVICES_TLS_CONFIG="tls.certresolver=letsencrypt"
|
|||||||
# certificates:
|
# certificates:
|
||||||
# - certFile: /certs/opencloud.test.crt
|
# - certFile: /certs/opencloud.test.crt
|
||||||
# keyFile: /certs/opencloud.test.key
|
# keyFile: /certs/opencloud.test.key
|
||||||
# stores:
|
# stores:
|
||||||
# - default
|
# - default
|
||||||
#
|
#
|
||||||
# The certificates need to copied into ./certs/, the absolute path inside the container is /certs/.
|
# The certificates need to be copied into ./certs/, the absolute path inside the container is /certs/.
|
||||||
# You can also use TRAEFIK_CERTS_DIR=/path/on/host to set the path to the certificates directory.
|
# You can also use TRAEFIK_CERTS_DIR=/path/on/host to set the path to the certificates directory.
|
||||||
# Enable the access log for Traefik by setting the following variable to true.
|
# Enable the access log for Traefik by setting the following variable to true.
|
||||||
TRAEFIK_ACCESS_LOG=
|
TRAEFIK_ACCESS_LOG=
|
||||||
|
|||||||
@@ -2336,7 +2336,7 @@
|
|||||||
"always"
|
"always"
|
||||||
],
|
],
|
||||||
"usePasswordModifyExtendedOp": [
|
"usePasswordModifyExtendedOp": [
|
||||||
"false"
|
"true"
|
||||||
],
|
],
|
||||||
"trustEmail": [
|
"trustEmail": [
|
||||||
"false"
|
"false"
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ directives:
|
|||||||
- 'wss://${COMPANION_DOMAIN|companion.opencloud.test}/'
|
- 'wss://${COMPANION_DOMAIN|companion.opencloud.test}/'
|
||||||
- 'https://raw.githubusercontent.com/opencloud-eu/awesome-apps/'
|
- 'https://raw.githubusercontent.com/opencloud-eu/awesome-apps/'
|
||||||
- 'https://${IDP_DOMAIN|keycloak.opencloud.test}/'
|
- 'https://${IDP_DOMAIN|keycloak.opencloud.test}/'
|
||||||
|
- 'https://update.opencloud.eu/'
|
||||||
default-src:
|
default-src:
|
||||||
- '''none'''
|
- '''none'''
|
||||||
font-src:
|
font-src:
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ services:
|
|||||||
# The openCloud users need to be able to edit their account in the externa IdP
|
# The openCloud users need to be able to edit their account in the externa IdP
|
||||||
WEB_OPTION_ACCOUNT_EDIT_LINK_HREF: ${IDP_ACCOUNT_URL}
|
WEB_OPTION_ACCOUNT_EDIT_LINK_HREF: ${IDP_ACCOUNT_URL}
|
||||||
ldap-server:
|
ldap-server:
|
||||||
image: bitnami/openldap:2.6
|
image: bitnamilegacy/openldap:2.6
|
||||||
networks:
|
networks:
|
||||||
opencloud-net:
|
opencloud-net:
|
||||||
entrypoint: [ "/bin/sh", "/opt/bitnami/scripts/openldap/docker-entrypoint-override.sh", "/opt/bitnami/scripts/openldap/run.sh" ]
|
entrypoint: [ "/bin/sh", "/opt/bitnami/scripts/openldap/docker-entrypoint-override.sh", "/opt/bitnami/scripts/openldap/run.sh" ]
|
||||||
@@ -57,9 +57,6 @@ services:
|
|||||||
LDAP_TLS_KEY_FILE: /opt/bitnami/openldap/share/openldap.key
|
LDAP_TLS_KEY_FILE: /opt/bitnami/openldap/share/openldap.key
|
||||||
LDAP_ROOT: "dc=opencloud,dc=eu"
|
LDAP_ROOT: "dc=opencloud,dc=eu"
|
||||||
LDAP_ADMIN_PASSWORD: ${LDAP_BIND_PASSWORD:-admin}
|
LDAP_ADMIN_PASSWORD: ${LDAP_BIND_PASSWORD:-admin}
|
||||||
ports:
|
|
||||||
- "127.0.0.1:389:1389"
|
|
||||||
- "127.0.0.1:636:1636"
|
|
||||||
volumes:
|
volumes:
|
||||||
# Only use the base ldif file to create the base structure
|
# Only use the base ldif file to create the base structure
|
||||||
- ./config/ldap/ldif/10_base.ldif:/ldifs/10_base.ldif
|
- ./config/ldap/ldif/10_base.ldif:/ldifs/10_base.ldif
|
||||||
|
|||||||
@@ -51,9 +51,6 @@ services:
|
|||||||
LDAP_TLS_KEY_FILE: /opt/bitnami/openldap/share/openldap.key
|
LDAP_TLS_KEY_FILE: /opt/bitnami/openldap/share/openldap.key
|
||||||
LDAP_ROOT: "dc=opencloud,dc=eu"
|
LDAP_ROOT: "dc=opencloud,dc=eu"
|
||||||
LDAP_ADMIN_PASSWORD: ${LDAP_BIND_PASSWORD:-admin}
|
LDAP_ADMIN_PASSWORD: ${LDAP_BIND_PASSWORD:-admin}
|
||||||
ports:
|
|
||||||
- "127.0.0.1:389:1389"
|
|
||||||
- "127.0.0.1:636:1636"
|
|
||||||
volumes:
|
volumes:
|
||||||
- ./config/ldap/ldif/10_base.ldif:/ldifs/10_base.ldif
|
- ./config/ldap/ldif/10_base.ldif:/ldifs/10_base.ldif
|
||||||
- ./config/ldap/ldif/20_admin.ldif:/ldifs/20_admin.ldif
|
- ./config/ldap/ldif/20_admin.ldif:/ldifs/20_admin.ldif
|
||||||
|
|||||||
Reference in New Issue
Block a user