Browse Source

latest working release

Tomi Cvetic 6 years ago
parent
commit
34149cb92f
4 changed files with 23 additions and 10 deletions
  1. 2 0
      .gitignore
  2. 6 0
      .gitmodules
  3. 14 9
      docker-compose.yml
  4. 1 1
      ldap-server

+ 2 - 0
.gitignore

@@ -0,0 +1,2 @@
+backups/
+ldifs/

+ 6 - 0
.gitmodules

@@ -0,0 +1,6 @@
+[submodule "ldap-server"]
+	path = ldap-server
+	url = https://git.slurm.ch/tomi/ldap-server.git
+[submodule "ldap-gui"]
+	path = ldap-gui
+	url = https://git.slurm.ch/tomi/ldap-gui.git

+ 14 - 9
docker-compose.yml

@@ -2,25 +2,30 @@ version: "3"
 
 services:
   ldap-server:
+    build: ldap-server
     container_name: ldap-server
-    build: ./ldap-server
+    restart: always
+    #image: docker.slurm.ch/ldap-server
     ports:
       - "389:389"
     environment:
       - DOMAIN=slurm.ch
-      - ORGANIZATION=Slurm
+      - ORGANIZATION=Slurm - It's addictive!
+      - SUFFIX=dc=slurm,dc=ch
       - DEBUG=1
+      - LDAP_ROOT_HASH={SSHA}mDjm62K39FmbJZpER7nfV6TF+cC1Hl69
     volumes:
       - "/var/lib/openldap"
       - "/etc/openldap/slapd.d"
-      #- "./ldap-server/backups:/var/backups"
-      #- "./ldap-server/restore:/var/restore"
-    cap_add:
-      - "SYS_PTRACE"
+      - "./ldifs:/var/ldifs"
+      - "./backups:/var/backups"
+      - "./restore:/var/restore"
+    #command: sh
+    #stdin_open: true
+    #tty: true
 
   ldap-gui:
-    container_name: ldap-gui
-    build: ./ldap-gui
+    image: docker.slurm.ch/ldap-gui
+    restart: always
     ports:
       - "8080:80"
-

+ 1 - 1
ldap-server

@@ -1 +1 @@
-Subproject commit fb4561c6cb8e9267c7c2a661bcd4bb96467351ee
+Subproject commit 855e8c79f035e8ebd7e31aa415d7d4d9c40140f5