Don't try to decrypt the Caddyfile

It's back to plain text

.gitea/workflows/check.yaml

@@ -1,15 +1,16 @@
 name: Check
-on: [push]
+"on": [push]
 jobs:
   "Lint Ansible Files":
-    runs-on: ubuntu-22.04
+    runs-on: node-22-bookworm
     steps:
       - run: apt-get update
+      - run: apt-get upgrade -y
       - run: apt-get install -y python3 python3-pip python3-venv
       - run: python3 --version
       - name: Check out repo
         uses: actions/checkout@v3
       - run: python3 -m venv venv
-      - run: venv/bin/pip --disable-pip-version-check install ansible==7.2.0 ansible-lint==6.16.1 > /dev/null 2> /dev/null
+      - run: venv/bin/pip --disable-pip-version-check install ansible==12.0.0 ansible-lint==25.8.2
       - run: venv/bin/ansible-lint -c .ansible-lint ansible
   # TODO: Reimplement ansible-play --check step from old drone config

README.md

@@ -4,8 +4,8 @@
 
 | Prop | Value |
 | --- | --- |
-| Hostname | `shamash` |
+| Hostname | `nanna` |
-| Domains  | `{,pad.,codi.,ci.,git.,jupyter.,plantuml.}pbrinkmeier.de`, `tichy.click`, `beany.club`, `vmd98928.contaboserver.net` |
+| Domains  | `{,pad.,codi.,git.,plantuml.}pbrinkmeier.de`, `tichy.click`, `{utoy,vrnp}.beany.club` |
 
 ## Linting
 
@@ -17,3 +17,10 @@ ansible-lint --offline
 ```
 
 to avoid checking for a new version every single run.
+
+## TODO
+
+- [x] Migrate to `community.docker.docker_compose_v2` (`v1` is deprecated)
+- [x] Nix Gitea Action runner
+- [x] Install but disable zomboid server
+- [x] Download volume for yore

TODO.md

@@ -5,14 +5,11 @@
 - [x] Use `/var/lib/pbri/docker/...` instead of Docker volumes (makes backups easier)
     - [x] Make it inaccessible to anyone but root (`-rw------`)
 - [x] Add [Drone runner](https://docs.drone.io/runner/docker/installation/linux/)
-- [ ] Figure out how to dependably store `.env` files (Ansible vault? Something else?)
+- [x] Figure out how to dependably store `.env` files (Ansible vault? Something else?)
-    - [ ] In vault, seperate from other config
+    - [x] In vault, seperate from other config
 - [x] Check out docker swarm and current best practices for Ansible
 - [x] Use Gitea instead of GitLab
-- [ ] Add drone exec runner for Nix builds with shared `/nix`
-- [ ] Lint caddy file, add gzip and disable admin interface
 - [x] Make Gitea display graphs in Notebooks (see https://docs.gitea.io/en-us/external-renderers/).
 - [x] Factorio server
-- [ ] Add flag for Gitea backups (after which Gitea will be up but no contain the sites source code)
 - [x] Add Gitea actions
-- [ ] Remove drone
+- [x] Remove drone

ansible/README.md

@@ -9,25 +9,26 @@ To drop into a shell with `ansible-*` commands, run:
 nix develop
 ```
 
-## `misc.yaml`
+## `nanna-setup.yaml`
 
-Server for miscellaneous stuff, e.g. the website.
+Small VPS for self-hosted services.
-Expects to have a user `andi` who can `sudo`.
+Expects to have a user `paul` who can `sudo`.
 Sets up:
 
 - Some basic packages
-- Docker and `docker-compose` (the latter via `pip`)
+- Docker and `docker-compose`
 - Nix multi-user installation
 
-## `misc-docker.yaml`
+## `nanna-docker.yaml`
 
-Deploys Docker configurations from `../docker`:
+Deploys Docker Compose configurations from `../docker`:
 
 - Sets up the docker network `caddy-network` for services that are reverse proxied by caddy
 - Copies configuration into `/etc/pbri/docker`
 - Creates folder `/var/lib/pbri/docker` for storing application files
 - Creates users with `42xxx` UIDs for running containers
+- `docker compose {up,down}`s all enabled/disabled services
 
-## `misc-sites.yaml`
+## `nanna-sites.yaml`
 
 Checks out static sites into `/home/paul/Sites` which is mounted into `/srv` in the Caddy container.

ansible/group_vars/gods/vars.yaml

@@ -0,0 +1,18 @@
+---
+ansible_python_interpreter: /usr/bin/python3
+gods_users:
+  - name: postgres
+    uid: 70
+    state: present
+  - name: hackmd
+    uid: 1500
+    state: present
+  - name: gitea
+    uid: 42001
+    state: present
+  - name: caddy
+    uid: 42002
+    state: present
+  - name: yore
+    uid: 42004
+    state: present

ansible/group_vars/misc/vars.yaml

@@ -1,4 +0,0 @@
----
-# Has pw-less sudo
-ansible_user: paul
-ansible_python_interpreter: /usr/bin/python3

ansible/host_vars/nanna/vars.yaml

@@ -0,0 +1,10 @@
+$ANSIBLE_VAULT;1.1;AES256
+62643463383563343863376537643438356663636666356636346465613165363231653664323164
+3137343761613064616566656133346339613462333330360a626431653366643162316435373066
+65323863373361363765623563653863366338616564623532363233646466316539376666356564
+3034393930376630350a396632393262316238663162346533343464386135666364383663313539
+63393536353334666432393639616130636232343630626235663337393438336430666637663133
+65316161646161376333376330353063363966383936396566323633366435663835346564356137
+65633262623133373865643230303236663532623863386264326662393364396636306537653264
+62326264393039343733643138313639333635366532383137613131656163356534303738336338
+6339

ansible/inventory

@@ -1,2 +1,2 @@
-[misc]
+[gods]
-vmd98928.contaboserver.net ansible_port=2309
+nanna

ansible/playbooks/misc-all.yaml

@@ -1,8 +0,0 @@
-# All tasks for misc, use this to check whether everything is deployed.
----
-- name: Set up basic packages, Docker, Nix, sshd
-  import_playbook: misc-setup.yaml
-- name: Deploy Docker configuration
-  import_playbook: misc-docker.yaml
-- name: Check out static websites from git
-  import_playbook: misc-sites.yaml

ansible/playbooks/misc-setup.yaml

@@ -1,74 +0,0 @@
----
-- name: Basic setup for shamash (packages, Docker, Nix, sshd)
-  hosts: misc
-  tasks:
-    - name: Create /etc/pbri
-      become: true
-      ansible.builtin.file:
-        path: /etc/pbri
-        state: directory
-        mode: u=rwx,g=rx,o=rx
-    - name: Create /home/paul/{Sites,Source}
-      become: true
-      ansible.builtin.file:
-        path: "/home/paul/{{ item }}"
-        state: directory
-        owner: paul
-        group: paul
-        mode: u=rwx,g=rx,o=rx
-      loop:
-        - Sites
-        - Source
-    - name: Install basic packages
-      become: true
-      ansible.builtin.apt:
-        name:
-          - vim
-          - git
-          - htop
-          - tmux
-        update_cache: true
-      tags:
-        - apt
-    - name: Install and set up Docker and docker-compose
-      ansible.builtin.include_role:
-        name: docker
-    - name: Install and set up Nix
-      ansible.builtin.include_role:
-        name: install_nix
-    - name: Install pip prerequisites
-      become: true
-      ansible.builtin.apt:
-        name:
-          - python3-pip
-          - python3-setuptools
-          - python3-virtualenv
-    - name: Install global python docker package
-      become: true
-      ansible.builtin.pip:
-        name:
-          - docker
-          - docker-compose
-          - requests
-    - name: Configure sshd
-      become: true
-      ansible.builtin.copy:
-        dest: /etc/ssh/sshd_config.d/00_pbri.conf
-        mode: u=rw,g=r,o=r
-        # Included by /etc/ssh/sshd_config before other configuration
-        content: |
-          Port 2309
-          PermitRootLogin no
-          PubkeyAuthentication yes
-          AuthorizedKeysFile .ssh/authorized_keys
-          PasswordAuthentication no
-        validate: /usr/sbin/sshd -T -f %s
-      notify:
-        - Restart sshd
-
-  handlers:
-    - name: Restart sshd
-      become: true
-      ansible.builtin.service:
-        name: sshd
-        state: restarted

ansible/playbooks/misc-sites.yaml

@@ -1,18 +0,0 @@
----
-- name: Check out static sites hosted on shamash
-  hosts: misc
-  tasks:
-    - name: Check out static sites
-      ansible.builtin.include_role:
-        name: checkout_static_sites
-      vars:
-        checkout_static_sites:
-          checkouts:
-            - path: /home/paul/Sites/pbrinkmeier.de
-              url: https://git.pbrinkmeier.de/paul/pbrinkmeier.de
-              commit: 680ac7d9c44752f57436d0ecb9c8018205a5fc0f
-              owner: paul
-            - path: /home/paul/Sites/tichy.click
-              url: https://github.com/pbrinkmeier/tichy-clicker
-              commit: 7dfb14183c765e3661fda84a7e89c2f73ca86f26
-              owner: paul

ansible/playbooks/nanna-docker.yaml

@@ -1,39 +1,25 @@
 ---
