Disable hitparade service

It's back to plain text

.gitea/workflows/check.yaml

@@ -2,7 +2,7 @@ name: Check
 "on": [push]
 jobs:
   "Lint Ansible Files":
-    runs-on: node-22-bookworm
+    runs-on: node-26-trixie
     steps:
       - run: apt-get update
       - run: apt-get upgrade -y

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?)
-    - [ ] In vault, seperate from other config
+- [x] Figure out how to dependably store `.env` files (Ansible vault? Something else?)
+    - [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.
-Expects to have a user `paul who can `sudo`.
+Small VPS for self-hosted services.
+Expects to have a user `paul` who can `sudo`.
 Sets up:
 
 - Some basic packages
 - 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/playbooks/nanna-docker.yaml

@@ -53,23 +53,13 @@
         decrypt: true
       loop:
         - path: gitea/.env
-          state: present
         - path: codi/.env
-          state: present
         - path: vrnp/.env
-          state: present
         - path: zomboid/.env
-          state: present
         - path: yore/.env
-          state: present
         - path: factorio/.env
-          state: present
         - path: hitparade/.env
-          state: present
-        - path: hitparade/mopidy.conf
-          state: present
         - path: hitparade/pollmaster-config.yml
-          state: present
     # This needs to be done for any services where user:
     # is set in docker-compose.yaml.
     - name: Create volume directories with correct permissions
@@ -138,7 +128,7 @@
         - name: yore
           state: present
         - name: hitparade
-          state: present
+          state: absent
         - name: factorio
           state: absent
         - name: zomboid

ansible/playbooks/nanna-setup.yaml

@@ -53,6 +53,39 @@ nxEdyH1aEGOGGRqDCp3U/SG46 davidtanner@coolerLaptop2.fritz.box"
         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:

docker/docker/caddy/Caddyfile

@@ -83,7 +83,8 @@ beany.club, www.beany.club {
     file_server {
         root /srv/beany.club
     }
-    header /hotel {
-        Content-Type application/pdf
 }
+
+qr.beany.club {
+    redir https://beany.club{uri}
 }

docker/docker/caddy/Dockerfile

@@ -1,4 +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

@@ -6,6 +6,9 @@ services:
     ports:
       - "80:80"
       - "443:443"
+      # For hitparade/pollmaster
+      - "12080:12080"
+      - "12081:12081"
     user: "42002"
     volumes:
       - /var/lib/pbri/docker/caddy_data:/data

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,6 +1,6 @@
 services:
   codi:
-    image: hackmdio/hackmd:2.5.4
+    image: hackmdio/hackmd:2.6.1
     user: hackmd
     environment:
       # Admin stuff

docker/docker/gitea/Dockerfile

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

docker/docker/gitea/docker-compose.yaml

@@ -1,6 +1,6 @@
 services:
   gitea:
-    image: gitea/gitea:1.23.1
+    image: gitea/gitea:1.27.3
     restart: unless-stopped
     environment:
       # Ref: https://docs.gitea.io/en-us/config-cheat-sheet
@@ -23,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"
@@ -65,7 +63,7 @@ services:
 
   gitea_runner:
     # Make sure to keep this in sync with the version in the Dockerfile
-    image: pbrinkmeier/act_runner:0.2.11
+    image: pbrinkmeier/gitea-runner:5.0.0
     build: .
     restart: unless-stopped
     environment:

docker/docker/gitea/runner-config.yaml

@@ -34,6 +34,7 @@ runner:
     - "ubuntu-22.04:docker://node:16-bullseye"
     - "node-22-bullseye:docker://node:22-bullseye"
     - "node-22-bookworm:docker://node:22-bookworm"
+    - "node-26-trixie:docker://node:26-trixie"
 
 cache:
   # Enable cache server to use actions/cache.

docker/docker/hitparade/docker-compose.yaml

@@ -1,11 +1,4 @@
 services:
-  pollmaster_mopidy:
-    image: git.pbrinkmeier.de/paul/mopidy4hitparade:1
-    volumes:
-      - /etc/pbri/docker/hitparade/mopidy.conf:/etc/mopidy4hitparade.conf:ro
-      - /var/lib/pbri/docker/hitparade_mopidy_cache:/var/cache/mopidy
-      - /var/lib/pbri/docker/hitparade_mopidy_lib:/var/lib/mopidy
-
   pollmaster_db:
     image: pbrinkmeier/pollmaster_db
     build: .
@@ -16,19 +9,21 @@ services:
       MYSQL_USER: 'pollmaster'
       MYSQL_PASSWORD: "${MYSQL_PASSWORD}"
     volumes:
-      - /etc/pbri/docker/hitparade/pollmaster_scheme.sql:/docker-entrypoint-initdb.d/init.sql
       - /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:1
+    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_mopidy
       - 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

docker/docker/yore/docker-compose.yaml

@@ -1,6 +1,6 @@
 services:
   yore:
-    image: git.pbrinkmeier.de/paul/yore:0.0.10
+    image: git.pbrinkmeier.de/paul/yore:0.0.12
     restart: always
     environment:
       # For dbmate (migrations)

docker/envs/hitparade/mopidy.conf

@@ -1,26 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-39633434323966613834613063353666396663653732313765366566376136633039623537623937
-3763336362643734323366363265666332633465386137630a306231646266323565313463353837
-66623239373436333639646535323835626436346462633034663638346666386264353134643762
-3231383033656136650a663933343533616461656431633139313238353561643764343134333864
-32343963363233386161366461656330376136313562303736336336613534303233366538333933
-35613231646432343363396261383566383138623666393034626365663263633639366162343133
-36653131393166333431613436353435353035393231303630343439643632643438353839393062
-65313466613133353836636463306231356664666663366635643738303362643636623061386632
-62363861663534393931653634633761323430613961653264616338373566393634613732613733
-66343232623064656439326433616435333464383138383235306434393137666364316566373033
-31373061653739363064613863633335343561316137633935303466623833393938646630326139
-39353133623530656331323932643164363736386330303162393734313765643833383534363737
-38623632366238623731646462363737333135336335323831653962633936336532343762303661
-65303537366264303535326632306463383735346437313163346530663435383361633463666462
-31306264326565393337333938373430306635303636653138653133616338326631616430343364
-61373064626230383938643233373637346234386133393361393735353330373162323038653262
-61383465313231646635366434373666653634343234343266363437663763633737323738383939
-64396534343231643066336432653430333131333731643930343362303631356335363131356165
-37653464386238303565623935346666333165363264646165613431343966643263663630663332
-65653536613932366266633635663532313933623065336332666331636233343563363461613964
-62343464393164613935353938323661386665613730353030363966313735363133336530363232
-64356339613963646263613364366362643838316234666465303831376262623937366438636166
-36333737646265336131643264333631383838643366343262653663316431636635363530303962
-35323962663035396666633735623563653364666436336137656535303531353366653733343761
-63623165306133356261363033636263376565643962616635383833356236396136

docker/envs/hitparade/pollmaster-config.yml

@@ -1,27 +1,30 @@
 $ANSIBLE_VAULT;1.1;AES256
-39633232643739366565366135306531653235356639316431343864626263366634316638313636
-6239366463313463663764373835326635653537626634630a343963616163326534326565663936
-65336166626164303033646332316534326431323631646137333637623863613331643732333932
-6235613066363363350a613166373864303566616430303463656333336133643233343166363361
-61626336623832363339663766303635303166663538666662363137613561396130643865633665
-34613166333265643436303564306137373339316464613366353361666633646237393439383139
-39366136333664356365303234343336396661613832643762663536633432303665653432636336
-30343536363862393365386561663162363632303734396431303439323531386134356265663062
-61653838366338653435333534326630613733396533393938316338383136373739376461323964
-66663930653834383762363265646634396335323737356436333964353761333630373435663263
-33356430663133313863343130636666613663633337396561633164393331343836393133303437
-63333964356534666266656139663333313264636265636137636132346163353664633130306665
-30343238333031346439363531663661656436636535386361646137633937616136623032653263
-64353338323063393630303763363434636362393365306364346435653962333166313131386432
-63613538653634653334646138633336303063643562653366343830343666353035356534663262
-32363363363633346332323537343565633637626666383164666131633363363033373064353566
-32633439653830633234643664333462653634626165356664616230353965396131336534346239
-63643532366135613233313439383863623839326361333630373131376361636363343363666139
-66393964663862396234303639613834316364613237373565373463363761313233376430396130
-39663333346665373862383333633932646531323466623662663630333136393539343061323636
-63393861643034303839366465383564646463623633323732313662613235383965666633623665
-32333365383734313033313139343963323034396137346232313331636139353134366162663163
-39623136393130353366623935306232303561353936326630373230633734663638386662626665
-63333139383564386263613337363632343139613935633433643532373262313832623639326537
-64343432323233616164626164313638666432633132393339663931633238343430373366373962
-3132333365636265366634636439613166626435653238336437
+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