Prepared all containers for final rollout

Development/Gitea/docker-compose.yml

@@ -21,10 +21,10 @@ services:
       - USER_GID=1000
       - USER=git
       - RUN_MODE=prod
-      - DOMAIN=test.luke-else.co.uk
+      - DOMAIN=git.luke-else.co.uk
-      - SSH_DOMAIN=test.luke-else.co.uk
+      - SSH_DOMAIN=git.luke-else.co.uk
       - HTTP_PORT=3000
-      - ROOT_URL=https://test.luke-else.co.uk
+      - ROOT_URL=https://git.luke-else.co.uk
       - SSH_PORT=222
       - SSH_LISTEN_PORT=22
       - DB_TYPE=sqlite3
@@ -32,7 +32,7 @@ services:
       ## Expose Gitea Through Trefik ##
       - "traefik.enable=true" # <== Enable traefik to proxy this container
       - "traefik.http.services.gitea.loadbalancer.server.port=3000"
-      - "traefik.http.routers.gitea.rule=Host(`test.luke-else.co.uk`) || Host(`www.test.luke-else.co.uk`)"
+      - "traefik.http.routers.gitea.rule=Host(`git.luke-else.co.uk`) || Host(`www.git.luke-else.co.uk`)"
       - "traefik.http.routers.gitea.entrypoints=websecure"
       - "traefik.http.routers.gitea.tls.certresolver=myresolver"
     restart: unless-stopped

NextCloud/docker-compose.yml

@@ -1,51 +0,0 @@
-version: '3.8'
-
-services:
-  
-  nextcloud:
-    image: nextcloud
-    container_name: nextcloud
-    links:
-      - db
-    volumes:
-      - ./nextcloud:/var/www/html
-    networks:
-      - proxy
-      - nextcloud
-    depends_on:
-      - db
-      - traefik
-    environment:
-      - MYSQL_USER=nextcloud
-      - MYSQL_PASSWORD=
-      - MYSQL_DATABASE=nextcloud
-      - MYSQL_HOST=db
-    labels:
-      ## Expose Nextcloud Through Trefik ##
-      - "traefik.enable=true" # <== Enable traefik to proxy this container
-      - "traefik.http.services.nextcloud.loadbalancer.server.port=80"
-      - "traefik.http.routers.nextcloud.rule=Host(`nextcloud.luke-else.co.uk`) || Host(`www.nextcloud.luke-else.co.uk`)"
-      - "traefik.http.routers.nextcloud.entrypoints=websecure"
-      - "traefik.http.routers.nextcloud.tls.certresolver=myresolver"
-    restart: unless-stopped
-  
-  db:
-    image: mariadb
-    container_name: nextclouddb
-    command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
-    volumes:
-      - ./db:/var/lib/mysql
-    networks:
-      - nextcloud
-    environment:
-      - MYSQL_ROOT_PASSWORD=
-      - MYSQL_USER=nextcloud
-      - MYSQL_PASSWORD=
-      - MYSQL_DATABASE=nextcloud
-    restart: unless-stopped
-
-networks:
-  proxy:
-    external: true
-  nextcloud:
-    name: nextcloud

Traefik/docker-compose.yml

@@ -5,7 +5,6 @@ services:
     container_name: "traefik"
     command:
       - "--api.dashboard=true"
-      - "--log.level=DEBUG"
       - "--providers.docker=true"
       - "--providers.docker.exposedbydefault=false"
       - "--entrypoints.web.address=:80"
@@ -23,8 +22,7 @@ services:
       - proxy
     labels:
       - "traefik.enable=true"
-      - "traefik.log"
+      - "traefik.http.routers.traefik.rule=Host(`traefik.luke-else.co.uk`) || Host('www.traefik.luke-else.co.uk')"
-      - "traefik.http.routers.traefik.rule=Host(`traefik.luke-else.co.uk`)"
       - "traefik.http.routers.traefik.entrypoints=websecure"
       - "traefik.http.routers.traefik.service=api@internal"
       - "traefik.http.routers.traefik.tls.certresolver=myresolver" 

Websites/docker-compose.yml

@@ -4,10 +4,14 @@ services:
 
 #Websites luke-else.co.uk (8000) snexo.co.uk (8001)
   luke-else.co.uk:
-    image: "php:apache"
+    image: "nginx:latest"
     container_name: luke-else.co.uk
     volumes:
-      - ./luke-else.co.uk/:/var/www/html
+      - ./luke-else.co.uk/:/usr/share/nginx/html
+    networks:
+      - proxy
+    depends_on:
+      - traefik
     labels:
       ## Expose luke-else Through Trefik ##
       - "traefik.enable=true" # <== Enable traefik to proxy this container
@@ -22,6 +26,10 @@ services:
     container_name: snexo.co.uk
     volumes:
       - ./snexo.co.uk/:/var/www/html
+    networks:
+      - proxy
+    depends_on:
+      - traefik
     labels:
       ## Expose Snexo Through Trefik ##
       - "traefik.enable=true" # <== Enable traefik to proxy this container
@@ -32,5 +40,5 @@ services:
     restart: unless-stopped
 
 networks:
-  frontend:
+  proxy:
     external: true

spindown.sh

@@ -2,10 +2,6 @@
 
 cd ./Websites/
 docker-compose down
-cd ..
-
-cd ./NextCloud/
-docker-compose down
 cd ..
 
     cd ./Development/Gitea/

spinup.sh

@@ -6,10 +6,6 @@ cd ..
 
 cd ./Websites/
 docker-compose up -d
-cd ..
-
-cd ./NextCloud/
-docker-compose up -d
 cd ..
 
     cd ./Development/Gitea/

todo.md

@@ -0,0 +1,31 @@
+# ToDo Items
+
+## General
+- UFW should be setup to keep VPS secure and only allow for:
+    - https
+    - http
+    - ssh
+    - ftp
+    - 27017
+    - 3306
+
+
+## Traefik
+- Setup htaccess -> ``` echo $(htpasswd -nb user password) | sed -e s/\\$/\\$\\$/g ```
+- Ensure email address is correct
+
+## Gitea
+- Ensure that ports are assigned correctly for the system
+
+## Websites
+- Ensure website files are copied over
+- Ensure that ports are assigned correctly for the system
+
+## Bitwarden
+- Ensure that all data is fully encrypted during transfer.
+- Ensure that ports are assigned correctly for the system
+
+## Database
+- Ensure that mysql root password, user and default database are updated.
+- Ensure that mongo root password, and user are updated.
+- Ensure database ports are correctly assigned and do not have to pass through traefik.