-- name: Update Docker configuration on shamash
+- name: Update Docker configuration
-  hosts: misc
+  hosts: gods
   tasks:
+    - name: Add groups
+      become: true
+      ansible.builtin.group:
+        name: "{{ item.name }}"
+        gid: "{{ item.uid }}"
+        state: "{{ item.state }}"
+        system: true
+      loop: "{{ gods_users }}"
     - name: Add users for running containers
       become: true
       ansible.builtin.user:
         name: "{{ item.name }}"
         uid: "{{ item.uid }}"
+        group: "{{ item.name }}"
         state: "{{ item.state }}"
         create_home: false
         system: true
-      loop:
+      loop: "{{ gods_users }}"
-        - name: jupyter
-          uid: 42000
-          state: present
-        - name: gitea
-          uid: 42001
-          state: present
-        - name: score
-          uid: 42003
-          state: present
-        - name: factorio
-          uid: 845
-          state: present
-        - name: hackmd
-          uid: 1500
-          state: present
-
-        - name: hedgedoc
-          uid: 10000
-          state: absent
-        - name: bsa
-          uid: 42002
-          state: absent
-    # All services that are behind Caddy need to be in this network
     - name: Create Caddy network
       become: true
       community.docker.docker_network:
@@ -48,26 +34,6 @@
         mode: u=rw,g=,o=
         # Directories should be listable
         directory_mode: u=rwx,g=rx,o=rx
-    - name: Upload and decrypt docker environment vars
-      become: true
-      ansible.builtin.copy:
-        src: "../../docker/envs/{{ item.name }}/.env"
-        dest: /etc/pbri/docker/{{ item.name }}/.env
-        # Files should inaccessible to non-root users.
-        mode: u=rw,g=,o=
-        # This is true by default but I put it here anyways
-        # to emphasize what's happening
-        decrypt: true
-      # Not quite happy with all the seperate loops yet.
-      loop:
-        - name: codi
-          state: present
-        - name: drone
-          state: present
-        - name: factorio
-          state: present
-        - name: gitea
-          state: present
     - name: Create directory for docker volumes
       become: true
       ansible.builtin.file:
@@ -75,7 +41,28 @@
         state: directory
         # Hide contents from non-root users
         mode: u=rwx,g=,o=
-    - name: Create jupyter folders
+    - name: Upload and decrypt docker environment vars
+      become: true
+      ansible.builtin.copy:
+        src: "../../docker/envs/{{ item.path }}"
+        dest: "/etc/pbri/docker/{{ item.path }}"
+        # Files should inaccessible to non-root users.
+        mode: u=rw,g=,o=
+        # This is true by default but I put it here anyways
+        # to emphasize what's happening
+        decrypt: true
+      loop:
+        - path: gitea/.env
+        - path: codi/.env
+        - path: vrnp/.env
+        - path: zomboid/.env
+        - path: yore/.env
+        - path: factorio/.env
+        - path: hitparade/.env
+        - path: hitparade/pollmaster-config.yml
+    # This needs to be done for any services where user:
+    # is set in docker-compose.yaml.
+    - name: Create volume directories with correct permissions
       become: true
       ansible.builtin.file:
         path: "/var/lib/pbri/docker/{{ item.name }}"
@@ -84,36 +71,30 @@
         state: directory
         mode: u=rwx,g=,o=
       loop:
-        - name: jupyter_data
+        - name: caddy_config
-          user: jupyter
+          user: caddy
-        - name: jupyter_notebooks
+        - name: caddy_data
-          user: jupyter
+          user: caddy
-    - name: Create Factorio data folder
+        - name: codi_uploads
-      become: true
+          user: hackmd
-      ansible.builtin.file:
+        - name: nix_runner_etc
-        path: /var/lib/pbri/docker/factorio
+          user: 1000
-        state: directory
+        - name: nix_runner_nix
-        owner: factorio
+          user: 1000
-        group: factorio
+        - name: nix_runner_home_node
-        mode: u=rwx,g=,o=
+          user: 1000
-    - name: Create score data folder
+        - name: yore_data
-      become: true
+          user: yore
-      ansible.builtin.file:
-        path: /var/lib/pbri/docker/score
-        state: directory
-        owner: score
-        group: score
-        mode: u=rwx,g=,o=
     # Since some docker-compose configuration might want to pull
     # images from the Gitea package repository, we need to ensure
     # that Gitea is reachable before those configurations are deployed.
     - name: Set up caddy and gitea containers
       become: true
-      community.docker.docker_compose:
+      community.docker.docker_compose_v2:
         project_src: "/etc/pbri/docker/{{ item.name }}"
         state: "{{ item.state }}"
-        build: true
+        build: "always"
-        debug: true
+        pull: "always"
       loop:
         - name: caddy
           state: present
@@ -129,27 +110,26 @@
       register: gitea_version_response
       until: gitea_version_response.status == 200
       retries: 10
-      delay: 5  # Retry every 5 seconds
+      delay: 3  # Retry every 3 seconds
     - name: Set up other containers
       become: true
-      community.docker.docker_compose:
+      community.docker.docker_compose_v2:
         project_src: "/etc/pbri/docker/{{ item.name }}"
         state: "{{ item.state }}"
-        build: true
+        build: "always"
-        debug: true
+        pull: "always"
       loop:
-        - name: drone
-          state: present
         - name: codi
           state: present
-        - name: jupyter
-          state: present
         - name: utoy
           state: present
-        - name: score
+        - name: vrnp
+          state: present
+        - name: yore
+          state: present
+        - name: hitparade
           state: present
-
         - name: factorio
           state: absent
-        - name: glebby
+        - name: zomboid
           state: absent

ansible/playbooks/nanna-setup.yaml

@@ -0,0 +1,109 @@
+---
+- name: Basic setup for nanna
+  hosts: nanna
+  tasks:
+    - name: Configure sshd
+      become: true
+      ansible.builtin.copy:
+        dest: /etc/ssh/sshd_config.d/00_pbri.conf
+        mode: u=rw,g=r,o=r
+        # Included by /etc/ssh/sshd_config before other configuration
+        content: |
+          Port 2309
+          PermitRootLogin no
+          PubkeyAuthentication yes
+          AuthorizedKeysFile .ssh/authorized_keys
+          PasswordAuthentication no
+        validate: /usr/sbin/sshd -T -f %s
+      notify:
+        - Restart sshd
+    - name: Install and set up Docker and docker-compose
+      ansible.builtin.include_role:
+        name: docker
+    - name: Add Davids group
+      become: true
+      ansible.builtin.group:
+        name: "david"
+        state: "present"
+    - name: Add David
+      become: true
+      ansible.builtin.user:
+        name: "david"
+        group: "david"
+        state: "present"
+        shell: "/bin/bash"
+        # Disable password auth
+        password: "!"
+    - name: Create David SSH directory
+      become: true
+      ansible.builtin.file:
+        path: /home/david/.ssh
+        owner: david
+        group: david
+        state: directory
+        mode: "0700"
+    - name: Set David SSH key
+      become: true
+      ansible.builtin.lineinfile:
+        path: /home/david/.ssh/authorized_keys
+        line: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICttSQcZsKvw5qKCDGt\
+nxEdyH1aEGOGGRqDCp3U/SG46 davidtanner@coolerLaptop2.fritz.box"
+        owner: david
+        group: david
+        create: true
+        state: present
+        mode: "0600"
+    - name: Add Jakobs group
+      become: true
+      ansible.builtin.group:
+        name: "jakob"
+        state: "present"
+    - name: Add Jakob
+      become: true
+      ansible.builtin.user:
+        name: "jakob"
+        group: "jakob"
+        state: "present"
+        shell: "/bin/bash"
+        append: true
+        groups:
+          - sudo
+    - name: Create Jakob SSH directory
+      become: true
+      ansible.builtin.file:
+        path: /home/jakob/.ssh
+        owner: jakob
+        group: jakob
+        state: directory
+        mode: "0700"
+    - name: Set Jakob SSH key
+      become: true
+      ansible.builtin.lineinfile:
+        path: /home/jakob/.ssh/authorized_keys
+        line: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHzStuc1f7CfTsmp1qLz5x/YCwJ2wHVjxOv2Fvocs3xH pbrinkmeier.de@jakob.moser.contact"
+        owner: jakob
+        group: jakob
+        create: true
+        state: present
+        mode: "0600"
+    - name: Add work SSH key
+      become: true
+      ansible.builtin.lineinfile:
+        path: /home/paul/.ssh/authorized_keys
+        line: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMeHrSd8NJ9dAoQEJez\
+FbxfbWlo/HQNoA8vaaBZj58Cp paul@MacBook-Pro.meqo"
+        owner: paul
+        group: paul
+        create: true
+        state: present
+        mode: "0600"
+    - name: Install Nix
+      ansible.builtin.include_role:
+        name: install_nix
+
+  handlers:
+    - name: Restart sshd
+      become: true
+      ansible.builtin.service:
+        name: ssh
+        state: restarted

ansible/playbooks/nanna-sites.yaml

