.gitattributes

@@ -74,4 +74,3 @@
 
 .gitattributes export-ignore
 .gitignore     export-ignore
-.vscode        export-ignore

.gitignore

@@ -3,8 +3,4 @@
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
-!.vscode/numbered-bookmarks.json
 *.code-workspace
-
-# ignore params files
-*.params

.vscode/numbered-bookmarks.json

@@ -1,3 +0,0 @@
-{
-	"bookmarks": []
-}

ab-openldap/ab-openldap.params.template

@@ -11,18 +11,13 @@
 #
 # Instead of typing a myriad of "-e ...", you can fill them all out in this 
 # file and then use "--env-file ab-openldap.params" to tell docker to source
-# its variables from here.  You can also combine both methods if you like.
+# it's variables from here.  You can also combine both methods if you like.  
 # Most important, if you're using the convenience script, it draws all info from
 # this file!
 #
 # You should probably protect this file via file permissions since it likely 
 # will contain things like passwords!  Suggest restricting it to root only
 #    ex: chown root:root ab-openldap.parms && chmod 600 ab-openldap.parms
-#
-# N.B. If you change the convenience script name, you must also change this
-# file's name to match.
-#    ex: script name is 'runldap.sh' --> this file must be 'runldap.params'
-#
 ###
 
 ### Your timezone (https://en.wikipedia.org/wiki/List_of_tz_database_time_zones)
@@ -75,24 +70,5 @@ ANONYMOUS_BINDING=yes
 # variable commented-out if you don't have any LDIFs to apply.
 # MY_LDIF=/path/to/my/LDIFs
 
-### Enable checking passwords against IMAP/S server
-#
-# Setting the DOMAILAUTH variable to '1' tells openLDAP to verify SASL passwords
-# in the directory against an IMAP/S remote host. In other words, any user with
-# a password '{SASL}user@server.tld' will have their password checked by the
-# IMAP/S server using the provided email address and a 'NO/OK' reponse is fed
-# back to openLDAP. Please note, the remote mailserver *must* support IMAP/S
-# (i.e. secured IMAP).
-#
-# Specify the remote mailserver hostname using the MAILSERVER variable.
-#
-# If the remote mailserver implements IMAP/S (secure IMAP) on a non-standard
-# port (not port 993) then supply that using the MAILAUTHPORT variable.
-#
-# More details can be found in the wiki.
-###
-#DOMAILAUTH=0
-#MAILSERVER=mail.myserver.tld
-#MAILAUTHPORT=imaps
 
 #EOF

ab-openldap/ab-openldap.sh

@@ -1,8 +1,8 @@
 #!/bin/sh
 
 #
-# start openldap container using params file variables
+### start openldap container using params file variables
-# version 4.0
+# version 3.2
 #
 
 
@@ -66,11 +66,9 @@ scriptHelp () {
     printf "\n"
     textblock "${bold}Usage: $scriptName [parameters]${norm}"
     printf "\n"
-    textblock "This is a simple helper script so you can avoid lengthy typing when working with the openLDAP container. The script reads the contents of '${scriptName%.*}.params' and constructs various 'docker run' commands based on that file. The biggest timesaver is working with certificates. If they are specified in the '.params' file, the script will automatically bind-mount them so openLDAP starts in 'TLS required' mode."
+    textblock "This is a simple helper script so you can avoid lengthy typing when working with the openLDAP container. The script reads the contents of 'ab-openldap.params' and constructs various 'docker run' commands based on that file. The biggest timesaver is working with certificates. If they are specified in the '.params' file, the script will automatically bind-mount them so openLDAP starts in 'TLS required' mode."
     printf "\n"
-    textblock "If you run the script with no parameters, it will execute the container 'normally'. That is: Run in detached mode with openLDAP automatically launched and logging to stdout. If you specified certificates, openLDAP will require a TLS connection. All modes of operation allow you to enter the container and connect directly using UNIX sockets as root with *unrestricted* access to all DITs and objects."
+    textblock "If you run the script with no parameters, it will execute the container 'normally': Run in detached mode with openLDAP automatically launched and logging to stdout. If you specified certificates, openLDAP will require a TLS connection. All modes of operation allow you to enter the container and connect directly using UNIX sockets also."
-    printf "\n"
-    textblock "If you want to verify SASL passwords against an IMAP/S server, please refer to the '.params' template file and the wiki for more information."
     printf "\n"
     textblock "Containers run in SHELL mode are ALWAYS removed upon exit as they are meant for testing only. By default, containers run without '--rm' will be restarted automatically unless they are manually stopped via 'docker stop...'"
     printf "\n"
@@ -119,13 +117,13 @@ if [ ! "$( id -u )" -eq 0 ]; then
 fi
 
 # does the params file exist?
-if [ ! -f "${scriptName%.*}.params" ]; then
+if [ ! -f "./ab-openldap.params" ]; then
-    consoleError '3' "Cannot find '${scriptName%.*}.params' file in the same directory as this script."
+    consoleError '3' "Cannot find 'ab-openldap.params' file in the same directory as this script."
     exit 3
 fi
 
 # read .params file
-. ./${scriptName%.*}.params
+. ./ab-openldap.params
 
 # process startup parameters
 while [ $# -gt 0 ]; do