From f41abfc28f853646d966f467bca03ae3fff3aba3 Mon Sep 17 00:00:00 2001
From: Joey Hafner <jafner425@gmail.com>
Date: Fri, 25 Feb 2022 20:13:17 +0000
Subject: [PATCH 1/7] Move /config to data dir

---
 server/config/gitlab/docker-compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/config/gitlab/docker-compose.yml b/server/config/gitlab/docker-compose.yml
index d81bfd1..0f71a0d 100644
--- a/server/config/gitlab/docker-compose.yml
+++ b/server/config/gitlab/docker-compose.yml
@@ -19,7 +19,7 @@ services:
       #- '443:443'
       - '2229:22'
     volumes:
-      - '${DOCKER_CONFIG}/config:/etc/gitlab'
+      - '${DOCKER_DATA}/config:/etc/gitlab'
       - '${DOCKER_DATA}/logs:/var/log/gitlab'
       - '${DOCKER_DATA}/data:/var/opt/gitlab'
     shm_size: '256m'
@@ -31,4 +31,4 @@ services:
 
 networks:
   web:
-    external: true
\ No newline at end of file
+    external: true

From 54deecbddd1be17a18b9a12e435362b0f5206b80 Mon Sep 17 00:00:00 2001
From: Joey Hafner <jafner425@gmail.com>
Date: Fri, 25 Feb 2022 20:26:49 +0000
Subject: [PATCH 2/7] Delete .env

---
 server/config/homer/.env | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 server/config/homer/.env

diff --git a/server/config/homer/.env b/server/config/homer/.env
deleted file mode 100644
index d8d90c0..0000000
--- a/server/config/homer/.env
+++ /dev/null
@@ -1 +0,0 @@
-DOCKER_DATA=/home/joey/docker_config/homer/assets

From 1a15310268ccbdaa47d3ea254be7ab35f762a9cc Mon Sep 17 00:00:00 2001
From: Joey Hafner <jafner425@gmail.com>
Date: Fri, 25 Feb 2022 20:27:15 +0000
Subject: [PATCH 3/7] Switch to relative subdirectory for config dir

---
 server/config/homer/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/config/homer/docker-compose.yml b/server/config/homer/docker-compose.yml
index 6ad8582..97ef3f2 100644
--- a/server/config/homer/docker-compose.yml
+++ b/server/config/homer/docker-compose.yml
@@ -8,7 +8,7 @@ services:
             - UID=1000
             - GID=1000
         volumes:
-            - ${DOCKER_DATA}:/www/assets
+            - ./assets:/www/assets
         networks:
             - web
         labels:

From ca626e7066ba07c109443c52e731d457f14a771f Mon Sep 17 00:00:00 2001
From: Joey Hafner <jafner425@gmail.com>
Date: Fri, 25 Feb 2022 20:32:39 +0000
Subject: [PATCH 4/7] Update .env for new DOCKER_CONFIG location

---
 server/config/minecraft/.env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/config/minecraft/.env b/server/config/minecraft/.env
index d7b5e8e..776d79a 100644
--- a/server/config/minecraft/.env
+++ b/server/config/minecraft/.env
@@ -1,3 +1,3 @@
 DOCKER_DATA=/home/joey/data/minecraft
-DOCKER_CONFIG=/home/joey/docker_config/minecraft
+DOCKER_CONFIG=/home/joey/homelab/server/config/minecraft
 RCON_PASSWORD=eZJxnAxUa9qEacEZFKdU6cEL

From 2be1509371987346956491ef51e898a1ee38323c Mon Sep 17 00:00:00 2001
From: Joey Hafner <jafner425@gmail.com>
Date: Fri, 25 Feb 2022 20:49:24 +0000
Subject: [PATCH 5/7] Update .env

---
 server/config/traefik/.env | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/config/traefik/.env b/server/config/traefik/.env
index e69de29..6655710 100644
--- a/server/config/traefik/.env
+++ b/server/config/traefik/.env
@@ -0,0 +1 @@
+DOCKER_DATA=/home/joey/data/traefik

From 39887be019ec6e5608f9a1b5c00587c9f6235716 Mon Sep 17 00:00:00 2001
From: Joey Hafner <jafner425@gmail.com>
Date: Fri, 25 Feb 2022 20:49:45 +0000
Subject: [PATCH 6/7] Update docker-compose.yml

---
 server/config/traefik/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/config/traefik/docker-compose.yml b/server/config/traefik/docker-compose.yml
index f6eb1d2..a3189c1 100644
--- a/server/config/traefik/docker-compose.yml
+++ b/server/config/traefik/docker-compose.yml
@@ -14,7 +14,7 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock:ro
       - ./traefik.toml:/traefik.toml
       - ./config:/config
-      - ./acme.json:/acme.json
+      - $DOCKER_DATA/acme.json:/acme.json
       - ./.htpasswd:/.htpasswd
 
 networks:

From b0ff3dd6bde9a5c2ba6e664119d6e80634aed047 Mon Sep 17 00:00:00 2001
From: Joey Hafner <jafner425@gmail.com>
Date: Fri, 25 Feb 2022 21:30:41 +0000
Subject: [PATCH 7/7] Enable server-deploy

---
 .gitlab-ci.yml | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 973de0f..35401ec 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,20 +12,12 @@ before_script:
   - mkdir -p ~/.ssh
   - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
 
-do-nothing:
+server-deploy:    
   stage: deploy
   when: always
+  rules:
+    - changes:
+        - server/
+      when: manual
   script:
-    - echo "Nothing'd successfully!"
-
-#server-deploy:    
-#  stage: deploy
-#  when: always
-#  rules:
-#    - changes:
-#        - server/
-#      when: manual
-#  script:
-#    - ssh joey@joey-server "cd /home/joey && git archive --remote=ssh://git@gitlab.jafner.net:2229/Jafner/homelab.git main server/ | tar xvf -"
-#    - ssh joey@joey-server "cp -r server/config/* ./docker_config/"
-#    - ssh joey@joey-server "rm -rf server/"
+    - ssh joey@joey-server "cd /home/joey/homelab && git pull"