@@ -0,0 +1,50 @@
+---
+- name: Check out static sites hosted on nanna
+  hosts: nanna
+  tasks:
+    - name: Check out static sites
+      ansible.builtin.include_role:
+        name: checkout_static_sites
+      vars:
+        checkout_static_sites_config:
+          checkouts:
+            - path: /home/paul/Sites/pbrinkmeier.de
+              url: https://git.pbrinkmeier.de/paul/pbrinkmeier.de
+              commit: 1df3566997535ab563b5fa76724a8c6c55b96483
+              owner: paul
+            - path: /home/paul/Sites/tichy.click
+              url: https://github.com/pbrinkmeier/tichy-clicker
+              commit: 7dfb14183c765e3661fda84a7e89c2f73ca86f26
+              owner: paul
+    - name: Create David Sites directory
+      become: true
+      ansible.builtin.file:
+        path: /home/david/Sites
+        state: directory
+        owner: david
+        group: david
+        mode: "0755"
+    - name: Create dt.beany.club directory
+      become: true
+      ansible.builtin.file:
+        path: /home/david/Sites/dt.beany.club
+        state: directory
+        owner: david
+        group: david
+        mode: "0775"
+    - name: Create vorschlagzumklangvongeschichtsschreibendenprozessen.de directory
+      become: true
+      ansible.builtin.file:
+        path: /home/david/Sites/vorschlagzumklangvongeschichtsschreibendenprozessen.de
+        state: directory
+        owner: david
+        group: david
+        mode: "0775"
+    - name: Create beany.club directory
+      become: true
+      ansible.builtin.file:
+        path: /home/paul/Sites/beany.club
+        state: directory
+        owner: paul
+        group: paul
+        mode: "0775"

ansible/roles/checkout_static_sites/tasks/main.yaml

@@ -7,7 +7,7 @@
     mode: '0755'
     owner: "{{ item.owner }}"
     group: "{{ item.owner }}"
-  loop: "{{ checkout_static_sites.checkouts }}"
+  loop: "{{ checkout_static_sites_config.checkouts }}"
 - name: Check out static site repositories
   become: true
   become_user: "{{ item.owner }}"
@@ -15,4 +15,5 @@
     dest: "{{ item.path }}"
     repo: "{{ item.url }}"
     version: "{{ item.commit }}"
-  loop: "{{ checkout_static_sites.checkouts }}"
+    force: true
+  loop: "{{ checkout_static_sites_config.checkouts }}"

ansible/roles/docker/defaults/main.yaml

@@ -0,0 +1,3 @@
+---
+docker_apt_arch: "amd64"
+docker_ubuntu_release: "{{ ansible_distribution_release }}"

ansible/roles/docker/tasks/main.yaml

@@ -25,12 +25,6 @@
     stdin: "{{ docker_gpg_key.content }}"
     creates: /usr/share/keyrings/docker-archive-keyring.gpg
 
-- name: Retrieve dpkg architecture
-  check_mode: false
-  ansible.builtin.command: dpkg --print-architecture
-  register: docker_dpkg_architecture
-  changed_when: false
-
 - name: Add Docker apt repository
   become: true
   ansible.builtin.template:
@@ -48,3 +42,4 @@
       - docker-ce
       - docker-ce-cli
       - containerd.io
+      - docker-compose-plugin

ansible/roles/docker/templates/docker.list.j2

@@ -1 +1 @@
-deb [arch={{ docker_dpkg_architecture.stdout }} signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu {{ ansible_distribution_release }} stable
+deb [arch={{ docker_apt_arch }} signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu {{ docker_ubuntu_release }} stable

ansible/roles/install_nix/files/install-nix

@@ -26,38 +26,43 @@ require_util() {
 
 case "$(uname -s).$(uname -m)" in
     Linux.x86_64)
-        hash=0b32afd8c9147532bf8ce8908395b1b4d6dde9bedb0fcf5ace8b9fe0bd4c075c
+        hash=d1f67c86eed016214864ba08bfb9529c307aea7e8fafb74853f96fcc3bfd8a60
-        path=0zij5bm5f2gm3p2c8dkkv58684j1k100/nix-2.8.0-x86_64-linux.tar.xz
+        path=n1j9ng0120ql98l5a8mi626ka8wvixq4/nix-2.31.2-x86_64-linux.tar.xz
         system=x86_64-linux
         ;;
     Linux.i?86)
-        hash=3f4bb50f639515df069fb682bb68da77565e5ca8678a3b0fb7dcc79ef591f518
+        hash=9e8a403421c68683557180444f089861469e12b41d41ee2f9be4c8e731b7d160
-        path=kjpj1rn6x5lh20fkyfyyzgmgjdra1jpy/nix-2.8.0-i686-linux.tar.xz
+        path=zjcwglfyf0fvjb4j86kgijzwhzaqbngc/nix-2.31.2-i686-linux.tar.xz
         system=i686-linux
         ;;
     Linux.aarch64)
-        hash=d29ea31c581e1ba7a651e6b22999cef8923e852e1d6fe7008d9545f4275f5343
+        hash=64db528412096d718b4bf8f78f85e5ac2b714b774e5005500dee37d23f560456
-        path=npadny2da5149lcycbfmacf1r936n9zg/nix-2.8.0-aarch64-linux.tar.xz
+        path=0aw1ka8njh94nvjy8596va5bbx4wd2nw/nix-2.31.2-aarch64-linux.tar.xz
         system=aarch64-linux
         ;;
-    Linux.armv6l_linux)
+    Linux.armv6l)
-        hash=69d5cb0e95bc83154099debd139d4f767622d94b17149fa127d492017c2e3896
+        hash=5e088d3f4fe27dd35991b1888c1ea5284edade24965328604968b9a1cc20a94c
-        path=jb1l7y40im5dsbq5gamppss59y0c7jmj/nix-2.8.0-armv6l-linux.tar.xz
+        path=2pzkwf2ysf0znsnz5i9gfn6w2gikhlys/nix-2.31.2-armv6l-linux.tar.xz
         system=armv6l-linux
         ;;
-    Linux.armv7l_linux)
+    Linux.armv7l)
-        hash=25857729f23dc25fe92dabd376917d83fe0f23038f82c1f2ab230171eb70f648
+        hash=4e2c1e8a3172ae71f041b9b647aa8153fb24518272d1a9bc3d9b384ab7ad54a1
-        path=firp24ikxcygwrwd4208lyla4b6jl3sh/nix-2.8.0-armv7l-linux.tar.xz
+        path=nkp9wbvnsxinr9xl7sn0yy96wvc4chn0/nix-2.31.2-armv7l-linux.tar.xz
         system=armv7l-linux
         ;;
+    Linux.riscv64)
+        hash=79601e08b6389df130b5bf1e0a48590aea044ac18bc61660545cf65843b39251
+        path=dhqxgwygm94vd6rdiwscxxz98kh8jal3/nix-2.31.2-riscv64-linux.tar.xz
+        system=riscv64-linux
+        ;;
     Darwin.x86_64)
-        hash=ebf383f1b499d3e4897cd61d068dc46e118e5f53667f5f28748b0b3682d7649a
+        hash=ed8df6a1046dea90ba4068a827bdeaf372d522867c4d2b48cdb37145c200eeba
-        path=wwf7b61nyhgj3z0vvgnnb4yzi081jkjp/nix-2.8.0-x86_64-darwin.tar.xz
+        path=5zp5bzz45sn9ff2bfhh03cmavvm1r6gs/nix-2.31.2-x86_64-darwin.tar.xz
         system=x86_64-darwin
         ;;
     Darwin.arm64|Darwin.aarch64)
-        hash=f320f381299e0fc2f907ae81ac123d0689245cb39f0672f8a65dffea12fa0240
+        hash=3baa0af88a1ef4e2cc82cb64cd384b1805ecc3771b574e97277ae213d52711d8
-        path=fr5rcinvqzgcrggxw3phrzcck9wpzz83/nix-2.8.0-aarch64-darwin.tar.xz
+        path=b7hidzsb4i3gx6s23ig9mp7mwmiljzfk/nix-2.31.2-aarch64-darwin.tar.xz
         system=aarch64-darwin
         ;;
     *) oops "sorry, there is no binary distribution of Nix for your platform";;
@@ -71,10 +76,10 @@ if [ "${1:-}" = "--tarball-url-prefix" ]; then
     url=${2}/${path}
     shift 2
 else
-    url=https://releases.nixos.org/nix/nix-2.8.0/nix-2.8.0-$system.tar.xz
+    url=https://releases.nixos.org/nix/nix-2.31.2/nix-2.31.2-$system.tar.xz
 fi
 
-tarball=$tmpDir/nix-2.8.0-$system.tar.xz
+tarball=$tmpDir/nix-2.31.2-$system.tar.xz
 
 require_util tar "unpack the binary tarball"
 if [ "$(uname -s)" != "Darwin" ]; then
@@ -89,7 +94,7 @@ else
     oops "you don't have wget or curl installed, which I need to download the binary tarball"
 fi
 
-echo "downloading Nix 2.8.0 binary tarball for $system from '$url' to '$tmpDir'..."
+echo "downloading Nix 2.31.2 binary tarball for $system from '$url' to '$tmpDir'..."
 fetch "$url" "$tarball" || oops "failed to download '$url'"
 
 if command -v sha256sum > /dev/null 2>&1; then

docker/docker/Caddyfile

