Merge branch 'develop'

.gitignore

@@ -80,4 +80,5 @@ $RECYCLE.BIN/
 docker-compose.yml
 
 gitlab/**
+gitlab-pages/**
 gitlab-runner/**

README.md

@@ -48,17 +48,20 @@ The following is required:
 
 ## Setup
 
-1.  Create an external docker network named "gitlab":  
+1.  Create an external docker network named "vcs":  
     ```bash
-    docker network create gitlab
+    docker network create vcs
+    ```
+1.  Make a copy of all `sample.` files:  
+    ```bash
+    for file in sample.*; do cp "$file" "${file#sample.}"; done;
     ```
-1.  Make a copy of '[.env.sample](.env.sample)' and rename it to '.env'.
 1.  Update at least environment variables `GL_DOMAIN` and
     `GL_CERTRESOLVER_NAME` in '.env':
     *  Replace `mydomain.com` with your **own domain** that serves the
        subdomains.
     *  Replace `mydomain-com` with a valid certificate resolvers name of Træfik.
-1.  Optional: Set these environment variables:
+1.  Optional: Set these environment variables in '.env':
     *  `GL_TZ`: A valid [tz database time zone](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones)
         (default: `UTC`)
     *  `GITLAB_SHELL_SSH_PORT`: GitLab Shell SSH port (default: `10022`)
@@ -78,11 +81,10 @@ The following is required:
         ```bash
         LC_ALL=C tr -cd 'a-z0-9' < /dev/urandom | fold -w 32 | head -n 1
         ```
-1.  Make a copy of '[docker-compose.yml.sample](docker-compose.yml.sample)' and
-    rename it to 'docker-compose.yml'.
-    *  Uncomment line 70 if you have set
+1.  Optional: Set these environment variables in 'docker-compose.yml':
+    *  Uncomment line 69 if you have set
        `GL_INITIAL_SHARED_RUNNERS_REGISTRATION_TOKEN` in step 4.
-    *  Uncomment line 119 if you have set `MM_FILESETTINGS_PUBLICLINKSALT` in
+    *  Uncomment line 118 if you have set `MM_FILESETTINGS_PUBLICLINKSALT` in
        step 4.
 1.  Start the container in detached mode:  
     ```bash
@@ -101,9 +103,24 @@ settings:
     *  Restricted visibility levels
 *  Admin Area > Settings > General > Sign-up restrictions:
     *  Sign-up enabled
+*  Admin Area > Settings > General > Sign-in restrictions > Email notification
+   for unknown sign-ins:
+    *  Notify users by email when sign-in location is not recognized
 *  Admin Area > Settings > Preferences > Localization:
     *  Default first day of the week
 
+Change the following
+settings:
+
+*  Admin Area > Settings > General > Third party offers:
+    *  Tick "Do not display offers from third parties within GitLab"
+*  Admin Area > Settings > Metrics and profiling > Usage statistics:
+    *  Untick "Enable usage ping"
+*  Admin Area > Settings > Network > Outbound requests:
+    *  Tick "Allow requests to the local network from web hooks and services"
+*  Admin Area > Settings > Preferences > Email:
+    *  Untick "Enable in-product marketing emails"
+
 Add Mattermost to Applications:
 
 *  Admin Area > Applications: Click "New application"
@@ -134,7 +151,7 @@ Add Mattermost to Applications:
 ## Register shared Runners
 
 ```shell
-docker exec -ti gitlab-runner bash -c "gitlab-runner register"
+docker exec -ti vcs_gitlab-runner_1 bash -c "gitlab-runner register"
 ```
 
 1.  Enter your GitLab instance URL:
@@ -181,13 +198,13 @@ See also
     *  [SMTP settings](https://docs.gitlab.com/omnibus/settings/smtp.html)  
         → As long as you are using the exim-relay, emails will likely end up in
         your spam folder!
-    *  [Reply by email](https://docs.gitlab.com/ce/administration/reply_by_email.html)
-    *  [GitLab Pages administration](https://docs.gitlab.com/ce/administration/pages/)
+    *  [Reply by email](https://docs.gitlab.com/ee/administration/reply_by_email.html)
+    *  [GitLab Pages administration](https://docs.gitlab.com/ee/administration/pages/)
 *  [GitLab Runner Docs](https://docs.gitlab.com/runner/)
     *  [Advanced configuration](https://docs.gitlab.com/runner/configuration/advanced-configuration.html)
 
 ### Mattermost
 
 *  [Mattermost Overview](https://docs.mattermost.com/overview/index.html)
-    *  [User's Guide](https://docs.mattermost.com/guides/user.html)
-    *  [Administrator's Guide](https://docs.mattermost.com/guides/administrator.html)
+    *  [Administration Guide](https://docs.mattermost.com/guides/administration.html)
+    *  [User Guide](https://docs.mattermost.com/guides/channels.html)

references/info.yml

 sources: 
   - file_name: gitlab.rb.template
     url: https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-config-template/gitlab.rb.template
-    date: 2020-06-18
+    date: 2021-10-07

docker-compose.yml.sample → sample..docker-compose.yml

-version: "3"
+version: '3.8'
 
 services:
   gitlab:
     image: gitlab/gitlab-ce
-    container_name: gitlab
     restart: always
     networks:
-      - default
+      - vcs
       - webproxy
     ports:
       - "${GITLAB_SHELL_SSH_PORT:-10022}:22"
     volumes:
-      - ./gitlab/config:/etc/gitlab
-      - ./gitlab/logs:/var/log/gitlab
-      - ./gitlab/data:/var/opt/gitlab
+      - ${GL_HOME:-.}/gitlab/config:/etc/gitlab
+      - ${GL_HOME:-.}/gitlab/logs:/var/log/gitlab
+      - ${GL_HOME:-.}/gitlab/data:/var/opt/gitlab
     labels:
       - traefik.enable=true
       - traefik.docker.network=webproxy
@@ -161,21 +160,18 @@ services:
 
   gitlab-runner:
     image: gitlab/gitlab-runner
-    container_name: gitlab-runner
     restart: always
     volumes:
-      - ./gitlab-runner/config:/etc/gitlab-runner
+      - ${GL_HOME:-.}/gitlab-runner/config:/etc/gitlab-runner
       - /var/run/docker.sock:/var/run/docker.sock
 
   gitlab-smtp:
     image: devture/exim-relay:4.92.2-r0-0
-    container_name: gitlab-smtp
     user: 100:101
     restart: always
 
 networks:
-  default:
-    external:
-      name: gitlab
+  vcs:
+    external: true
   webproxy:
     external: true

.env.sample → sample..env

+# Compose
+## Project name
+COMPOSE_PROJECT_NAME=vcs
+
+# Repository folder (default: .)
+GL_HOME=
+
 # GitLab URL
 GL_DOMAIN=mydomain.com