ldap-user-manager/.env

@@ -1,11 +0,0 @@
-APP_IMAGE=traefik
-APP_VERSION=v2.6.1
-
-APP_PUBLIC_IP="127.0.0.1"
-APP_NETWORK=''
-
-APP_DOMAIN=dev
-APP_ADMIN_EMAIL=admin@dev
-
-TRAEFIK_CERTRESOLV=default
-TRAEFIK_CERTRESOLV_PROVIDER=''

ldap-user-manager/README.md

@@ -1,14 +0,0 @@
-# OpenLDAP Server
-
-
-## Self-serve configuration
-
-## LUM configuration
-
-For lUM, an initial config step is required:
-
-https://lum.dev.box/setup/
-
-https://lum.dev.box/setup/run_checks.php
-
-

ldap-user-manager/TMP_DISABLED_docker-compose.traefik.yml

@@ -1,17 +0,0 @@
-networks:
-  proxy:
-    external: true
-    name: ${APP_PROXY_NETWORK}
-
-services:
-
-  lum:
-  
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.lum.entrypoints: front-http,front-https
-      traefik.http.routers.lum.rule: Host(`lum.$APP_TOP_DOMAIN`)
-      traefik.http.routers.lum.service: lum
-      traefik.http.routers.lum.tls: "true"
-      traefik.http.routers.lum.tls.certresolver: $TRAEFIK_CERTRESOLV
-      traefik.http.services.lum.loadbalancer.server.port: '80'

ldap-user-manager/docker-compose.debug.yml

@@ -1,9 +0,0 @@
-
-
-services:
-    lum:
-      environment:
-        - LDAP_DEBUG=true
-        - LDAP_VERBOSE_CONNECTION_LOGS=true
-        - SESSION_DEBUG=true
-        - SMTP_LOG_LEVEL=4

minio/docker-compose.traefik.yml

@@ -2,7 +2,7 @@
 networks:
   front:
     external: true
-    name: ${APP_PROXY_NETWORK:-traefik}
+    name: ${APP_PROXY_NETWORK}
 
 services:
   minio:

minio/docker-compose.yml

@@ -2,7 +2,7 @@ version: "3.9"
 
 networks:
   default:
-    name: ${APP_S3_NETWORK:-s3}
+    name: ${APP_MINIO_NETWORK}
 
 
 services:
@@ -19,4 +19,3 @@ 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
-

openldap/README.md

@@ -8,9 +8,3 @@
 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

openldap/docker-compose.lum.yml

@@ -1,18 +1,18 @@
-version: "3.7"
+
 
 networks:
-  ldap:
-    external: true
-    name: ${APP_LDAP_NETWORK}
+  proxy:
+    name: ${APP_PROXY_NETWORK}
 
 services:
 
-  lum:
+  manager:
     image: wheelybird/ldap-user-manager:latest
-    #restart: always
+    restart: always
 
     networks:
-      ldap:
+      proxy:
+      default:
 
     environment:
       - "SERVER_HOSTNAME=lum.$APP_TOP_DOMAIN"
@@ -29,3 +29,12 @@ services:
       # MrJK Tweaking
       - "USERNAME_REGEX=^[a-z][a-zA-Z0-9._-]{2,32}$$"
 
+    labels:
+      traefik.enable: "true"
+      traefik.http.routers.lum.entrypoints: front-http,front-https
+      traefik.http.routers.lum.rule: Host(`lum.$APP_TOP_DOMAIN`)
+      traefik.http.routers.lum.service: lum
+      traefik.http.routers.lum.tls: "true"
+      traefik.http.routers.lum.tls.certresolver: $TRAEFIK_CERTRESOLV
+      traefik.http.services.lum.loadbalancer.server.port: '80'
+

traefik/docker-compose.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

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"
 

traefik/init.sh

@@ -1,60 +0,0 @@
-#!/bin/bash
-
-install_mkcert ()
-{
-  local url=https://github.com/FiloSottile/mkcert/releases/download/v1.4.3/mkcert-v1.4.3-linux-amd64
-  local file=${url##*/}
-
-  if [[ -f mkcert ]]; then
-    MKCERT=$PWD/mkcert
-    return
-  fi
-  if command -v mkcert >&/dev/null; then
-    MKCERT=$(command -v mkcert)
-    return
-  fi
-
-  # Install mkcert in PWD
-  wget "$url"
-  mv "$file" mkcert
-  chmod +x mkcert
-}
-
-gen_certs ()
-{
-  install_mkcert
-  DOMAIN1="domain1.org"
-  DOMAIN2="domain2.org"
-  SUBDOMAINS=$( echo {infra,paas,apps,iaas,dev,cloud,lab,adm,sv,mgmt}.$DOMAIN1 {infra,paas,apps,iaas,dev,cloud,lab,adm,sv,mgmt}.$DOMAIN2 )
-  DOMAIN=$DOMAIN1
-
-  echo $MKCERT "$DOMAIN" "*.$DOMAIN" $SUBDOMAINS
-  (
-    cd config/
-    $MKCERT "$DOMAIN" "*.$DOMAIN" $SUBDOMAINS
-  )
-  echo "INFO: Certificates has bee generated."
-  tree config
-
-}
-
-gen_htpassword ()
-{
-  CONFIG="admin:admin"
-  local dst="./config/htpasswd"
-  set -x
-
-  while IFS=: read -r user pass; do
-    ! grep -sq "^$user:" $dst  >&/dev/null || continue
-    echo "Add: $user to $dst"
-    printf "$user:$(openssl passwd -apr1 $pass)\n" >> "$dst"
-  done <<< "$CONFIG"
-}
-
-main ()
-{
-  gen_certs
-  gen_htpassword
-}
-
-main