Improve usage examples

README.md

@@ -7,13 +7,21 @@ image.
 ### Building slapd
 
 ```
-docker build -t zombi/slapd .
+docker build -t zombi/ldap .
 ```
 
 ### Running slapd
 
+Copy over example configuration
+
+```bash
+cp docker-compose.yml{.example,}
 ```
-docker run -d --name ldap -v /data/ldap:/data -p 389:389 zombi/slapd
+
+run the service
+
+```
+docker-compose up -d
 ```
 
 ### Backing up data

docker-compose.yml.example

@@ -1,9 +1,13 @@
-version: '2'
+version: "2.4"
 
 networks:
     net:
         driver: bridge
 
+volumes:
+    data:
+    conf:
+
 services:
     slapd:
         image: zombi/ldap:latest
@@ -13,5 +17,5 @@ services:
             - "DATADIR=/data"
             - "CONFDIR=/conf"
         volumes:
-            - ./data/ldap/config:/conf
-            - ./data/ldap/data:/data
+            - conf:/etc/ldap/slapd.d
+            - data:/var/lib/ldap

fixtures/10_ldapPublicKey.ldif

@@ -1,9 +0,0 @@
-dn: cn=ldapPublicKey,cn=schema,cn=config
-objectClass: olcSchemaConfig
-cn: ldapPublicKey
-olcAttributeTypes: ( 1.3.6.1.4.1.24552.500.1.1.1.13 NAME 'sshPublicKey'
-  DESC 'MANDATORY: OpenSSH Public key' EQUALITY octetStringMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
-olcObjectClasses: ( 1.3.6.1.4.1.24552.500.1.1.2.0 NAME 'ldapPublicKey'
-  SUP top AUXILIARY DESC 'MANDATORY: OpenSSH LPK objectclass'
-  MUST ( sshPublicKey $ uid ) )

fixtures/config.ldif

@@ -33,7 +33,7 @@ olcAccess: {0}to * by dn.exact=gidNumber=0+uidNumber=0,cn=peercred,cn=external,c
 # Allow unauthenticated read access for schema and base DN autodiscovery
 olcAccess: {1}to dn.exact="" by * read
 olcAccess: {2}to dn.base="cn=Subschema" by * read
-# Define CRYPT as preferred algorighm for password hashing
+# Define CRYPT as preferred algorithm for password hashing
 olcPasswordHash: {CRYPT}
 
 # Config db settings
@@ -60,6 +60,17 @@ include: file:///etc/ldap/schema/ppolicy.ldif
 # misc adds support for local mail users and aliases
 include: file:///etc/ldap/schema/misc.ldif
 
+# schema support for storing user public keys
+dn: cn=ldapPublicKey,cn=schema,cn=config
+objectClass: olcSchemaConfig
+cn: ldapPublicKey
+olcAttributeTypes: ( 1.3.6.1.4.1.24552.500.1.1.1.13 NAME 'sshPublicKey'
+  DESC 'MANDATORY: OpenSSH Public key' EQUALITY octetStringMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
+olcObjectClasses: ( 1.3.6.1.4.1.24552.500.1.1.2.0 NAME 'ldapPublicKey'
+  SUP top AUXILIARY DESC 'MANDATORY: OpenSSH LPK objectclass'
+  MUST ( sshPublicKey $ uid ) )
+
 # Load module
 dn: cn=module{0},cn=config
 objectClass: olcModuleList