From e302605d47174e1eade30d0040e76ac86c04ecec Mon Sep 17 00:00:00 2001 From: futile Date: Tue, 21 Jul 2026 10:27:39 +0100 Subject: [PATCH] update --- .env.example | 6 +++--- .gitignore | 2 +- Caddyfile | 6 +++--- README.md | 36 ++++++++++++++++++------------------ scripts/system-setup.sh | 12 +++++------- scripts/volume-backup.sh | 2 +- 6 files changed, 31 insertions(+), 33 deletions(-) diff --git a/.env.example b/.env.example index 86b60fd..cc1281b 100644 --- a/.env.example +++ b/.env.example @@ -1,16 +1,16 @@ # stalwart -STALWART_PUBLIC_URL=https://m.example.org +STALWART_PUBLIC_URL=https://post.example.org OIDC_KEY=GENERATE_STRING # openssl rand -hex 32 OIDC_SIGNATURE_KEY=GENERATE_PEM # openssl genpkey -algorithm EC -pkeyopt ec_paramgen_curve:secp384r1 -pkeyopt ec_param_enc:named_curve # bulwark -JMAP_SERVER_URL=https://m.example.org +JMAP_SERVER_URL=https://post.example.org SESSION_SECRET=GENERATE_STRING # openssl rand -hex 32 SETTINGS_SYNC_ENABLED=true ADMIN_PASSWORD=GENERATE_PASSWORD # tr -dc 'A-Za-z0-9' < /dev/urandom | head -c 20; echo # vykar VYKAR_LABEL=borgbase -VYKAR_URL=https://myrepo.repo.borgbase.com +VYKAR_URL=https://REPO.repo.borgbase.com VYKAR_ACCESS_TOKEN=ACCESS_TOKEN VYKAR_ENCRYPTION_SECRET=GENERATE_STRING # openssl rand -hex 32 diff --git a/.gitignore b/.gitignore index 4c49bd7..03bd412 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -.env +*.env diff --git a/Caddyfile b/Caddyfile index f338131..55116fd 100644 --- a/Caddyfile +++ b/Caddyfile @@ -3,14 +3,14 @@ # acme_ca https://acme-staging-v02.api.letsencrypt.org/directory # } -mail.yaoi.dog { +post.atom.town { reverse_proxy stalwart:8080 } -post.yaoi.dog { +mail.atom.town { reverse_proxy bulwark:3000 } -git.yaoi.dog { +git.atom.town { reverse_proxy gitea:3000 } diff --git a/README.md b/README.md index ad8b5fb..40be7ef 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# thingy! +# atom.town! some kind of hosting setup @@ -11,11 +11,11 @@ some kind of hosting setup - `sudo su - admin` 3. use the system setup script, and log out - `sudo dnf install git -y` - - `git clone https://gitlab.com/futile/thingy` - - `./thingy/scripts/system-setup.sh` + - `git clone https://gitlab.com/futile/atom.town` + - `./atom.town/scripts/system-setup.sh` - `exit` 4. log in again, populate the `.env` and start everything up - - `cd thingy` + - `cd atom.town` - `micro .env` - `docker compose up` 5. continue with service-specific setups ..... @@ -32,17 +32,17 @@ specifics for everything - **bulwark** – webmail - **gitea** – git server - via caddy - - `mail.yaoi.dog` – mail (server & admin dash) - - `post.yaoi.dog` – mail (webmail) - - `git.yaoi.dog` – git + - `post.atom.town` – mailserver, mail admin, and oidc + - `mail.atom.town` – webmail + - `git.atom.town` – git **dns setup** | type | host | value | notes | |-------|-----------|---------------------------- |----------------------------| | `A` | `@` | `` | apex domain | -| `A` | `mail` | `` | mailserver | -| `A` | `post` | `` | webmail | +| `A` | `post` | `` | mailserver | +| `A` | `mail` | `` | webmail | | `A` | `git` | `` | gitea | | `CAA` | `@` | `0 issue "letsencrypt.org"` | allow caddy to issue certs | @@ -57,8 +57,8 @@ specifics for everything initial setup 1. server identity - - server hostname: `mail.yaoi.dog` - - default email domain: `yaoi.dog` + - server hostname: `mail.atom.town` + - default email domain: `atom.town` - automatically obtain tls certificate: `true` - generate email signing keys: `true` 2. storage @@ -119,15 +119,15 @@ specifics for everything - path: `/data/gitea/gitea.db` - general settings - site title: `We cock. Dick. BALLING.` - - server domain: `git.yaoi.dog` + - server domain: `git.atom.town` - ssh server port: `22` - - gitea base url: `https://git.yaoi.dog/` + - gitea base url: `https://git.atom.town/` - enable update checker: `true` - email settings - - smtp host: `mail.yaoi.dog` + - smtp host: `mail.atom.town` - smtp port: `465` - - send email as: `"Gitea" ` - - smtp username: `system@yaoi.dog` + - send email as: `"Gitea" ` + - smtp username: `system@atom.town` - smtp password: `` - enable email notifications: `true` - server and third-party service settings @@ -135,7 +135,7 @@ specifics for everything - disable self-registration: `false` - allow registration only through external services: `true` - enable openid self-registration: `true` - - hidden email domain: `git.yaoi.dog` + - hidden email domain: `git.atom.town` - password hash algorithm: `argon2` @@ -152,7 +152,7 @@ always remember to `docker compose stop` before doing any of this! - to back up automatically, run `sudo EDITOR=micro crontab -e` and add the following: ``` TZ=UTC - 0 6 * * * /home/admin/thingy/scripts/volume-backup.sh + 0 6 * * * /home/admin/atom.town/scripts/volume-backup.sh ``` **restoring** diff --git a/scripts/system-setup.sh b/scripts/system-setup.sh index 50db5dd..8295aa7 100755 --- a/scripts/system-setup.sh +++ b/scripts/system-setup.sh @@ -19,14 +19,12 @@ function banner() { fi } -# https://patorjk.com/software/taag/#p=display&f=Small+Slant cat << 'EOF' - __ __ _ - / /_/ / (_)__ ___ ___ __ -/ __/ _ \/ / _ \/ _ `/ // / -\__/_//_/_/_//_/\_, /\_, / - /___//___/ - ..... brought to you by futile + __ __ + ___ _/ /____ __ _ / /____ _ _____ +/ _ `/ __/ _ \/ ' \_/ __/ _ \ |/|/ / _ \ +\_,_/\__/\___/_/_/_(_)__/\___/__,__/_//_/ + ..... brought to you by futile EOF diff --git a/scripts/volume-backup.sh b/scripts/volume-backup.sh index bc2fd51..929d98d 100755 --- a/scripts/volume-backup.sh +++ b/scripts/volume-backup.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -euo pipefail -WORKING_DIR="/home/admin/thingy" # todo: better +WORKING_DIR="/home/admin/atom.town" # todo: better LOG_FILE="/var/log/volume-backup.log" function log() {