From 1abf6850ee04d2f02087c0bfa6a3325198228851 Mon Sep 17 00:00:00 2001 From: Fl1tzi Date: Tue, 2 May 2023 18:50:07 +0200 Subject: [PATCH] new schema --- .gitignore | 12 ----------- forgejo/compose.sh | 33 +++++++++++++++++++++++++++++++ forgejo/compose.yaml | 30 ---------------------------- forgejo/scripts/fix_db_folders.sh | 18 +++++++++++++++++ minecraft/README.md | 1 + murmur/compose.sh | 13 ++++++++++++ murmur/compose.yaml | 19 ------------------ synapse/compose.sh | 20 +++++++++++++++++++ synapse/compose.yaml | 24 ---------------------- synapse/scripts/fix_db_folders.sh | 18 +++++++++++++++++ 10 files changed, 103 insertions(+), 85 deletions(-) create mode 100755 forgejo/compose.sh delete mode 100644 forgejo/compose.yaml create mode 100755 forgejo/scripts/fix_db_folders.sh create mode 100644 minecraft/README.md create mode 100755 murmur/compose.sh delete mode 100644 murmur/compose.yaml create mode 100755 synapse/compose.sh delete mode 100644 synapse/compose.yaml create mode 100755 synapse/scripts/fix_db_folders.sh diff --git a/.gitignore b/.gitignore index 8f1802d..8b13789 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1 @@ -# exclude everything -/* -/**/* - -# include these folders -!/forgejo/ -!/minecraft/ -!/synapse/ -!/murmur/ - -# include compose.yaml files -!**/compose.yaml diff --git a/forgejo/compose.sh b/forgejo/compose.sh new file mode 100755 index 0000000..6b82968 --- /dev/null +++ b/forgejo/compose.sh @@ -0,0 +1,33 @@ +#!/bin/bash + +podman pod create --name=forgejo \ + -p 127.0.0.1:3000:3000 \ + -p 2222:22 + +# PORTS: +# - 3000 = WEB +# - 2222 = SSH + +podman create \ + --pod=forgejo \ + --name=forgejo_db \ + --volume=./data/db:/var/lib/postgresql/data:Z \ + -e 'POSTGRES_DB=forgejo' \ + -e 'POSTGRES_USER=forgejouser' \ + --env-file=db.env \ + docker.io/postgres:latest + +# -e 'POSTGRES_PASSWORD=YOUR_DB_PASSWORD' \ + +podman create \ + --pod=forgejo \ + --name=forgejo_forgejo \ + --volume=./data/forgejo:/data:Z \ + -e 'GITEA__database__DB_TYPE=postgres' \ + -e 'GITEA__database__HOST=localhost' \ + -e 'GITEA__database__NAME=forgejo' \ + -e 'GITEA__database__USER=forgejouser' \ + --env-file=forgejo.env \ + codeberg.org/forgejo/forgejo:1.19 + +# -e 'GITEA__database__PASSWD=YOUR_DB_PASSWORD' \ diff --git a/forgejo/compose.yaml b/forgejo/compose.yaml deleted file mode 100644 index a602219..0000000 --- a/forgejo/compose.yaml +++ /dev/null @@ -1,30 +0,0 @@ -version: "3" - -services: - db: - image: docker.io/postgres:latest - volumes: - - ./data/db:/var/lib/postgresql/data - environment: - - POSTGRES_DB=forgejo - - POSTGRES_USER=forgejouser - # - POSTGRES_PASSWORD=YOUR_DB_PASSWORD - env_file: - - db.env - restart: on-failure - forgejo: - image: codeberg.org/forgejo/forgejo:1.19 - ports: - - "2222:22" - - "127.0.0.1:3000:3000" - volumes: - - ./data/forgejo:/data - environment: - - GITEA__database__DB_TYPE=postgres - - GITEA__database__HOST=db:5432 - - GITEA__database__NAME=forgejo - - GITEA__database__USER=forgejouser - # - GITEA__database__PASSWD=YOUR_DB_PASSWORD - env_file: - - forgejo.env - restart: on-failure diff --git a/forgejo/scripts/fix_db_folders.sh b/forgejo/scripts/fix_db_folders.sh new file mode 100755 index 0000000..c49da72 --- /dev/null +++ b/forgejo/scripts/fix_db_folders.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +# Rclone does not copy over empty directories. +# This just recreates some... + +BASE="../data/db" + +podman unshare \ + mkdir $BASE/pg_notify \ + mkdir $BASE/pg_tblspc \ + mkdir $BASE/pg_replslot \ + mkdir $BASE/pg_twophase \ + mkdir $BASE/pg_stat_tmp \ + mkdir $BASE/pg_logical/snapshots \ + mkdir $BASE/pg_logical/mappings \ + mkdir $BASE/pg_snapshots \ + mkdir $BASE/pg_commit_ts \ + diff --git a/minecraft/README.md b/minecraft/README.md new file mode 100644 index 0000000..485c486 --- /dev/null +++ b/minecraft/README.md @@ -0,0 +1 @@ +# DERPRECATED diff --git a/murmur/compose.sh b/murmur/compose.sh new file mode 100755 index 0000000..87d1d68 --- /dev/null +++ b/murmur/compose.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +podman create \ + --name=murmur \ + -p 64738:64738/tcp \ + -p 64738:64738/udp \ + --restart=on-failure \ + --volume=./data:/data:Z \ + -e 'MUMBLE_CUSTOM_CONFIG_FILE=/data/murmur.ini' \ + --env-file=murmur.env \ + docker.io/mumblevoip/mumble-server:latest + +# -e 'MUMBLE_SUPERUSER_PASSWORD=YOUR_SUPERUSER_PASSWORD' \ diff --git a/murmur/compose.yaml b/murmur/compose.yaml deleted file mode 100644 index 4e291b2..0000000 --- a/murmur/compose.yaml +++ /dev/null @@ -1,19 +0,0 @@ -version: "3" - -services: - murmur: - image: docker.io/mumblevoip/mumble-server:latest - restart: on-failure - environment: - - MUMBLE_CUSTOM_CONFIG_FILE=/data/murmur.ini - - MUMBLE_UID=0 - - MUMBLE_GID=0 - # - MUMBLE_SUPERUSER_PASSWORD=YOUR_SUPERUSER_PASSWORD - env_file: - - murmur.env - ports: - - 64738:64738 - - 64738:64738/udp - volumes: - - ./data:/data - diff --git a/synapse/compose.sh b/synapse/compose.sh new file mode 100755 index 0000000..f1d546f --- /dev/null +++ b/synapse/compose.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +podman pod create --name=synapse \ + -p 127.0.0.1:8008:8008 # SYNAPSE + +podman create \ + --pod=synapse \ + --name=synapse_db \ + --volume=./data/db:/var/lib/postgresql/data:Z \ + -e 'POSTGRES_USER=synapse' \ + -e 'POSTGRES_INITDB_ARGS=--lc-collate=C --lc-ctype=C --encoding=UTF-8 --locale=en_US.UTF-8' \ + --env-file=postgres.env \ + postgres + +podman create \ + --pod=synapse \ + --name=synapse_synapse \ + --volume=./data/synapse:/data:Z \ + docker.io/matrixdotorg/synapse:latest + diff --git a/synapse/compose.yaml b/synapse/compose.yaml deleted file mode 100644 index 2db161f..0000000 --- a/synapse/compose.yaml +++ /dev/null @@ -1,24 +0,0 @@ -version: "3" - -services: - postgres: - image: postgres - restart: always - volumes: - - $HOME/compose/synapse/data/postgresql:/var/lib/postgresql/data - environment: - - POSTGRES_USER=synapse - # - POSTGRES_PASSWORD=SAME_AS_IN_homeserver.yaml - - POSTGRES_INITDB_ARGS=--lc-collate=C --lc-ctype=C --encoding=UTF-8 --locale=en_US.UTF-8 - env_file: - - postgres.env - - synapse: - image: docker.io/matrixdotorg/synapse:latest - # 8448 is for federation and should be exposed on host (reverse proxy) - # 3478 is for TURN (voip calls) - ports: - - 127.0.0.1:8008:8008 - volumes: - - $HOME/compose/synapse/data:/data - diff --git a/synapse/scripts/fix_db_folders.sh b/synapse/scripts/fix_db_folders.sh new file mode 100755 index 0000000..c49da72 --- /dev/null +++ b/synapse/scripts/fix_db_folders.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +# Rclone does not copy over empty directories. +# This just recreates some... + +BASE="../data/db" + +podman unshare \ + mkdir $BASE/pg_notify \ + mkdir $BASE/pg_tblspc \ + mkdir $BASE/pg_replslot \ + mkdir $BASE/pg_twophase \ + mkdir $BASE/pg_stat_tmp \ + mkdir $BASE/pg_logical/snapshots \ + mkdir $BASE/pg_logical/mappings \ + mkdir $BASE/pg_snapshots \ + mkdir $BASE/pg_commit_ts \ +