From 7bce1eb33522aec77c87fc1e9a305f3d24e242cc Mon Sep 17 00:00:00 2001
From: Cintia Del Rio Calvo <cintiadrio@gmail.com>
Date: Sun, 14 Apr 2019 22:36:06 +1000
Subject: [PATCH] Starting with ID stg

---
 .gitignore                        |  1 +
 files/ldap-stg/docker-compose.yml | 34 +++++++++++++++++++++++++------
 files/ldap-stg/env.template       | 13 ++++++++++++
 3 files changed, 42 insertions(+), 6 deletions(-)
 create mode 100644 files/ldap-stg/env.template

diff --git a/.gitignore b/.gitignore
index 4a60582..b5d6907 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 *.iml
 .idea
+**/backups/**
diff --git a/files/ldap-stg/docker-compose.yml b/files/ldap-stg/docker-compose.yml
index 630ee05..5de373b 100644
--- a/files/ldap-stg/docker-compose.yml
+++ b/files/ldap-stg/docker-compose.yml
@@ -1,6 +1,28 @@
 ---
 version: '3'
 services:
+  # openldap:
+  #   restart: "always"
+  #   image: osixia/openldap:1.1.10
+  #   ports:
+  #     - 636:636
+  #   environment:
+  #     LDAP_ORGANISATION: OpenMRS
+  #     LDAP_DOMAIN: ${LDAP_DOMAIN:-openmrs.org}
+  #     LDAP_ADMIN_PASSWORD: ${LDAP_ADMIN_PASSWORD:-admin}
+  #     LDAP_CONFIG_PASSWORD: ${LDAP_CONFIG_PASSWORD:-config}
+  #     LDAP_TLS_CRT_FILENAME: ${LDAP_TLS_CRT_FILENAME:-ldap.crt}
+  #     LDAP_TLS_KEY_FILENAME: ${LDAP_TLS_KEY_FILENAME:-ldap.key}
+  #     LDAP_TLS_CA_CRT_FILENAME: ${LDAP_TLS_CA_CRT_FILENAME:-ca.crt}
+  #     LDAP_TLS_VERIFY_CLIENT: never
+  #     LDAP_LOG_LEVEL: 0
+  #   healthcheck:
+  #     test: "exit 0"
+  #   volumes:
+  #     - config:/etc/ldap/slapd.d
+  #     - database:/var/lib/ldap
+  #     - ${CERTS_DIR-./certs}:/container/service/slapd/assets/certs/
+
   ldap:
     restart: "always"
     image: osixia/openldap:1.1.8
@@ -9,11 +31,11 @@ services:
     environment:
       LDAP_ORGANISATION: OpenMRS
       LDAP_DOMAIN: ${LDAP_DOMAIN:-openmrs.org}
-      LDAP_ADMIN_PASSWORD: ${LDAP_ADMIN_PASSWORD:-admin}
-      LDAP_CONFIG_PASSWORD: ${LDAP_CONFIG_PASSWORD:-config}
-      LDAP_TLS_CRT_FILENAME: ${LDAP_TLS_CRT_FILENAME:-ldap.crt}
-      LDAP_TLS_KEY_FILENAME: ${LDAP_TLS_KEY_FILENAME:-ldap.key}
-      LDAP_TLS_CA_CRT_FILENAME: ${LDAP_TLS_CA_CRT_FILENAME:-ca.crt}
+      LDAP_ADMIN_PASSWORD: ${OLD_LDAP_ADMIN_PASSWORD:-admin}
+      LDAP_CONFIG_PASSWORD: ${OLD_LDAP_CONFIG_PASSWORD:-config}
+      LDAP_TLS_CRT_FILENAME: ${OLD_LDAP_TLS_CRT_FILENAME:-ldap.crt}
+      LDAP_TLS_KEY_FILENAME: ${OLD_DAP_TLS_KEY_FILENAME:-ldap.key}
+      LDAP_TLS_CA_CRT_FILENAME: ${OLD_LDAP_TLS_CA_CRT_FILENAME:-ca.crt}
       LDAP_TLS_VERIFY_CLIENT: never
       LDAP_LOG_LEVEL: 0
     healthcheck:
@@ -21,7 +43,7 @@ services:
     volumes:
       - config:/etc/ldap/slapd.d
       - database:/var/lib/ldap
-      - ${CERTS_DIR-./certs}:/container/service/slapd/assets/certs/
+      - ${OLD_CERTS_DIR-./certs}:/container/service/slapd/assets/certs/
 
   backup:
     image: openmrs/cron-backup:1.0.0
diff --git a/files/ldap-stg/env.template b/files/ldap-stg/env.template
new file mode 100644
index 0000000..21edb33
--- /dev/null
+++ b/files/ldap-stg/env.template
@@ -0,0 +1,13 @@
+LDAP_DOMAIN=openmrs.org
+LDAP_ADMIN_PASSWORD=<>
+LDAP_CONFIG_PASSWORD=<>
+BACKUP_DIR=/opt/backups
+LDAP_TLS_CRT_FILENAME=live/ruiru.openmrs.org/cert.pem
+LDAP_TLS_KEY_FILENAME=live/ruiru.openmrs.org/privkey.pem
+LDAP_TLS_CA_CRT_FILENAME=live/ruiru.openmrs.org/fullchain.pem
+CERTS_DIR=/etc/letsencrypt
+OLD_LDAP_ADMIN_PASSWORD=<>
+OLD_LDAP_TLS_CRT_FILENAME=cert1.pem
+OLD_LDAP_TLS_KEY_FILENAME=privkey1.pem
+OLD_LDAP_TLS_CA_CRT_FILENAME=fullchain1.pem
+OLD_CERTS_DIR=/etc/letsencrypt/archive/ruiru.openmrs.org/