diff --git a/ldap-user-manager/README.md b/ldap-user-manager/README.md index 4aa7f71..a46d9a2 100644 --- a/ldap-user-manager/README.md +++ b/ldap-user-manager/README.md @@ -8,3 +8,7 @@ For lUM, an initial config step is required: https://lum.dev.box/setup/ + +https://lum.dev.box/setup/run_checks.php + + diff --git a/ldap-user-manager/docker-compose.traefik.yml b/ldap-user-manager/TMP_DISABLED_docker-compose.traefik.yml similarity index 97% rename from ldap-user-manager/docker-compose.traefik.yml rename to ldap-user-manager/TMP_DISABLED_docker-compose.traefik.yml index 4b29531..e40d6a2 100644 --- a/ldap-user-manager/docker-compose.traefik.yml +++ b/ldap-user-manager/TMP_DISABLED_docker-compose.traefik.yml @@ -5,7 +5,7 @@ networks: services: - manager: + lum: labels: traefik.enable: "true" diff --git a/ldap-user-manager/docker-compose.debug.yml b/ldap-user-manager/docker-compose.debug.yml index e78ffeb..c2de782 100644 --- a/ldap-user-manager/docker-compose.debug.yml +++ b/ldap-user-manager/docker-compose.debug.yml @@ -1,9 +1,9 @@ services: - manager: + lum: environment: - LDAP_DEBUG=true - LDAP_VERBOSE_CONNECTION_LOGS=true - SESSION_DEBUG=true - - SMTP_LOG_LEVEL=4 \ No newline at end of file + - SMTP_LOG_LEVEL=4 diff --git a/ldap-user-manager/docker-compose.yml b/ldap-user-manager/docker-compose.yml index 92d0712..03af64a 100644 --- a/ldap-user-manager/docker-compose.yml +++ b/ldap-user-manager/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3.9" +version: "3.7" networks: ldap: @@ -7,7 +7,7 @@ networks: services: - manager: + lum: image: wheelybird/ldap-user-manager:latest #restart: always diff --git a/minio/docker-compose.traefik.yml b/minio/docker-compose.traefik.yml index 4f88e9f..9c2368d 100644 --- a/minio/docker-compose.traefik.yml +++ b/minio/docker-compose.traefik.yml @@ -2,7 +2,7 @@ networks: front: external: true - name: ${APP_PROXY_NETWORK} + name: ${APP_PROXY_NETWORK:-traefik} services: minio: diff --git a/minio/docker-compose.yml b/minio/docker-compose.yml index edc5611..a6beb50 100644 --- a/minio/docker-compose.yml +++ b/minio/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.9" networks: default: - name: ${APP_MINIO_NETWORK} + name: ${APP_S3_NETWORK:-s3} services: @@ -19,3 +19,4 @@ services: - MINIO_DOMAIN=minio.$APP_TOP_DOMAIN - MINIO_SERVER_URL=https://minio.$APP_TOP_DOMAIN - MINIO_BROWSER_REDIRECT_URL=https://minio-console.$APP_TOP_DOMAIN + diff --git a/openldap/README.md b/openldap/README.md index 4aa7f71..b1fc28e 100644 --- a/openldap/README.md +++ b/openldap/README.md @@ -8,3 +8,9 @@ For lUM, an initial config step is required: https://lum.dev.box/setup/ + +If you want to connect with JXplorer: +IP: your epxosed IP .... +BASE_DN: dc=my,dc=domain +User DN: cn=admin,dc=dev,dc=box +User password: LDAPADMINPASS diff --git a/traefik/docker-compose.dns.yml b/traefik/docker-compose.ep_dns.yml similarity index 100% rename from traefik/docker-compose.dns.yml rename to traefik/docker-compose.ep_dns.yml diff --git a/traefik/docker-compose.http.yml b/traefik/docker-compose.ep_http.yml similarity index 100% rename from traefik/docker-compose.http.yml rename to traefik/docker-compose.ep_http.yml diff --git a/traefik/docker-compose.https.yml b/traefik/docker-compose.ep_https.yml similarity index 88% rename from traefik/docker-compose.https.yml rename to traefik/docker-compose.ep_https.yml index 33df0b1..356198d 100644 --- a/traefik/docker-compose.https.yml +++ b/traefik/docker-compose.ep_https.yml @@ -4,8 +4,8 @@ services: traefik: ports: - "$APP_PUBLIC_IP:443:443" - labels: - - "traefik.http.routers.dashboard.tls=true" + #labels: + # - "traefik.http.routers.dashboard.tls=true" environment: # Entrypoints diff --git a/traefik/docker-compose.expose-admin.yml b/traefik/docker-compose.expose_admin.yml similarity index 100% rename from traefik/docker-compose.expose-admin.yml rename to traefik/docker-compose.expose_admin.yml diff --git a/traefik/docker-compose.yml b/traefik/docker-compose.yml index d042c02..0a826b7 100644 --- a/traefik/docker-compose.yml +++ b/traefik/docker-compose.yml @@ -1,16 +1,16 @@ --- version: "3.7" -networks: - default: - name: ${APP_NETWORK} +#networks: +# default: +# name: ${APP_NETWORK} services: traefik: image: ${APP_IMAGE:-traefik}:${APP_VERSION:-v2.6.1} restart: always - networks: - default: + #networks: + # default: environment: #command: @@ -46,14 +46,14 @@ services: - ./logs:/logs - /var/run/docker.sock:/var/run/docker.sock - labels: - #### Labels define the behavior and rules of the traefik proxy for this container #### - - "traefik.enable=true" # <== Enable traefik on itself to view dashboard and assign subdomain to view it - - "traefik.http.routers.dashboard.rule=Host(`${APP_DOMAIN}`)" # <== Setting the domain for the dashboard - #- "traefik.http.routers.dashboard.service=api@internal" # <== Enabling the api to be a service to access - - "traefik.http.routers.dashboard.service=dashboard" # <== Enabling the api to be a service to access - - "traefik.http.routers.dashboard.entrypoints=$TRAEFIK_ENTRYPOINTS" - #- "traefik.http.routers.dashboard.tls=true" - - "traefik.http.routers.dashboard.tls.certresolver=$TRAEFIK_CERTRESOLV" - - "traefik.http.services.dashboard.loadbalancer.server.port=8080" +# labels: +# #### Labels define the behavior and rules of the traefik proxy for this container #### +# - "traefik.enable=true" # <== Enable traefik on itself to view dashboard and assign subdomain to view it +# - "traefik.http.routers.dashboard.rule=Host(`${APP_DOMAIN}`)" # <== Setting the domain for the dashboard +# #- "traefik.http.routers.dashboard.service=api@internal" # <== Enabling the api to be a service to access +# - "traefik.http.routers.dashboard.service=dashboard" # <== Enabling the api to be a service to access +# - "traefik.http.routers.dashboard.entrypoints=$TRAEFIK_ENTRYPOINTS" +# #- "traefik.http.routers.dashboard.tls=true" +# - "traefik.http.routers.dashboard.tls.certresolver=$TRAEFIK_CERTRESOLV" +# - "traefik.http.services.dashboard.loadbalancer.server.port=8080"