From 63443b546f92ccccd4c6bd701867daa51783358a Mon Sep 17 00:00:00 2001 From: whitney Date: Thu, 7 Mar 2024 11:56:37 -0800 Subject: [PATCH] Update for pwspool zfs --- README.md | 6 ++++-- covid19/docker-compose.yml.blanked | 2 +- gitea/docker-compose.yml.blanked | 4 ++-- grafana/docker-compose.yml.blanked | 2 +- jenkins/docker-compose.yml.blanked | 2 +- minecraft/docker-compose.yml.blanked | 8 ++++---- monica/docker-compose.yml.blanked | 4 ++-- photoprism/docker-compose.yml.blanked | 8 ++++---- 8 files changed, 19 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 5482e31..5c7bba4 100644 --- a/README.md +++ b/README.md @@ -34,13 +34,15 @@ Olomana is based off of the latest stable version of Ubuntu Server (https://ubun Managing disk partitions using `gdisk` and configuring drives for automatic mounting using the `fstab` file. Example: https://techguides.yt/guides/how-to-partition-format-and-auto-mount-disk-on-ubuntu-20-04/ +General rule of thumb is archival data/things that we don't want to lose live in the ZFS pool, while more elphemeral data/data we don't care about losing lives in / + #### Drives -Created a `/data/write` and `/data/persistent` mount point that my config is based on. Applications that write frequently do so to the dedicated drive mounted at `/data/write`, and persistent data is written to `/data/persistent`. +Applications that write frequently do so to the dedicated drive mounted at `/data/write`. Prior to ZFS introduction, data was store on drives mounted under /data (persistent, coldstorage, nas). #### ZFS -Later, I created a ZFS system to replace non-ephemeral data. It's a ZFS pool using `raidz1`, mounted to /pwspool. +Later, I created a ZFS system to replace non-ephemeral data that I want to safeguard under a raid setup. It's a ZFS pool using `raidz1`, mounted to /pwspool. ### OpenSSH installation diff --git a/covid19/docker-compose.yml.blanked b/covid19/docker-compose.yml.blanked index 7cbf983..b6d7d0a 100644 --- a/covid19/docker-compose.yml.blanked +++ b/covid19/docker-compose.yml.blanked @@ -33,7 +33,7 @@ services: ports: - "[[HOST_PORT]]:3306" volumes: - - /data/coldstorage/covid19/mysql:/var/lib/mysql + - /pwspool/software/covid19/mysql:/var/lib/mysql - ./schema:/docker-entrypoint-initdb.d/:ro networks: - covidapp-network diff --git a/gitea/docker-compose.yml.blanked b/gitea/docker-compose.yml.blanked index 05cdb31..c7da304 100644 --- a/gitea/docker-compose.yml.blanked +++ b/gitea/docker-compose.yml.blanked @@ -25,7 +25,7 @@ services: - gitea_network - traefik_traefik-network volumes: - - /data/persistent/gitea/gitea:/data + - /pwspool/software/gitea/gitea:/data - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro labels: @@ -45,5 +45,5 @@ services: - POSTGRES_PASSWORD=[[DATABASE_PASSWD]] - POSTGRES_DB=[[DATABASE_NAME]] volumes: - - /data/persistent/gitea/database:/var/lib/postgresql/data + - /pwspool/software/gitea/database:/var/lib/postgresql/data diff --git a/grafana/docker-compose.yml.blanked b/grafana/docker-compose.yml.blanked index e205bda..42b3df5 100644 --- a/grafana/docker-compose.yml.blanked +++ b/grafana/docker-compose.yml.blanked @@ -23,7 +23,7 @@ services: - traefik_traefik-network volumes: - ./olomana.ini:/etc/grafana/grafana.ini - - /data/coldstorage/grafana_data:/var/lib/grafana + - /pwspool/software/grafana:/var/lib/grafana labels: - traefik.http.routers.grafana.rule=Host(`[[SITE_URL]]`) - traefik.http.routers.grafana.tls=true diff --git a/jenkins/docker-compose.yml.blanked b/jenkins/docker-compose.yml.blanked index ce723c1..a71fd06 100644 --- a/jenkins/docker-compose.yml.blanked +++ b/jenkins/docker-compose.yml.blanked @@ -14,7 +14,7 @@ services: privileged: true user: [[USER]] volumes: - - /data/coldstorage/jenkins:/var/jenkins_home + - /pwspool/software/jenkins:/var/jenkins_home - /var/run/docker.sock:/var/run/docker.sock - /usr/local/bin/docker:/usr/local/bin/docker labels: diff --git a/minecraft/docker-compose.yml.blanked b/minecraft/docker-compose.yml.blanked index c3a34de..81ba693 100644 --- a/minecraft/docker-compose.yml.blanked +++ b/minecraft/docker-compose.yml.blanked @@ -20,7 +20,7 @@ services: - "[[HOST_PORT_1]]:25565" - "[[METRICS_HOST_PORT_1]]:9225" volumes: - - /data/persistent/minecraft_creative:/data + - /pwspool/games/minecraft/minecraft_creative:/data environment: - TYPE=PAPER - MEMORY=2G @@ -51,7 +51,7 @@ services: - "[[METRICS_HOST_PORT_2]]:9225" - "[[DYNMAP_PORT]]:8123" volumes: - - /data/persistent/minecraft_2023:/data + - /pwspool/games/minecraft/minecraft_2023:/data environment: - TYPE=PAPER - MEMORY=4G @@ -82,7 +82,7 @@ services: ports: - "[[HOST_PORT_3]]:25565" volumes: - - /data/persistent/minecraft_skyblock:/data + - /pwspool/games/minecraft/minecraft_skyblock:/data environment: - TYPE=PAPER - MEMORY=4G @@ -104,7 +104,7 @@ services: ports: - 2565:2565 volumes: - - /data/persistent/minecraft_2023/world:/world + - /pwspool/games/minecraft/minecraft_2023/world:/world environment: - RCON_HOST=127.0.0.1 - RCON_PORT=[[HOST_PORT_2]] diff --git a/monica/docker-compose.yml.blanked b/monica/docker-compose.yml.blanked index 0f4a92b..27e632a 100644 --- a/monica/docker-compose.yml.blanked +++ b/monica/docker-compose.yml.blanked @@ -19,7 +19,7 @@ services: - DB_USERNAME=[[DATABASE_USERNAME]] - DB_PASSWORD=[[DATABASE_PASSWORD]] volumes: - - /data/persistent/monica/app:/var/www/html/storage + - /pwspool/software/monica/app:/var/www/html/storage restart: always labels: - traefik.http.routers.monica.rule=Host(`[[SITE_URL]]`) @@ -36,6 +36,6 @@ services: - MYSQL_USER=[[DATABASE_USERNAME]] - MYSQL_PASSWORD=[[DATABASE_PASSWORD]] volumes: - - /data/persistent/monica/db:/var/lib/mysql + - /pwspool/software/monica/db:/var/lib/mysql restart: always diff --git a/photoprism/docker-compose.yml.blanked b/photoprism/docker-compose.yml.blanked index 9daa5e1..ff4bf8a 100644 --- a/photoprism/docker-compose.yml.blanked +++ b/photoprism/docker-compose.yml.blanked @@ -14,8 +14,8 @@ services: - seccomp:unconfined - apparmor:unconfined volumes: - - /data/coldstorage/photoprism/storage:/photoprism/storage - - /data/coldstorage/photoprism/originals:/photoprism/originals + - /pwspool/software/photoprism/storage:/photoprism/storage + - /pwspool/software/photoprism/originals:/photoprism/originals environment: - PHOTOPRISM_ADMIN_USER=[[ADMIN_USER]] - PHOTOPRISM_ADMIN_PASSWORD=[[ADMIN_PASS]] @@ -48,8 +48,8 @@ services: ports: - "[[DIFFERENT_HOST_PORT]]:2342" volumes: - - /data/coldstorage/photoprism/storage:/photoprism/storage - - /data/coldstorage/photoprism/originals:/photoprism/originals + - /pwspool/software/photoprism/storage:/photoprism/storage + - /pwspool/software/photoprism/originals:/photoprism/originals environment: - PHOTOPRISM_READONLY=true - PHOTOPRISM_AUTH_MODE=public