From ff43242a11f98b8480bf866b310be5fb163442a2 Mon Sep 17 00:00:00 2001
From: root <vasyakrg@gmail.com>
Date: Wed, 9 Mar 2022 10:51:55 +0700
Subject: [PATCH] add backup,ldap

---
 .env.example       | 20 +++++++++++++-----
 docker-compose.yml | 51 ++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 57 insertions(+), 14 deletions(-)

diff --git a/.env.example b/.env.example
index 6eee92f..15f4acb 100644
--- a/.env.example
+++ b/.env.example
@@ -19,8 +19,12 @@ DOCKER_IMAGE_REDIS=sameersbn/redis:latest
 DOCKER_IMAGE_REGISTRY=registry:latest
 DOCKER_IMAGE_RUNNER=vasyakrg/gitlab-runner
 
+# LDAP settings
+LDAP_ENABLED=false
+LDAP_PASS=
+
 # SMTP settings
-SMTP_ENABLED=true
+SMTP_ENABLED=false
 SMTP_DOMAIN=<you_domain>
 
 SMTP_HOST=smtp.mailgun.org
@@ -62,10 +66,6 @@ DB_NAME=gitlab_production
 #
 SERVICE_DATA=/srv/services/data
 
-# Email for letsencrypt
-#
-LETSENCRYPT_EMAIL=<you_email>
-
 # Gitlab runner token
 #
 RUNNER_TOKEN=
@@ -76,6 +76,16 @@ GITLAB_TIMEZONE=Asia/Novosibirsk
 #
 CI_SERVER_WITH_RUNNER=true
 
+# Backup settings
+#
+BACKUP_DIR=/srv/backup
+DOCKER_COMPOSE_DIR=/srv/services/cfg/gitlab
+BACKUP_SCHEDULE=@weekly
+
+S3_HOST_BASE=s3.domain.com
+S3_ACCOUNT_ID=<account-id>
+S3_APPLICATION_KEY=<application-id>
+
 # Network names
 #
 #SERVICE_NETWORK=gitlab
diff --git a/docker-compose.yml b/docker-compose.yml
index 3cb910f..cdfa9ef 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -61,17 +61,29 @@ services:
 
         - GITLAB_PAGES_ENABLED=false
 
-        - SMTP_ENABLED=true
-        - SMTP_DOMAIN=${SMTP_DOMAIN}
-        - SMTP_HOST=${SMTP_HOST}
-        - SMTP_PORT=${SMTP_PORT}
-        - SMTP_USER=${SMTP_USER}
-        - SMTP_PASS=${SMTP_PASS}
-        - SMTP_STARTTLS=${SMTP_STARTTLS}
-        - SMTP_AUTHENTICATION=${SMTP_AUTHENTICATION}
+        - SMTP_ENABLED=${SMTP_ENABLED}
+        # - SMTP_DOMAIN=${SMTP_DOMAIN}
+        # - SMTP_HOST=${SMTP_HOST}
+        # - SMTP_PORT=${SMTP_PORT}
+        # - SMTP_USER=${SMTP_USER}
+        # - SMTP_PASS=${SMTP_PASS}
+        # - SMTP_STARTTLS=${SMTP_STARTTLS}
+        # - SMTP_AUTHENTICATION=${SMTP_AUTHENTICATION}
 
         - IMAP_ENABLED=false
-        - LDAP_ENABLED=false
+
+        - LDAP_ENABLED=${LDAP_ENABLED}
+        # - LDAP_LABEL=LDAP
+        # - LDAP_HOST=id1.domain.com
+        # - LDAP_PORT=636
+        # - LDAP_UID=uid
+        # - LDAP_METHOD=simple_tls
+        # - LDAP_VERIFY_SSL=true
+        # - LDAP_ACTIVE_DIRECTORY=false
+        # - LDAP_BASE=cn=users,cn=accounts,dc=id,dc=domain,dc=com
+        # - LDAP_USER_FILTER=(&(objectClass=posixaccount)(memberOf=cn=gitlab,cn=groups,cn=accounts,dc=id,dc=domain,dc=com))
+        # - LDAP_BIND_DN=uid=binddn,cn=sysaccounts,cn=etc,dc=id,dc=domain,dc=com
+        # - LDAP_PASS=${LDAP_PASS}
 
         - GITLAB_REGISTRY_ENABLED=true
         - GITLAB_REGISTRY_HOST=${REGISTRY_HOST}
@@ -226,6 +238,27 @@ services:
       networks:
        - service
 
+    # backup:
+    #   image: ${DOCKER_IMAGE_BACKUP}
+    #   restart: always
+    #   container_name: ${SERVICE_NAME}_${CONTAINER_NAME_BACKUP}
+    #   command: gitlab backup --storage S3://<BACKBLAZE-MOUNT-POINT>/gitlab --online
+    #   volumes:
+    #     - /var/run/docker.sock:/var/run/docker.sock
+    #     - ${SERVICE_DATA}/${SERVICE_NAME}/gitlab/backups:${BACKUP_DIR}:Z
+    #     - ${DOCKER_COMPOSE_DIR}:${DOCKER_COMPOSE_DIR}
+    #   environment:
+    #     - BACKUP_SCHEDULE=${BACKUP_SCHEDULE}
+    #     - BACKUP_DIR=${BACKUP_DIR}
+    #     - DOCKER_COMPOSE_DIR=${DOCKER_COMPOSE_DIR}
+    #     - SERVICE_NAME=${SERVICE_NAME}
+    #     - CONTAINER_NAME_GITLAB=${CONTAINER_NAME_GITLAB}
+    #     - S3_HOST_BASE=${S3_HOST_BASE}
+    #     - S3_ACCOUNT_ID=${S3_ACCOUNT_ID}
+    #     - S3_APPLICATION_KEY=${S3_APPLICATION_KEY}
+    #   networks:
+    #     - service
+
 networks:
     service:
         name: ${SERVICE_NAME}