From 936263f5e15a2b20bd14cd013a00f545dfe409a2 Mon Sep 17 00:00:00 2001 From: Penelope Gwen Date: Mon, 10 Mar 2025 21:41:01 -0700 Subject: [PATCH] 2025-03-10 update --- .env_template | 56 +------------------ .gitignore | 2 + debian/debian.env_template | 2 + debian.yml => debian/docker-compose.yml | 2 +- emulators.yml => emulators/docker-compose.yml | 0 emulators/emulators.env_template | 3 + gitea.yml => gitea/docker-compose.yml | 1 + gitea/gitea.env_template | 12 ++++ libretranslate/docker-compose.yml | 22 ++++++++ libretranslate/libretranslate.env_template | 2 + mastodon.yml => mastodon/docker-compose.yml | 3 + mastodon/mastodon.env_template | 15 +++++ matrix.yml => matrix/docker-compose.yml | 0 matrix/matrix.env_template | 8 +++ monitoring.yml | 13 ----- nextcloud.yml => nextcloud/docker-compose.yml | 6 +- nextcloud/nextcloud.env_template | 3 + pixelfed/docker-compose.yml | 56 +++++++++++++++++++ pixelfed/pixelfed.env_template | 5 ++ protonmail/docker-compose.yml | 11 ++++ protonmail/protonmail.env_template | 1 + rebble.yml | 22 -------- startall.sh | 16 ------ updategit.sh | 8 --- webhosting/docker-compose.yml | 30 ++++++++++ webhosting/webhosting.env_template | 4 ++ 26 files changed, 186 insertions(+), 117 deletions(-) create mode 100644 debian/debian.env_template rename debian.yml => debian/docker-compose.yml (88%) rename emulators.yml => emulators/docker-compose.yml (100%) create mode 100644 emulators/emulators.env_template rename gitea.yml => gitea/docker-compose.yml (97%) create mode 100644 gitea/gitea.env_template create mode 100644 libretranslate/docker-compose.yml create mode 100644 libretranslate/libretranslate.env_template rename mastodon.yml => mastodon/docker-compose.yml (92%) create mode 100644 mastodon/mastodon.env_template rename matrix.yml => matrix/docker-compose.yml (100%) create mode 100644 matrix/matrix.env_template delete mode 100644 monitoring.yml rename nextcloud.yml => nextcloud/docker-compose.yml (84%) create mode 100644 nextcloud/nextcloud.env_template create mode 100644 pixelfed/docker-compose.yml create mode 100644 pixelfed/pixelfed.env_template create mode 100644 protonmail/docker-compose.yml create mode 100644 protonmail/protonmail.env_template delete mode 100644 rebble.yml delete mode 100755 startall.sh delete mode 100755 updategit.sh create mode 100644 webhosting/docker-compose.yml create mode 100644 webhosting/webhosting.env_template diff --git a/.env_template b/.env_template index c53653a..d95f0cd 100644 --- a/.env_template +++ b/.env_template @@ -10,69 +10,17 @@ DATA_PATH= DD_SITE= DD_API_KEY= -#MASTODON -MASTODON_DB_USER= -MASTODON_DB_PASS= - -MASTODON_DOMAIN= -MASTODON_WEB_DOMAIN= - -MASTODON_SECRET_KEY_BASE= -MASTODON_OTP_SECRET= - -MASTODON_VAPID_PRIVATE_KEY= -MASTODON_VAPID_PUBLIC_KEY= - +#smtp SMTP_SERVER= SMTP_PORT= SMTP_USER= SMTP_PASS= SMTP_FROM= +#ldap LDAP_SERVER= LDAP_PORT= LDAP_BASE= LDAP_FILTER= LDAP_BIND_DN= LDAP_BIND_PASS= - -#SYNAPSE -MATRIX_SERVER= - -SYNAPSE_DB_USER= -SYNAPSE_DB_PASS= - -#GITEA -GITEA_URL= - -GITEA_DB_ROOT_PASS= -GITEA_DB_NAME= -GITEA_DB_USER= -GITEA_DB_PASS= - -GITEA_RUNNER_TOKEN= -GITEA_RUNNER_NAME= - -#Rebble -REBBLE_SPEECH_KEY= -REBBLE_WEATHER_KEY= - -#PORTS -MASTODON_HTTP_PORT= -MASTODON_HTTPS_PORT= - -SYNAPSE_DB_PORT= -MATRIX_PORT= -RIOT_PORT= - -EMUJS_BACKEND_PORT= -EMUJS_PORT= - -GL_HTTP_PORT= -GL_SSH_PORT= - -REBBLE_ASR_PORT= -REBBLE_WEATHER_PORT= - -GITEA_HTTP_PORT= -GITEA_SSH_PORT= diff --git a/.gitignore b/.gitignore index 4c49bd7..cc75f65 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ .env +**/.env +**/*.env diff --git a/debian/debian.env_template b/debian/debian.env_template new file mode 100644 index 0000000..a4fd47d --- /dev/null +++ b/debian/debian.env_template @@ -0,0 +1,2 @@ +#ports +APTLY_PORT= diff --git a/debian.yml b/debian/docker-compose.yml similarity index 88% rename from debian.yml rename to debian/docker-compose.yml index caed4d0..a5cf47f 100644 --- a/debian.yml +++ b/debian/docker-compose.yml @@ -6,7 +6,7 @@ services: image: urpylka/aptly:latest container_name: aptly ports: - - "89:80" + - "${APTLY_PORT}:80" volumes: - ${DATA_PATH}/aptly/data:/opt/aptly logging: diff --git a/emulators.yml b/emulators/docker-compose.yml similarity index 100% rename from emulators.yml rename to emulators/docker-compose.yml diff --git a/emulators/emulators.env_template b/emulators/emulators.env_template new file mode 100644 index 0000000..dc2ee48 --- /dev/null +++ b/emulators/emulators.env_template @@ -0,0 +1,3 @@ +#ports +EMUJS_BACKEND_PORT= +EMUJS_PORT= diff --git a/gitea.yml b/gitea/docker-compose.yml similarity index 97% rename from gitea.yml rename to gitea/docker-compose.yml index d42a7f8..202beac 100644 --- a/gitea.yml +++ b/gitea/docker-compose.yml @@ -27,6 +27,7 @@ services: ports: - "${GITEA_HTTP_PORT}:3000" - "${GITEA_SSH_PORT}:22" + - "${GITEA_SSH_LOCAL_PORT}:22" depends_on: - gitea-db diff --git a/gitea/gitea.env_template b/gitea/gitea.env_template new file mode 100644 index 0000000..79a7417 --- /dev/null +++ b/gitea/gitea.env_template @@ -0,0 +1,12 @@ +#gitea +GITEA_URL= +GITEA_DB_ROOT_PASS= +GITEA_DB_NAME= +GITEA_DB_USER= +GITEA_DB_PASS= +GITEA_RUNNER_TOKEN= +GITEA_RUNNER_NAME= +#ports +GITEA_HTTP_PORT= +GITEA_SSH_PORT= +GITEA_SSH_LOCAL_PORT= diff --git a/libretranslate/docker-compose.yml b/libretranslate/docker-compose.yml new file mode 100644 index 0000000..3c4eb31 --- /dev/null +++ b/libretranslate/docker-compose.yml @@ -0,0 +1,22 @@ +version: "3.8" + +volumes: + libretranslate_api_keys: + libretranslate_models: + +services: + + libretranslate: + image: libretranslate/libretranslate + container_name: libretranslate + volumes: + - libretranslate_api_keys:/app/db + - libretranslate_models:/home/libretranslate/.local:rw + ports: + - "${LIBRETRANSLATE_PORT}:5000" + environment: + - LT_API_KEYS=true + - LT_REQ_LIMIT=5 + - LT_API_KEYS_DB_PATH=/app/db/api + - LT_UPDATE_MODELS=true + restart: unless-stopped diff --git a/libretranslate/libretranslate.env_template b/libretranslate/libretranslate.env_template new file mode 100644 index 0000000..d00463a --- /dev/null +++ b/libretranslate/libretranslate.env_template @@ -0,0 +1,2 @@ +#ports +LIBRETRANSLATE_PORT= diff --git a/mastodon.yml b/mastodon/docker-compose.yml similarity index 92% rename from mastodon.yml rename to mastodon/docker-compose.yml index 0511e75..1e5f506 100644 --- a/mastodon.yml +++ b/mastodon/docker-compose.yml @@ -60,6 +60,9 @@ services: - OTP_SECRET=${MASTODON_OTP_SECRET} - VAPID_PRIVATE_KEY=${MASTODON_VAPID_PRIVATE_KEY} - VAPID_PUBLIC_KEY=${MASTODON_VAPID_PUBLIC_KEY} + - ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=${MASTODON_REC_DET_KEY} + - ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=${MASTODON_REC_DER_SALT} + - ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=${MASTODON_REC_PRIM_KEY} - SMTP_SERVER=${SMTP_SERVER} - SMTP_PORT=${SMTP_PORT} - SMTP_LOGIN=${SMTP_USER} diff --git a/mastodon/mastodon.env_template b/mastodon/mastodon.env_template new file mode 100644 index 0000000..19bdad0 --- /dev/null +++ b/mastodon/mastodon.env_template @@ -0,0 +1,15 @@ +#mastodon +MASTODON_DB_USER= +MASTODON_DB_PASS= +MASTODON_DOMAIN= +MASTODON_WEB_DOMAIN= +MASTODON_SECRET_KEY_BASE= +MASTODON_OTP_SECRET= +MASTODON_VAPID_PRIVATE_KEY= +MASTODON_VAPID_PUBLIC_KEY= +MASTODON_REC_DET_KEY= +MASTODON_REC_DER_SALT= +MASTODON_REC_PRIM_KEY= +#ports +MASTODON_HTTP_PORT= +MASTODON_HTTPS_PORT= diff --git a/matrix.yml b/matrix/docker-compose.yml similarity index 100% rename from matrix.yml rename to matrix/docker-compose.yml diff --git a/matrix/matrix.env_template b/matrix/matrix.env_template new file mode 100644 index 0000000..90ef413 --- /dev/null +++ b/matrix/matrix.env_template @@ -0,0 +1,8 @@ +#synapse +MATRIX_SERVER= +SYNAPSE_DB_USER= +SYNAPSE_DB_PASS= +#ports +SYNAPSE_DB_PORT= +MATRIX_PORT= +RIOT_PORT= diff --git a/monitoring.yml b/monitoring.yml deleted file mode 100644 index 3316e5d..0000000 --- a/monitoring.yml +++ /dev/null @@ -1,13 +0,0 @@ -version: "3.8" - -services: - - portainer_agent: #Portainer is a web UI for managing your docker containers. This container is just the agent which you need to pair with the portainer-ce host container https://www.portainer.io/ - image: portainer/agent:2.19.3 - container_name: portainer_agent - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - /var/lib/docker/volumes:/var/lib/docker/volumes - ports: - - "9001:9001" - restart: always diff --git a/nextcloud.yml b/nextcloud/docker-compose.yml similarity index 84% rename from nextcloud.yml rename to nextcloud/docker-compose.yml index 8086ef3..332a1c3 100644 --- a/nextcloud.yml +++ b/nextcloud/docker-compose.yml @@ -11,13 +11,13 @@ services: image: nextcloud/all-in-one:latest container_name: nextcloud-aio-mastercontainer environment: - - APACHE_PORT=11000 + - APACHE_PORT=${NC_AIO_APACHE_PORT} - APACHE_IP_BINDING=0.0.0.0 - NEXTCLOUD_DATADIR=${DATA_PATH}/nextcloud-aio/nextcloud - - NEXTCLOUD_MOUNT=/mnt/2TB/local/ + - NEXTCLOUD_MOUNT=${DATA_PATH}/local/ volumes: - nextcloud_aio_mastercontainer:/mnt/docker-aio-config:rw - '/var/run/docker.sock:/var/run/docker.sock:ro' ports: - - 8080:8080 + - ${NC_AIO_PORT}:8080 restart: always diff --git a/nextcloud/nextcloud.env_template b/nextcloud/nextcloud.env_template new file mode 100644 index 0000000..2cdf882 --- /dev/null +++ b/nextcloud/nextcloud.env_template @@ -0,0 +1,3 @@ +#ports +NC_AIO_PORT= +NC_AIO_APACHE_PORT= diff --git a/pixelfed/docker-compose.yml b/pixelfed/docker-compose.yml new file mode 100644 index 0000000..0df9127 --- /dev/null +++ b/pixelfed/docker-compose.yml @@ -0,0 +1,56 @@ +version: "2" + +services: + + pixelfed-app: + image: zknt/pixelfed + container_name: pixelfed-app + restart: unless-stopped + env_file: + - ${DATA_PATH}/pixelfed/env + volumes: + - "${DATA_PATH}/pixelfed/storage:/var/www/storage" + - "${DATA_PATH}/pixelfed/env:/var/www/.env" + ports: + - ${PIXELFED_PORT}:80 + depends_on: + - pixelfed-db + - pixelfed-redis + + pixelfed-worker: + image: zknt/pixelfed + container_name: pixelfed-worker + restart: unless-stopped + env_file: + - ${DATA_PATH}/pixelfed/env + volumes: + - "${DATA_PATH}/pixelfed/storage:/var/www/storage" + - "${DATA_PATH}/pixelfed/env:/var/www/.env" + entrypoint: /worker-entrypoint.sh + depends_on: + - pixelfed-db + - pixelfed-redis + - pixelfed-app + healthcheck: + test: php artisan horizon:status | grep running + interval: 60s + timeout: 5s + retries: 1 + + pixelfed-db: + image: zknt/mariadb + container_name: pixelfed-db + restart: unless-stopped + env_file: + - ${DATA_PATH}/pixelfed/env + environment: + - MYSQL_ROOT_PASSWORD=${PIXELFED_MYSQL_PASS} + volumes: + - "${DATA_PATH}/pixelfed/db:/var/lib/mysql" + + pixelfed-redis: + image: zknt/redis + container_name: pixelfed-redis + restart: unless-stopped + volumes: + - "${DATA_PATH}/pixelfed/redis:/data" diff --git a/pixelfed/pixelfed.env_template b/pixelfed/pixelfed.env_template new file mode 100644 index 0000000..9e3efbc --- /dev/null +++ b/pixelfed/pixelfed.env_template @@ -0,0 +1,5 @@ +#pixelfed +#PIXELFED_MYSQL_PASS= +PIXELFED_MYSQL_PASS= +#ports +PIXELFED_PORT= diff --git a/protonmail/docker-compose.yml b/protonmail/docker-compose.yml new file mode 100644 index 0000000..d7ee1e3 --- /dev/null +++ b/protonmail/docker-compose.yml @@ -0,0 +1,11 @@ +version: "3.8" + +services: + + protonmail-bridge: + container_name: protonmail-bridge + volumes: + - ${DATA_PATH}/protonmail-bridge:/root + network_mode: host + restart: unless-stopped + image: ganeshlab/protonmail-bridge diff --git a/protonmail/protonmail.env_template b/protonmail/protonmail.env_template new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/protonmail/protonmail.env_template @@ -0,0 +1 @@ + diff --git a/rebble.yml b/rebble.yml deleted file mode 100644 index e3b4c97..0000000 --- a/rebble.yml +++ /dev/null @@ -1,22 +0,0 @@ -version: "3.8" - -services: - - rebble-asr-pogmom: - image: rebble-asr-pogmom - container_name: rebble-asr-pogmom - ports: - - "${REBBLE_ASR_PORT}:443" - environment: - - SPEECH_API_KEY=${REBBLE_SPEECH_KEY} - restart: always - - rebble-weather-pogmom: - image: rebble-weather-pogmom - container_name: rebble-weather-pogmom - ports: - - "${REBBLE_WEATHER_PORT}:5000" - environment: - - IBM_API_KEY=${REBBLE_WEATHER_KEY} - - FLASK_APP=weather - restart: always diff --git a/startall.sh b/startall.sh deleted file mode 100755 index 87b3606..0000000 --- a/startall.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -script_root="$( dirname $0 )" - -for y in "${script_root}"/*.yml;do - by="$(basename $y)" -# sudo docker-compose -f "${y}" -p "${by//.}" down - sudo docker-compose -f "${y}" pull - sudo docker-compose -f "${y}" -p "${by//.}" up -d -done - -for r in "${script_root}/docker_runs/"*.sh;do - bash -c "${r}" -done - -sudo docker image prune -f diff --git a/updategit.sh b/updategit.sh deleted file mode 100755 index 8532498..0000000 --- a/updategit.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -cp .env .env_template -sed -i 's/=.*/=/' .env_template - -git add . -git commit -m "New backup `date +'%Y-%m-%d %H:%M:%S'`" -git push diff --git a/webhosting/docker-compose.yml b/webhosting/docker-compose.yml new file mode 100644 index 0000000..df0621c --- /dev/null +++ b/webhosting/docker-compose.yml @@ -0,0 +1,30 @@ +version: "3.8" + +services: + + resume-nginx: + image: nginx + container_name: resume-nginx + volumes: + - ${DATA_PATH}/webhosting/resume/src:/usr/share/nginx/html + ports: + - ${RESUME_NGINX_PORT}:80 + restart: unless-stopped + + pogmom-suite-nginx: + image: nginx + container_name: pogmom-suite-nginx + volumes: + - ${DATA_PATH}/webhosting/pogmom-suite/pogmom-suite:/usr/share/nginx/html + ports: + - ${POGMOM_SUITE_NGINX_PORT}:80 + restart: unless-stopped + + pogmomme-nginx: + image: nginx + container_name: pogmomme-nginx + volumes: + - ${DATA_PATH}/webhosting/pogmomme/pogmomme:/usr/share/nginx/html + ports: + - ${POGMOM_NGINX_PORT}:80 + restart: unless-stopped diff --git a/webhosting/webhosting.env_template b/webhosting/webhosting.env_template new file mode 100644 index 0000000..ce0145d --- /dev/null +++ b/webhosting/webhosting.env_template @@ -0,0 +1,4 @@ +#ports +RESUME_NGINX_PORT= +POGMOM_SUITE_NGINX_PORT= +POGMOM_NGINX_PORT=