Merge branch 'gitlab-conversion' into 'main'

Gitlab conversion

See merge request infra/neo!1

docker-compose.devops.yml

@@ -8,8 +8,8 @@ services:
       - USER_UID=1000
       - USER_GID=1002
       - LETSENCRYPT_EMAIL=webmaster@faulty.nl
-      - LETSENCRYPT_HOST=git.faulty.nl
+      - LETSENCRYPT_HOST=gitea.faulty.nl
-      - VIRTUAL_HOST=git.faulty.nl
+      - VIRTUAL_HOST=gitea.faulty.nl
       - VIRTUAL_PORT=3000
     restart: always
     networks:
@@ -21,4 +21,33 @@ services:
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     ports:
-      - "22:22"
+      - "2222:22"
+
+  gitlab:
+    image: gitlab/gitlab-ce:latest
+    restart: always
+    hostname: 'git.faulty.nl'
+    environment:
+      GITLAB_OMNIBUS_CONFIG: |
+        external_url 'https://git.faulty.nl'
+        gitlab_rails['gitlab_shell_ssh_port'] = 22
+        nginx['listen_port'] = 80
+        nginx['listen_https'] = false
+      # temp ssh port
+      VIRTUAL_HOST: git.faulty.nl
+      LETSENCRYPT_HOST: git.faulty.nl
+    ports:
+      - '22:22'
+    volumes:
+      - /srv/gitlab/config:/etc/gitlab
+      - /srv/gitlab/data:/var/opt/gitlab
+      - /srv/gitlab/other/logs:/var/log/gitlab
+    shm_size: '256m'
+    networks:
+      - proxy
+
+  gitlab-runner:
+    image: gitlab/gitlab-runner:latest
+    volumes:
+      - /srv/gitlab/other/runner:/etc/gitlab-runner
+      - /var/run/docker.sock:/var/run/docker.sock

docker-compose.games.yml

@@ -33,7 +33,7 @@ services:
       - RUST_SERVER_MAXPLAYERS=20
       - RUST_SERVER_WORLDSIZE=2500
       - RUST_SERVER_SEED=694201
-      - RUST_SERVER_URL=faulty.nl
+      - RUST_SERVER_URL=rust.neo.faulty.nl
       - RUST_SERVER_PORT=28115
       - RUST_APP_PORT=28182
       - RUST_RCON_PORT=28116