From 139453ce2a5d9f98c2ca5ba7aa32ed789ba4f99a Mon Sep 17 00:00:00 2001
From: Nikolaos Karaolidis <nick@karaolidis.com>
Date: Tue, 8 Mar 2022 16:43:19 +0000
Subject: [PATCH] Moving containers aroung

---
 README.md                  |  2 +-
 cloud/docker-compose.yml   | 33 ++-------------------------------
 home/docker-compose.yml    |  4 ++--
 routing/docker-compose.yml | 29 +++++++++++++++++++++++++++++
 4 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/README.md b/README.md
index d1cc4fa..59f4b2d 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,6 @@ Docker-compose configurations and other bits for various services running on the
 ## Cloud
 
 * [Nextcloud](https://github.com/nextcloud/server): Self-hosted cloud storage and more
-* [YOURLS](https://github.com/YOURLS/YOURLS): URL shortener
 
 ## DevOps
 
@@ -75,6 +74,7 @@ Docker-compose configurations and other bits for various services running on the
 * [Cloudflare Argo Tunnel](https://hub.docker.com/r/cloudflare/cloudflared): Tunneling service
 * [Cloudflare DDNS](https://github.com/oznu/docker-cloudflare-ddns): Dynamic DNS service
 * [WhoAmI](https://github.com/traefik/whoami): HTTP request information
+* [YOURLS](https://github.com/YOURLS/YOURLS): URL shortener
 
 ## Samba
 
diff --git a/cloud/docker-compose.yml b/cloud/docker-compose.yml
index bc3dc47..49f72ec 100644
--- a/cloud/docker-compose.yml
+++ b/cloud/docker-compose.yml
@@ -6,7 +6,7 @@ services:
         container_name: nextcloud
         restart: unless-stopped
         volumes:
-            - '/home/nick/configs/nextcloud/conf:/config'
+            - '/home/nick/configs/cloud/nc_conf:/config'
             - '/mnt/storage/configs/nextcloud/data:/data'
             - '/mnt/storage/public:/public'
             - '/mnt/storage/private:/private'
@@ -25,7 +25,7 @@ services:
         container_name: nextcloud_db
         restart: unless-stopped
         volumes:
-            - '/home/nick/configs/nextcloud/db:/var/lib/mysql'
+            - '/home/nick/configs/cloud/nc_db:/var/lib/mysql'
         environment:
             - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASS}
             - MYSQL_USER=nextcloud
@@ -35,35 +35,6 @@ services:
             - nextcloud
         user: '1000:1000'
 
-    yourls:
-        build: https://git.karaolidis.com/Nikas36/yourls-plugins.git
-        image: yourls:custom
-        container_name: yourls
-        restart: unless-stopped
-        environment:
-            - 'YOURLS_DB_HOST=yourls_db:3306'
-            - 'YOURLS_DB_PASS=${YOURLS_DB_PASS}'
-            - 'YOURLS_SITE=${YOURLS_URL}'
-            - 'YOURLS_USER=${YOURLS_USER}'
-            - 'YOURLS_PASS=${YOURLS_PASS}'
-        networks:
-            - yourls
-            - proxy
-        depends_on:
-            - yourls_db
-
-    yourls_db:
-        image: mysql
-        container_name: yourls_db
-        restart: unless-stopped
-        volumes:
-            - '/home/nick/configs/routing/yourls:/var/lib/mysql'
-        environment:
-            - 'MYSQL_ROOT_PASSWORD=${YOURLS_DB_PASS}'
-        networks:
-            - yourls
-        user: '1000:1000'
-
 networks:
     nextcloud:
         name: nextcloud
diff --git a/home/docker-compose.yml b/home/docker-compose.yml
index 796e363..e0f0756 100644
--- a/home/docker-compose.yml
+++ b/home/docker-compose.yml
@@ -6,7 +6,7 @@ services:
         container_name: homer_private
         restart: unless-stopped
         volumes:
-            - '/home/nick/configs/routing/homer:/www/assets'
+            - '/home/nick/configs/home/homer:/www/assets'
         environment:
             - UID=1000
             - GID=1000
@@ -18,7 +18,7 @@ services:
         container_name: homer_social
         restart: unless-stopped
         volumes:
-            - '/home/nick/configs/routing/social:/www/assets'
+            - '/home/nick/configs/home/social:/www/assets'
         environment:
             - UID=1000
             - GID=1000
diff --git a/routing/docker-compose.yml b/routing/docker-compose.yml
index 235ceed..3ebcad3 100644
--- a/routing/docker-compose.yml
+++ b/routing/docker-compose.yml
@@ -54,6 +54,35 @@ services:
         networks:
             - proxy
 
+    yourls:
+        build: https://git.karaolidis.com/Nikas36/yourls-plugins.git
+        image: yourls:custom
+        container_name: yourls
+        restart: unless-stopped
+        environment:
+            - 'YOURLS_DB_HOST=yourls_db:3306'
+            - 'YOURLS_DB_PASS=${YOURLS_DB_PASS}'
+            - 'YOURLS_SITE=${YOURLS_URL}'
+            - 'YOURLS_USER=${YOURLS_USER}'
+            - 'YOURLS_PASS=${YOURLS_PASS}'
+        networks:
+            - yourls
+            - proxy
+        depends_on:
+            - yourls_db
+
+    yourls_db:
+        image: mysql
+        container_name: yourls_db
+        restart: unless-stopped
+        volumes:
+            - '/home/nick/configs/routing/yourls:/var/lib/mysql'
+        environment:
+            - 'MYSQL_ROOT_PASSWORD=${YOURLS_DB_PASS}'
+        networks:
+            - yourls
+        user: '1000:1000'
+
 networks:
     proxy:
         external: true