@@ -0,0 +1,90 @@
+{
+    admin off
+}
+
+pbrinkmeier.de {
+    file_server {
+        root /srv/pbrinkmeier.de
+    }
+}
+
+files.pbrinkmeier.de {
+    basicauth {
+        wug JDJhJDE0JEJrQXUzVWxFZ2JGVmx6YlZWTkpYdy5IMjRXdnZZdGw5SjZDcUg2ZWMxOEVjcEV6dWhIRmhD
+    }
+    file_server {
+        root /srv/files.pbrinkmeier.de
+    }
+}
+
+dt.beany.club {
+    file_server {
+        root /srv/dt.beany.club
+        browse
+    }
+}
+
+vorschlagzumklangvongeschichtsschreibendenprozessen.de {
+    file_server {
+        root /srv/vorschlagzumklangvongeschichtsschreibendenprozessen.de
+        browse
+    }
+}
+
+tichy.click {
+    file_server {
+        root /srv/tichy.click
+    }
+}
+
+codi.pbrinkmeier.de {
+    redir https://pad.pbrinkmeier.de{uri} permanent
+}
+
+pad.pbrinkmeier.de {
+    reverse_proxy codi:3000
+}
+
+git.pbrinkmeier.de {
+    # Allow apps to requests tokens 'n stuff
+    @oauth path /login/oauth/*
+    header @oauth {
+        Access-Control-Allow-Origin "*"
+        Access-Control-Allow-Methods "GET, POST, OPTIONS"
+        Access-Control-Allow-Headers "Content-Type, Authorization"
+    }
+
+    @oauth_preflight {
+        path /login/oauth/*
+        method OPTIONS
+    }
+    respond @oauth_preflight 204
+
+    reverse_proxy gitea:3000
+}
+
+plantuml.pbrinkmeier.de {
+    reverse_proxy codi_plantuml:8080
+}
+
+utoy.beany.club {
+    reverse_proxy utoy:3000
+}
+
+vrnp.beany.club {
+    reverse_proxy vrnp:8000
+}
+
+fz.beany.club {
+    reverse_proxy yore:3000
+}
+
+beany.club, www.beany.club {
+    file_server {
+        root /srv/beany.club
+    }
+}
+
+qr.beany.club {
+    redir https://beany.club{uri}
+}

docker/docker/caddy/Caddyfile

@@ -1,50 +0,0 @@
-{
-    admin off
-}
-
-pbrinkmeier.de {
-    file_server {
-        root /srv/pbrinkmeier.de
-    }
-}
-
-tichy.click {
-    file_server {
-        root /srv/tichy.click
-    }
-}
-
-codi.pbrinkmeier.de {
-    redir https://pad.pbrinkmeier.de{uri} permanent
-}
-
-pad.pbrinkmeier.de {
-    reverse_proxy codi:3000
-}
-
-git.pbrinkmeier.de {
-    reverse_proxy gitea:3000
-}
-
-ci.pbrinkmeier.de {
-    reverse_proxy drone:80
-}
-
-jupyter.pbrinkmeier.de {
-    reverse_proxy jupyter:8888
-    basicauth {
-        wug JDJhJDE0JEJrQXUzVWxFZ2JGVmx6YlZWTkpYdy5IMjRXdnZZdGw5SjZDcUg2ZWMxOEVjcEV6dWhIRmhD
-    }
-}
-
-plantuml.pbrinkmeier.de {
-    reverse_proxy codi_plantuml:8080
-}
-
-utoy.beany.club {
-    reverse_proxy utoy:3000
-}
-
-score.brocke.net {
-    reverse_proxy score:8080
-}

docker/docker/caddy/Dockerfile

@@ -1,3 +1,4 @@
-FROM caddy
+FROM caddy:latest
 
 COPY Caddyfile /etc/caddy/Caddyfile
+RUN chown 42002:42002 /etc/caddy/Caddyfile

docker/docker/caddy/docker-compose.yaml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   # Webserver for static files and reverse proxy
   web:
@@ -8,10 +6,20 @@ services:
     ports:
       - "80:80"
       - "443:443"
+      # For hitparade/pollmaster
+      - "12080:12080"
+      - "12081:12081"
+    user: "42002"
     volumes:
       - /var/lib/pbri/docker/caddy_data:/data
       - /var/lib/pbri/docker/caddy_config:/config
-      - /home/paul/Sites:/srv:ro
+      # See nanna-sites playbook/Caddyfile
+      - /home/david/Sites/dt.beany.club:/srv/dt.beany.club:ro
+      - /home/david/Sites/vorschlagzumklangvongeschichtsschreibendenprozessen.de:/srv/vorschlagzumklangvongeschichtsschreibendenprozessen.de:ro
+      - /home/paul/Sites/files.pbrinkmeier.de:/srv/files.pbrinkmeier.de:ro
+      - /home/paul/Sites/pbrinkmeier.de:/srv/pbrinkmeier.de:ro
+      - /home/paul/Sites/tichy.click:/srv/tichy.click:ro
+      - /home/paul/Sites/beany.club:/srv/beany.club:ro
     restart: always
 
 networks:

docker/docker/codi/README.md

@@ -6,5 +6,3 @@ CODI_DB_USER=...
 CODI_DB_PASSWORD=...
 CODI_DB_DB=...
 ```
-
-See also: https://docs.drone.io/server/provider/gitea/.

docker/docker/codi/docker-compose.yaml

@@ -1,8 +1,6 @@
-version: "3"
-
 services:
   codi:
-    image: hackmdio/hackmd:2.4.2
+    image: hackmdio/hackmd:2.6.1
     user: hackmd
     environment:
       # Admin stuff

docker/docker/drone/README.md

@@ -1,9 +0,0 @@
-Add a `.env` file like this:
-
-```
-DRONE_GITEA_CLIENT_ID=...
-DRONE_GITEA_CLIENT_SECRET=...
-DRONE_RPC_SECRET=...
-```
-
-See also: https://docs.drone.io/server/provider/gitea/.

docker/docker/drone/docker-compose.yaml

@@ -1,32 +0,0 @@
-version: "3"
-
-services:
-  drone:
-    image: drone/drone:2
-    environment:
-      DRONE_GITEA_SERVER: https://git.pbrinkmeier.de
-      DRONE_GITEA_CLIENT_ID: "${DRONE_GITEA_CLIENT_ID}"
-      DRONE_GITEA_CLIENT_SECRET: "${DRONE_GITEA_CLIENT_SECRET}"
-      DRONE_RPC_SECRET: "${DRONE_RPC_SECRET}"
-      DRONE_SERVER_HOST: ci.pbrinkmeier.de
-      DRONE_SERVER_PROTO: https
-    volumes:
-      - /var/lib/pbri/docker/drone:/data
-    restart: unless-stopped
-
-  drone_runner:
-    image: drone/drone-runner-docker:1
-    environment:
-      DRONE_RPC_PROTO: https
-      DRONE_RPC_HOST: ci.pbrinkmeier.de
-      DRONE_RPC_SECRET: "${DRONE_RPC_SECRET}"
-      DRONE_RUNNER_CAPACITY: 1
-      DRONE_RUNNER_NAME: shamash
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-    restart: unless-stopped
-
-networks:
-  default:
-    name: caddy-network
-    external: true

docker/docker/factorio/Dockerfile

@@ -1,4 +1,4 @@
-FROM factoriotools/factorio:1.1.87
+FROM factoriotools/factorio:2.0.73
 
 COPY server-settings.json /server-settings.json
 ENTRYPOINT [ "/bin/sh", "-c", "mkdir -p /factorio/config && envsubst < /server-settings.json > /factorio/config/server-settings.json && exec /docker-entrypoint.sh" ]

docker/docker/factorio/docker-compose.yaml

@@ -1,12 +1,13 @@
-version: "3"
+---
 
 services:
-  gitea:
+  factorio:
     image: pbrinkmeier/factorio
     build: .
     restart: always
     environment:
       GAME_PASSWORD: "${GAME_PASSWORD}"
+      DLC_SPACE_AGE: false
     volumes:
       - /var/lib/pbri/docker/factorio:/factorio
     ports:

docker/docker/factorio/server-settings.json

@@ -21,7 +21,7 @@
     "_comment_token": "Authentication token. May be used instead of 'password' above.",
     "token": "",
   
-    "game_password": "",
+    "game_password": "${GAME_PASSWORD}",
   
     "_comment_require_user_verification": "When set to true, the server will only allow clients that have a valid Factorio.com account",
     "require_user_verification": false,

docker/docker/gitea/Dockerfile

@@ -1,3 +1,3 @@
- FROM gitea/act_runner:0.2.5
+ FROM gitea/runner:5.0.0
 
  COPY runner-config.yaml /opt/runner-config.yaml

docker/docker/gitea/docker-compose.yaml

@@ -1,8 +1,6 @@
-version: "3"
-
 services:
   gitea:
-    image: gitea/gitea:1.20.3
+    image: gitea/gitea:1.27.3
     restart: unless-stopped
     environment:
       # Ref: https://docs.gitea.io/en-us/config-cheat-sheet
@@ -25,8 +23,6 @@ services:
       GITEA__database__NAME: gitea
       GITEA__database__USER: gitea
       GITEA__database__PASSWD: "${GITEA_DB_PASSWORD}"
-      GITEA__picture__DISABLE_GRAVATAR: "true"
-      GITEA__picture__FEDERATED_AVATAR: "false"
       GITEA__service__DISABLE_REGISTRATION: "true"
       GITEA__service__REGISTER_EMAIL_CONFIRM: "true"
       GITEA__service__ENABLE_NOTIFY_MAIL: "true"
@@ -66,7 +62,8 @@ services:
       - /var/lib/pbri/docker/gitea_db:/var/lib/postgresql/data
 
   gitea_runner:
-    image: pbrinkmeier/act_runner:0.2.5
+    # Make sure to keep this in sync with the version in the Dockerfile
+    image: pbrinkmeier/gitea-runner:5.0.0
     build: .
     restart: unless-stopped
     environment:

docker/docker/gitea/runner-config.yaml

@@ -32,6 +32,8 @@ runner:
   # ubuntu:22.04 here is not enough.
   labels:
     - "ubuntu-22.04:docker://node:16-bullseye"
+    - "node-22-bullseye:docker://node:22-bullseye"
+    - "node-22-bookworm:docker://node:22-bookworm"
 
 cache:
   # Enable cache server to use actions/cache.
@@ -72,7 +74,10 @@ container:
   # If you want to allow any volume, please use the following configuration:
   # valid_volumes:
   #   - '**'
-  valid_volumes: []
+  valid_volumes:
+    - /var/lib/pbri/docker/nix_runner_etc
+    - /var/lib/pbri/docker/nix_runner_nix
+    - /var/lib/pbri/docker/nix_runner_home_node
   # overrides the docker client host with the specified one.
   # If it's empty, act_runner will find an available docker host automatically.
   # If it's "-", act_runner will find an available docker host automatically, but the docker host won't be mounted to the job containers and service containers.

docker/docker/glebby/docker-compose.yaml

@@ -1,11 +0,0 @@
-version: "3"
-
-services:
-  glebby:
-    image: git.pbrinkmeier.de/paul/glebby:1.1-prod
-    restart: always
-
-networks:
-  default:
-    name: caddy-network
-    external: true

docker/docker/hitparade/Dockerfile

@@ -0,0 +1,3 @@
+FROM mariadb:10.6
+
+COPY pollmaster_scheme.sql /docker-entrypoint-initdb.d/init.sql

docker/docker/hitparade/docker-compose.yaml

@@ -0,0 +1,30 @@
+services:
+  pollmaster_db:
+    image: pbrinkmeier/pollmaster_db
+    build: .
+    restart: unless-stopped
+    environment:
+      MYSQL_ROOT_PASSWORD: "${MYSQL_ROOT_PASSWORD}"
+      MYSQL_DATABASE: 'pollmaster'
+      MYSQL_USER: 'pollmaster'
+      MYSQL_PASSWORD: "${MYSQL_PASSWORD}"
+    volumes:
+      - /var/lib/pbri/docker/hitparade_pollmaster_db_data:/var/lib/mysql
+
+  # Caddy terminates https for :12080 and :12081
+  pollmaster:
+    image: git.pbrinkmeier.de/paul/pollmaster:4
+    volumes:
+      - /etc/pbri/docker/hitparade/pollmaster-config.yml:/config.yml:ro
+      - /var/lib/pbri/docker/pollmaster_sessions:/app/pollmaster/sessions
+    depends_on:
+      - pollmaster_db
+
+  # Doesn't need further config, the pollmaster URL is baked into the image
+  voter:
+    image: git.pbrinkmeier.de/paul/voter:4
+
+networks:
+  default:
+    name: caddy-network
+    external: true

docker/docker/hitparade/pollmaster_scheme.sql

@@ -0,0 +1,114 @@
+CREATE TABLE IF NOT EXISTS `admin` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `image` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `Schlüssel 2` (`name`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `artist` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `locked` tinyint(1) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `Name` (`name`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=2285 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `track` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `uri` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `name` varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `album` varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `year` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `length` mediumint(8) unsigned NOT NULL,
+  `image` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `locked` tinyint(1) unsigned NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `URI` (`uri`) USING BTREE,
+  KEY `Name` (`name`)
+) ENGINE=InnoDB AUTO_INCREMENT=3570 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `playback` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `track_id` int(10) unsigned NOT NULL,
+  `timestamp` bigint(20) unsigned NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `FK_playback_track` (`track_id`),
+  KEY `Time` (`timestamp`),
+  CONSTRAINT `FK_playback_track` FOREIGN KEY (`track_id`) REFERENCES `track` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=227 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `playlist` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `uri` varchar(80) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `Schlüssel 2` (`name`),
+  KEY `Schlüssel 3` (`uri`)
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `playlist_track` (
+  `playlist_id` int(10) unsigned NOT NULL,
+  `track_id` int(10) unsigned NOT NULL,
+  `position` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`playlist_id`,`track_id`),
+  KEY `FK_playlist_track_track` (`track_id`),
+  KEY `FK_playlist_track_playlist` (`playlist_id`),
+  CONSTRAINT `FK_playlist_track_playlist` FOREIGN KEY (`playlist_id`) REFERENCES `playlist` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `FK_playlist_track_track` FOREIGN KEY (`track_id`) REFERENCES `track` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `search_term` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `term` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `first_search` bigint(20) unsigned NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `Schlüssel 2` (`term`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=88 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `search_term_track` (
+  `search_term_id` int(10) unsigned NOT NULL,
+  `track_id` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`search_term_id`,`track_id`),
+  KEY `FK_search_term_tracks_track` (`track_id`),
+  CONSTRAINT `FK_search_term_tracks_search_term` FOREIGN KEY (`search_term_id`) REFERENCES `search_term` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `FK_search_term_tracks_track` FOREIGN KEY (`track_id`) REFERENCES `track` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `session` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `image` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `last_seen` bigint(20) unsigned NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `Schlüssel 2` (`name`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `setting` (
+  `key` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `value` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`key`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `track_artist` (
+  `track_id` int(10) unsigned NOT NULL,
+  `artist_id` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`artist_id`,`track_id`),
+  KEY `FK__track` (`track_id`),
+  KEY `FK__artist` (`artist_id`),
+  CONSTRAINT `FK__artist` FOREIGN KEY (`artist_id`) REFERENCES `artist` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `FK__track` FOREIGN KEY (`track_id`) REFERENCES `track` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `vote` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `track_id` int(10) unsigned NOT NULL,
+  `session_id` int(10) unsigned DEFAULT NULL,
+  `timestamp` bigint(20) unsigned NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `FK_vote_track` (`track_id`),
+  KEY `FK_vote_session` (`session_id`),
+  CONSTRAINT `FK_vote_track` FOREIGN KEY (`track_id`) REFERENCES `track` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=319 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+

docker/docker/jupyter/docker-compose.yaml

@@ -1,15 +0,0 @@
-version: "3"
-
-services:
-  jupyter:
-    image: git.pbrinkmeier.de/paul/jup:1.5
-    user: "42000"
-    volumes:
-      - /var/lib/pbri/docker/jupyter_data:/data
-      - /var/lib/pbri/docker/jupyter_notebooks:/notebooks
-    restart: always
-
-networks:
-  default:
-    name: caddy-network
-    external: true

docker/docker/score/docker-compose.yaml

@@ -1,16 +0,0 @@
-version: "3"
-
-services:
-  score:
-    image: ghcr.io/lbrocke/score:v1.0.2
-    user: "42003:42003"
-    environment:
-      SCORE_LISTEN: 0.0.0.0:8080
-    volumes:
-      - /var/lib/pbri/docker/score:/data
-    restart: unless-stopped
-
-networks:
-  default:
-    name: caddy-network
-    external: true

docker/docker/utoy/docker-compose.yaml

@@ -1,8 +1,6 @@
-version: "3"
-
 services:
   utoy:
-    image: git.pbrinkmeier.de/paul/utoy:0.6
+    image: git.pbrinkmeier.de/paul/utoy:0.6.3
     restart: always
 
 networks:

docker/docker/vrnp/docker-compose.yaml

@@ -0,0 +1,12 @@
+services:
+  vrnp:
+    image: git.pbrinkmeier.de/paul/vrnp:0.0.10
+    restart: always
+    environment:
+      VRNP_PASSWORD: "${VRNP_PASSWORD}"
+      VRNP_CLIENT_ALLOWLIST: "VAG"
+
+networks:
+  default:
+    name: caddy-network
+    external: true

docker/docker/yore/docker-compose.yaml

@@ -0,0 +1,34 @@
+services:
+  yore:
+    image: git.pbrinkmeier.de/paul/yore:0.0.12
+    restart: always
+    environment:
+      # For dbmate (migrations)
+      DATABASE_URL: "postgres://yore:${YORE_DB_PASSWORD}@yore_db/yore-db?sslmode=disable&search_path=public"
+      # For yore itself
+      YORE_DB: "host=yore_db dbname=yore-db user=yore password=${YORE_DB_PASSWORD}"
+      YORE_DOWNLOAD_DIR: /data/downloads
+      YORE_DBMATE_DIR: /data/dbmate
+    user: 42004:42004
+    volumes:
+      - /etc/passwd:/etc/passwd:ro
+      - /etc/group:/etc/group:ro
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
+      - /var/lib/pbri/docker/yore_data:/data
+
+  yore_db:
+    image: postgres:17-alpine
+    restart: unless-stopped
+    environment:
+      POSTGRES_DB: yore-db
+      POSTGRES_USER: yore
+      POSTGRES_PASSWORD: "${YORE_DB_PASSWORD}"
+    volumes:
+      - /var/lib/pbri/docker/yore_db:/var/lib/postgresql/data
+
+
+networks:
+  default:
+    name: caddy-network
+    external: true

docker/docker/zomboid/docker-compose.yaml

@@ -0,0 +1,15 @@
+services:
+  zomboid:
+    image: renegademaster/zomboid-dedicated-server:2.5.0
+    restart: unless-stopped
+    volumes:
+      - /var/lib/pbri/docker/zomboid_dedicated_server:/home/steam/ZomboidDedicatedServer
+      - /var/lib/pbri/docker/zomboid_config:/home/steam/Zomboid
+    ports:
+      - "16261:16261/udp"
+      - "16262:16262/udp"
+    environment:
+      ADMIN_USERNAME: "the_gwiddy"
+      ADMIN_PASSWORD: "${ZOMBOID_ADMIN_PASSWORD}"
+      SERVER_NAME: "server3"
+      SERVER_PASSWORD: "${ZOMBOID_SERVER_PASSWORD}"

docker/envs/drone/.env

@@ -1,14 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-31333834393366333930346366373931333930646233383664643463393965303238613430646638
-6461373434616433353337643131396462326537346434380a386562633335346436303662336362
-62333739626237323334333666633162616338313932393261303231353539623237383638643030
-3364393934653232310a383065386530373433393635313665353532666361303436613337316565
-32306233336134383531633232393862303466373331373764376462653736663861663366323762
-65666263366461396362386264613830336435346234386234333562616131653938386439336566
-34386461343433346363336161373038303434383563303564653533623939613937323030636362
-66636639643963613236366138646335393831366432333637333065326162646237643561336666
-61323833333337633861646462393930663733333266336233663630396532366566303835653431
-38363365383166393765343735363030363562313837643837313864373735643264663264643633
-66306261633666616363666562306632613032373231633730313638383033633761653661383738
-39623630643766663438656635653530626664313765633430646330356333306239653437373839
-3933

docker/envs/factorio/.env

@@ -1,7 +1,6 @@
 $ANSIBLE_VAULT;1.1;AES256
-32356463313330336636636363646138393236636233326132623165353962623565356364396530
+33633161386465383663373137623030626264653862373161353564343662346433376437353530
-3636336532396665333637653432353332643434643962390a313162343836306435383536313937
+6265356266663464613439663434373531333939326538330a313064343637366632633866343534
-36656632356366303561366536373535383538303730386239386437323466346533353634306436
+38313234303830636364383361613538666338636333323262333438313134353134356635626239
-3930633464353235360a653936333734353137313363316261366666353238366566613865366463
+6366336439353266660a633161383062666130396566396431383534313266343431633064376463
-32393431343439383733343766323831643561663938376264336331306139646337343633346536
+38623562656564363565346166396363303636323062336636313838653638663833
-3236343538323032636666366639303539316236393535323661

docker/envs/gitea/.env

@@ -1,14 +1,14 @@
 $ANSIBLE_VAULT;1.1;AES256
-35623364633833623964623536646534373634663736613561333561343136333965306638396532
+30626565616334613665623138613533653739333038643530636633393264393334373563326631
-6162393239383936386338666565306132646230383066630a336337613636383431623738343663
+3838333663306537326534333666316539383038363236650a613163643433653466666639666366
-61343262363631376665383035323139313863626331666439336134613035663439376231343863
+33653861613638653862393338386334643332633762666136613932343834333162303363373030
-3032353139643138640a383365356630323835383538393734643134343133653033383663333464
+6161323863316134340a646532386537313164643039353435633535363061616363363337663365
-62386361633435633664306531623835353665326432393932336163316561653866343137323030
+39343461356631383062353837383034653430373663323966373632323063636132613137643662
-63643262323436356166373533363235366238393633336631336266373837373932313134303563
+37373065313764626539396463376637353136613365366566363436356537343932376565633962
-65633337393938623134636538653561356565333831356638373862376333336163363438626438
+62316631663634316530623736613961623635303763633964386433333531626437303136363537
-39343436383732313561396236656530303064363961663636353538346264633532633866333162
+35393134643935316330396161303134626537643162393062636363376435636162393136373034
-35303032303662646166333537373566316462633536333463323433353539623363323036643763
+39636231626635643530313634333464653564353861656666633035623932336234303735386366
-34376365613932303133366236613235636238643139666663356436326532616437383432303437
+62303133326237613763336435323338623036663137333439613462333434303734303737363936
-39376535656266383465373837643634383937656431323265386163373138336164383666383962
+65333762376233396332633434353832373136383137336665623534356538636166303835376334
-64623762613332363731323739666238613634646237396331666463363663313461313966356233
+64346139656432633230386666653531333864333664393936366630346334323963343431346164
-30653362353061333739303234336461373337346632646433623462623765353330
+64376165666230386464303036303861653437646463633764343064376464396135

docker/envs/hitparade/.env

@@ -0,0 +1,11 @@
+$ANSIBLE_VAULT;1.1;AES256
+39313233623136333531343838643537373064363466356664326339323237623032303436613735
+6233383831383339366365663931333837313161646263390a646237306331386263323031373164
+33383365643735343834643839356238646161613330353938643738636135653562646430303330
+3332306436613537370a653234353464646639366236623665623162643363353230643963636361
+65386363623336396664333237313066383764656438363233653831623238623062333064343263
+36336132393563333031656366313066383132663732313964376261656331613863393965393232
+66383031366564313636643363653239663537616537623263383135326464376330636333303736
+32316530316139323264353136633865373634323761653763326262383238396639646664653039
+31376639346138343635343937613061623261666465323332313361363064393035663038346231
+3734333734656334626265643030303634383864613536373934

docker/envs/hitparade/pollmaster-config.yml

@@ -0,0 +1,30 @@
+$ANSIBLE_VAULT;1.1;AES256
+62303232383236386431613965343261333235646564616235643363393462646166613531303230
+6361343030396633663262333363616538323230313733620a306237396132663064316633323937
+62313339383336613066653662663066323330396234303435373137326435343637623465366133
+3534643534396639640a373834656135393733373465663138316564383662613561353065613861
+62643438383165316132333737623038336132666264353531633965663032333165666630626633
+65643632616363343938643138353238636231383134383733656466346531626634346163626434
+32383065316231363737663463663562373031313965346363336134653536663365613264383261
+61616434383537666334663166393536376634386231343030343465393837326439363465633064
+62643661643063316465623034646566363962353431623430356432366461613835633133663663
+35663836383830616161656265316463396335326330623439383935323039366136366232303235
+38323262316432343762663865333036313137396235396530656632366531303535626364363666
+32613030346636646136636532653134616639396237643866356464363138633863363061656534
+34646431393238386166306239666331376166316635333361616464396363626635343963306663
+30363930366332343934613830396464633534653565306138613066383933346633323337656264
+62636337326266633162356363373430626433653837346330653338306530356261383462336261
+65333364656263623335653937386439326164623838613463613031323037383762343165363230
+38343366346130383632316234656166313935336464666530373939333063356461303139643033
+38636133313037613431663161383836653137653964393866346564663339363764643535333037
+36616337666636653835313334373164666165313066366163373739393462653362306135396538
+66303636623535353231373839383539613165353463643961643130666563633465353534623931
+31343039313336323932373230643137323432313737396538353834376639353235306332353334
+65303231623138386237383437383234366461356464343236396631303234353566346534326665
+34316436326335333737633463386635356432326162346463646665643034626339643161383938
+63363531393131363464643232376232363639306564656463323162316362343233376663633662
+31333164316565383436326461316533386536623062373531323037373033373265333437393836
+36613530303163393931363666613865616566626533356131613239626162633236643635613938
+30393362316461396532393261643464376365643337633233323666336135366535653536386130
+35623564626135303232656337313430346136376361376232343166663232353763376464376230
+39356565373364353635386630333238616263306639663963616662633137343965

docker/envs/vrnp/.env

@@ -0,0 +1,10 @@
+$ANSIBLE_VAULT;1.1;AES256
+36643163613366383136326339346231373533373361633834663332343932356665303434333564
+3936636366396233326664636137363134643066303432380a363662646465656130303431386530
+37316138366239313038336664313661333632393333666539363565623032653431623935613631
+3635323330363663610a353263663736653561666261636138336438666261613739346664393233
+32323364346665633662663266626436343831386565663761393237346637376438613865363663
+36613035376638653937633866613935343834633431393830303438363265656337343565323063
+36303033323537666236633037656236656133396431326362303462353237326162626335363761
+36636362306232333630613464393135383539666632343038393333353462336238663130326166
+3061

docker/envs/yore/.env

@@ -0,0 +1,7 @@
+$ANSIBLE_VAULT;1.1;AES256
+36313063633538313631386664353535373166306563613830316430613035306438326564396331
+6336306566306166616266643630343262616465306631350a393932613665346164613361333037
+39386135396364666630623962653462623234386430383034353731353361663837343036393130
+3261633964626135610a626364363761373734333762373764366363643537316662643634616263
+32383730663230303064626130393164616237636362656331313333316439323135366535303334
+3436323333383739666261656531363335326532616562353166

docker/envs/zomboid/.env

@@ -0,0 +1,10 @@
+$ANSIBLE_VAULT;1.1;AES256
+35336632386231333233333633656163356564316637366438383532626437303364633733353436
+3836376461393761653637666532643264613864633935620a326365386634393935333433306564
+62346235346262313339633739353232663562623562616136623838386233633136383764666536
+6239663264643333370a393762636231343034643133613163626239353735363037646638633933
+62376165306438653537343564376536396537666534633330666163346533313434616561306434
+63313035643732303863663430303936346264626637623936343763303738623865356536306365
+32623164323738663065613332656465643536633933643731366139626165636230343966383839
+64343961316139313931313966356430343438376461366537356337363835623637306539646265
+32376562363061643630663937663064393664663766613365363439653030393239

flake.lock

@@ -1,57 +1,15 @@
 {
   "nodes": {
-    "agenix": {
-      "inputs": {
-        "darwin": "darwin",
-        "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1696775529,
-        "narHash": "sha256-TYlE4B0ktPtlJJF9IFxTWrEeq+XKG8Ny0gc2FGEAdj0=",
-        "owner": "ryantm",
-        "repo": "agenix",
-        "rev": "daf42cb35b2dc614d1551e37f96406e4c4a2d3e4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ryantm",
-        "repo": "agenix",
-        "type": "github"
-      }
-    },
-    "darwin": {
-      "inputs": {
-        "nixpkgs": [
-          "agenix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1673295039,
-        "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=",
-        "owner": "lnl7",
-        "repo": "nix-darwin",
-        "rev": "87b9d090ad39b25b2400029c64825fc2a8868943",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lnl7",
-        "ref": "master",
-        "repo": "nix-darwin",
-        "type": "github"
-      }
-    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1685518550,
+        "lastModified": 1731533236,
-        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
@@ -60,50 +18,13 @@
         "type": "github"
       }
     },
-    "home-manager": {
-      "inputs": {
-        "nixpkgs": [
-          "agenix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1682203081,
-        "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1677676435,
+        "lastModified": 1779042148,
-        "narHash": "sha256-6FxdcmQr5JeZqsQvfinIMr0XcTyTuR7EXX0H3ANShpQ=",
+        "narHash": "sha256-0/iVMQ31Zna06KJselli3hFuGy4HKacyJ8UxmWMrNZI=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a08d6979dd7c82c4cef0dcc6ac45ab16051c1169",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1686259070,
-        "narHash": "sha256-bJ2TqJHMdU27o3+AlYzsDooUzneFHwvK5LaRv5JYit4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8a7d5c039cacc83bd1926aaabc04d541e04a1460",
+        "rev": "3ef9dc56727d66ad28c2c3608da7261391ca18ad",
         "type": "github"
       },
       "original": {
@@ -114,9 +35,8 @@
     },
     "root": {
       "inputs": {
-        "agenix": "agenix",
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs"
       }
     },
     "systems": {

flake.nix

@@ -5,10 +5,9 @@
     # lib
     nixpkgs.url = github:nixos/nixpkgs;
     flake-utils.url = github:numtide/flake-utils;
-    agenix.url = github:ryantm/agenix;
   };
 
-  outputs = { self, nixpkgs, flake-utils, agenix }: flake-utils.lib.eachDefaultSystem (system:
+  outputs = { self, nixpkgs, flake-utils }: flake-utils.lib.eachDefaultSystem (system:
     let
       pkgs = nixpkgs.legacyPackages.${system};
     in
@@ -17,7 +16,6 @@
           buildInputs = [
             pkgs.ansible
             pkgs.ansible-lint
-            agenix.packages.${system}.default
           ];
 
           shellHook = ''

nix/gilgamesh/README.md

@@ -1,12 +0,0 @@
-# `gilgamesh`
-
-> Old Thinkpad running a Minecraft server.
-
-## TODO
-
-- Figure out if there's some more powersaving options
-- Add some doc for initial setup
-    - Install NixOS according to the official guide
-    - Check out this repo, build this `configuration.nix`
-    - Afterwards: Just build it locally then deploy
-- Use Flakes, add doc for `./deploy.sh`

nix/gilgamesh/configuration.nix

@@ -1,146 +0,0 @@
-{ config, pkgs, lib, ... }:
-let
-  agenix = builtins.fetchTarball {
-    url = "https://github.com/ryantm/agenix/archive/daf42cb35b2dc614d1551e37f96406e4c4a2d3e4.tar.gz";
-    sha256 = "0gbn01hi8dh7s9rc66yawnmixcasadf20zci4ijzpd143ph492ad";
-  };
-in {
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-      "${agenix}/modules/age.nix"
-      ../modules/spigot-server.nix
-      ../modules/ionos-dyndns.nix
-    ];
-
-  # Use the GRUB 2 boot loader.
-  boot.loader.grub.enable = true;
-  # boot.loader.grub.efiSupport = true;
-  # boot.loader.grub.efiInstallAsRemovable = true;
-  # boot.loader.efi.efiSysMountPoint = "/boot/efi";
-  # Define on which hard drive you want to install Grub.
-  boot.loader.grub.device = "/dev/sda";
-
-  networking.hostName = "gilgamesh"; # Define your hostname.
-  # Pick only one of the below networking options.
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-  # networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
-
-  # Set your time zone.
-  time.timeZone = "Europe/Berlin";
-
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-
-  # Select internationalisation properties.
-  i18n.defaultLocale = "en_US.UTF-8";
-  console = {
-    font = "Lat2-Terminus16";
-    keyMap = "de-latin1";
-  };
-
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.paul = {
-    isNormalUser = true;
-    extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
-    openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIMFqREiw3EareYXntIrm1/numKDo113zx1WMOFO69LJ paul"
-    ];
-    # packages = with pkgs; [];
-  };
-
-  # Users in group wheel may sudo without password
-  security.sudo.wheelNeedsPassword = false;
-
-  # Users in group wheel are special friends of the Nix daemon
-  nix.settings.trusted-users = [
-    "@wheel"
-  ];
-
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
-  environment.systemPackages = with pkgs; [
-    vim
-    tmux
-    bottom
-    (pkgs.callPackage ../packages/ionos-dyndns.nix {})
-  ];
-
-  # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
-  services.openssh = {
-    enable = true;
-    settings = {
-      PasswordAuthentication = false;
-      KbdInteractiveAuthentication = false;
-    };
-  };
-
-  # Enable Avahi for mDNS (advertise hostname in LAN)
-  services.avahi = {
-    enable = true;
-    nssmdns = true;
-  };
-
-  services.spigot-server = {
-    enable = true;
-    user = "spigot";
-  };
-
-  # Secrets management
-  age.secrets = {
-    ionos-prefix = {
-      file = ../secrets/ionos-prefix.age;
-      owner = "ionos-dyndns";
-      group = "ionos-dyndns";
-    };
-    ionos-secret = {
-      file = ../secrets/ionos-secret.age;
-      owner = "ionos-dyndns";
-      group = "ionos-dyndns";
-    };
-  };
-
-  # DynDNS stuff. IONOS has a (proprietary?) API for this,
-  # so we're using a Python script from the interwebs :shrug:
-  services.ionos-dyndns = {
-    enable = true;
-    # Must match the user owning the secrets below. See agenix config
-    # above for more details.
-    user = "ionos-dyndns";
-    apiPrefixPath = config.age.secrets.ionos-prefix.path;
-    apiSecretPath = config.age.secrets.ionos-secret.path;
-    aaaa = true;
-    fqdn = "blocks.beany.club";
-    interface = "enp0s25";
-  };
-
-  # Open ports in the firewall.
-  networking.firewall.allowedTCPPorts = [ 25565 ];
-  networking.firewall.allowedUDPPorts = [ 25565 ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
-  # TODO: Backups
-
-  # Practical hardware options
-  services.logind.lidSwitch = "ignore";
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
-
-  # Copy the NixOS configuration file and link it from the resulting system
-  # (/run/current-system/configuration.nix). This is useful in case you
-  # accidentally delete configuration.nix.
-  # system.copySystemConfiguration = true;
-
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It's perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "23.05"; # Did you read the comment?
-
-}
-

nix/gilgamesh/deploy.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-nixos-rebuild -I nixos-config=configuration.nix --target-host gilgamesh --use-remote-sudo switch

nix/gilgamesh/hardware-configuration.nix

@@ -1,33 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
-
-  boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-label/NIXROOT";
-      fsType = "ext4";
-    };
-
-  swapDevices = [ ];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp0s25.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}

nix/modules/ionos-dyndns.nix

@@ -1,118 +0,0 @@
-{ config, lib, pkgs, ... }:
-with lib;
-let
-  cfg = config.services.ionos-dyndns;
-  ionos-dyndns = pkgs.callPackage ../packages/ionos-dyndns.nix {};
-
-  command = lib.concatStringsSep " " (
-    [
-      "${ionos-dyndns}/bin/ionos-dyndns"
-      "--api-prefix"
-      "$(cat ${cfg.apiPrefixPath})"
-      "--api-secret"
-      "$(cat ${cfg.apiSecretPath})"
-      "--fqdn"
-      cfg.fqdn
-      "--interface"
-      cfg.interface
-    ]
-    ++ lib.optionals cfg.a [ "--A" ]
-    ++ lib.optionals cfg.aaaa [ "--AAAA" ]
-  );
-in {
-  options = {
-    services.ionos-dyndns = {
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Whether to turn on the IONOS DynDNS timer.
-        '';
-      };
-      user = mkOption {
-        type = types.str;
-        default = "ionos-dyndns";
-      };
-      apiPrefixPath = mkOption {
-        type = types.path;
-        description = ''
-          Path of a file holding the API prefix.
-        '';
-      };
-      apiSecretPath = mkOption {
-        type = types.path;
-        description = ''
-          Path of a file holding the API secret.
-        '';
-      };
-      a = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Whether to set the A record (IPv4).
-        '';
-      };
-      aaaa = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Whether to set the AAAA record (IPv6).
-        '';
-      };
-      fqdn = mkOption {
-        type = types.str;
-        description = ''
-          Fully qualified domain name for this host.
-        '';
-      };
-      interface = mkOption {
-        type = types.str;
-        description = ''
-          Interface to get the IP address from.
-        '';
-      };
-      interval = mkOption {
-        type = types.str;
-        default = "14min";
-        description = "How often to run the update script in systemd.timers notation.";
-      };
-      serviceName = mkOption {
-        type = types.str;
-        default = "ionos-dyndns";
-      };
-    };
-  };
-  config = mkIf cfg.enable {
-    users = {
-      users = {
-        ${cfg.user} = {
-          isSystemUser = true;
-          group = cfg.user;
-          description = "IONOS DynDNS user.";
-        };
-      };
-      groups = {
-        ${cfg.user} = {
-        };
-      };
-    };
-    systemd = {
-      services.${cfg.serviceName} = {
-        serviceConfig = {
-          Type = "oneshot";
-          User = cfg.user;
-          # We assume that command doesn't contain any single quotes
-          ExecStart = "${pkgs.bash}/bin/bash -c '${command}'";
-        };
-      };
-      timers.${cfg.serviceName} = {
-        wantedBy = [ "timers.target" ];
-        timerConfig = {
-          Unit = "${cfg.serviceName}.service";
-          OnBootSec = "30s";
-          OnActiveSec = cfg.interval;
-        };
-      };
-    };
-  };
-}

nix/modules/spigot-server.nix

@@ -1,81 +0,0 @@
-{ config, lib, pkgs, ... }:
-with lib;
-let
-  spigot-server = pkgs.callPackage ../packages/spigot-server.nix {};
-  cfg = config.services.spigot-server;
-  StateDirectory = "spigot-server";
-in {
-  options = {
-    services.spigot-server = {
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Whether to turn on the Spigot Minecraft server.
-        '';
-      };
-
-      user = mkOption {
-        type = types.str;
-        default = "spigot-server";
-        description = ''
-          The user account and group that Spigot runs as.
-        '';
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    users.users = {
-      ${cfg.user} = {
-        isSystemUser = true;
-        group = cfg.user;
-        description = "Spigot Minecraft server user";
-      };
-    };
-    users.groups = {
-      ${cfg.user} = {
-      };
-    };
-
-    systemd = {
-      services.spigot-server = {
-        description = "Spigot Minecraft server";
-        wantedBy = [ "multi-user.target" ];
-        after = [ "network.target" ];
-        serviceConfig = {
-          User = "${cfg.user}";
-
-          Sockets = "spigot-server.socket";
-          StandardInput = "socket";
-          StandardOutput = "journal";
-          StandardError = "journal";
-
-          inherit StateDirectory;
-          WorkingDirectory = "/var/lib/${StateDirectory}";
-          ExecStart = "${spigot-server}/bin/spigot-server -nogui";
-          ExecStop = [
-            "${pkgs.bash}/bin/bash -c '${pkgs.coreutils}/bin/echo save-all > /run/spigot-server.stdin'"
-            "${pkgs.bash}/bin/bash -c '${pkgs.coreutils}/bin/echo stop > /run/spigot-server.stdin'"
-            # Wait for the main process to exit
-            # If we don't do this systemd tries to nudge Java to stop, causing a race condition
-            # that leads to an ungraceful shutdown
-            "${pkgs.coreutils}/bin/echo \"Waiting for \${MAINPID} to exit...\""
-            "${pkgs.bash}/bin/bash -c 'while ${pkgs.coreutils}/bin/kill -s 0 $MAINPID 2>/dev/null; do sleep 0.5; done'"
-          ];
-        };
-      };
-
-      sockets.spigot-server = {
-        description = "Spigot Minecraft server socket for commands and stuff";
-        unitConfig = {
-          # Automatically start and stop socket along with the service
-          PartOf = "spigot-server.service";
-        };
-        socketConfig = {
-          ListenFIFO = "/run/spigot-server.stdin";
-        };
-      };
-    };
-  };
-}

nix/packages/.gitignore

@@ -1 +0,0 @@
-spigot-1.20.1.jar

nix/packages/README.md

@@ -1,11 +0,0 @@
-# Packages
-
-## `spigot-server`
-
-In order to build `spigot-server.nix` you'll need a copy of the Spigot JAR.
-For licensing reasons I won't check it into Git.
-Just drop `spigot-${version}.jar` into this folder and change the `version = ` line in `spigot-server.nix` accordingly.
-
-## TODO
-
-- Make some more stuff in `spigot-server.nix` configurable

nix/packages/ionos-dyndns.nix

@@ -1,37 +0,0 @@
-{
-  fetchFromGitHub,
-  lib,
-  makeWrapper,
-  stdenv,
-  # Runtime Dependencies
-  python3,
-  # grep
-  gnugrep,
-  # ip
-  iproute2,
-  # hostname
-  hostname
-}:
-let
-  pythonWithDeps = python3.withPackages (p: [p.requests]);
-in stdenv.mkDerivation rec {
-  pname = "ionos-dyndns";
-  # Packaging time, not commit time
-  version = "20231118";
-  src = fetchFromGitHub {
-    owner = "lazaroblanc";
-    repo = "IONOS-DynDNS";
-    rev = "6c090ab928ce8d6eaa28b09614995b036ad60027";
-    hash = "sha256-rabDuKuPvzcMltnCSvc5kDjcDhv7sXxbDLWw3/hdSmk=";
-  };
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  buildCommand = ''
-    install -Dm755 $src/ionos_dyndns.py $out/lib/ionos_dyndns.py
-
-    makeWrapper ${pythonWithDeps}/bin/python3 $out/bin/ionos-dyndns \
-      --set PATH ${lib.makeBinPath [ iproute2 gnugrep hostname ]} \
-      --add-flags $out/lib/ionos_dyndns.py
-  '';
-}

nix/packages/spigot-server.nix

@@ -1,26 +0,0 @@
-{
-  makeWrapper,
-  stdenv,
-  # Runtime Dependencies
-  jre
-}:
-let
-  # Copied from some forum thread without much thought.
-  # Let's see if they work out.
-  javaFlags = "-Xmx5G -XX:+UseG1GC -XX:+UnlockExperimentalVMOptions -XX:MaxGCPauseMillis=50 -XX:+DisableExplicitGC -XX:TargetSurvivorRatio=90 -XX:G1NewSizePercent=50 -XX:G1MaxNewSizePercent=80 -XX:InitiatingHeapOccupancyPercent=10 -XX:G1MixedGCLiveThresholdPercent=50";
-in stdenv.mkDerivation rec {
-  pname = "spigot-server";
-  version = "1.20.1";
-  src = ./spigot-${version}.jar;
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  buildCommand = ''
-    install -Dm644 $src $out/lib/spigot-${version}.jar
-
-    makeWrapper ${jre}/bin/java $out/bin/spigot-server \
-      --argv0 spigot-server \
-      --add-flags "${javaFlags}" \
-      --add-flags "-jar $out/lib/spigot-${version}.jar"
-  '';
-}

nix/secrets/README.md

@@ -1,11 +0,0 @@
-# secrets
-
-> Nix configuration secrets managed with [agenix](https://github.com/ryantm/agenix#tutorial).
-
-Use `nix develop` in the repository root to drop into a shell with `agenix`.
-
-## Editing files
-
-```
-agenix -e <thingamajig.age>
-```

nix/secrets/ionos-prefix.age

@@ -1,9 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 9V3MUQ 7+lohnPlQALVPEGo2LwS2fj5r2RCKaVeEFmi6EYEyCE
-9U6eAthRVd5ry0ej79FEy3oRG3okJTwY6zSN1u68H1o
--> ssh-ed25519 CcM6/g QQX9SsgKkk8YdUPRKj9Tda8mf6qRJ7ywtP6IIpN9fxo
-3Ml2+1+AQMwr5Lnv84pYOee/s5mzfVdsHRLaUIAKNFk
--> i)!b3gaJ-grease 7|bwS ?k2JgF E-G 2HI
-0mFbZ22lqvLd
---- 0+CwYGJlJC7bRbokHSlv+V4JKppBo+/ocfjp2NQBD3Q
-JDv�8ě ë�¶ÚŤÄ÷8é V/Ă'O”M¸x
×é!ȸTÉA7ÍK5#É8©&•Ř-VqČ&}ů]ráÂ

nix/secrets/secrets.nix

@@ -1,10 +0,0 @@
-let
-  # Users
-  paul = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIMFqREiw3EareYXntIrm1/numKDo113zx1WMOFO69LJ";
-
-  # Systems
-  gilgamesh = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPDmLWYK6/4/Fh+wsoiz9+PCHvNcP2/wu2GvfzrqXCGA";
-in {
-  "ionos-prefix.age".publicKeys = [ paul gilgamesh ];
-  "ionos-secret.age".publicKeys = [ paul gilgamesh ];
-}