migrate

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
-      - VIRTUAL_HOST=git.faulty.nl
+      - LETSENCRYPT_HOST=gitea.faulty.nl
+      - VIRTUAL_HOST=gitea.faulty.nl
       - VIRTUAL_PORT=3000
     restart: always
     networks:
@@ -21,23 +21,23 @@ 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: 'lab.neo.faulty.nl'
+    hostname: 'git.faulty.nl'
     environment:
       GITLAB_OMNIBUS_CONFIG: |
-        external_url 'https://lab.neo.faulty.nl'
-        gitlab_rails['gitlab_shell_ssh_port'] = 2222
+        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: lab.neo.faulty.nl
-      LETSENCRYPT_HOST: lab.neo.faulty.nl
+      VIRTUAL_HOST: git.faulty.nl
+      LETSENCRYPT_HOST: git.faulty.nl
     ports:
-      - '2222:22'
+      - '22:22'
     volumes:
       - /srv/gitlab/config:/etc/gitlab
       - /srv/gitlab/data:/var/opt/gitlab