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?)
+- [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 `paul who can `sudo`.
+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,19 +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
-        - path: hitparade/mopidy.conf
+        - 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
@@ -134,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/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

@@ -1,10 +1,28 @@
 services:
-  mopidy:
+  pollmaster_db:
-    image: git.pbrinkmeier.de/paul/mopidy4hitparade:1
+    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:
-      - /etc/pbri/docker/hitparade/mopidy.conf:/etc/mopidy4hitparade.conf:ro
+      - /var/lib/pbri/docker/hitparade_pollmaster_db_data:/var/lib/mysql
-      - /var/lib/pbri/docker/hitparade_mopidy_cache:/var/cache/mopidy
+
-      - /var/lib/pbri/docker/hitparade_mopidy_lib:/var/lib/mopidy
+  # 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:

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/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/.env

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

docker/envs/hitparade/mopidy.conf

@@ -1,29 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-30376238333130343636356165626230306663333433303031333364623636323638623335383633
-3530636161643935356530383934306230303434333232630a633435623533393632393938386638
-66666335343933363831656431333337636138326638333962376262626134353364626633363135
-3830353238396238340a366635633532656131663363646336326364653332616639653437353935
-39383934613863633933656135656566666339653462363233663136613437623266326537303661
-32613061373537636666386561333238613831343462353265616235303830613038623664663335
-32393763326331323532653062303731663033316134623762386231343563643733356166326663
-66663532376466313066636262333632393932383239303565383439346634306631343939313965
-34336234306665313362376161393861623735383935636364336539386334636238316135373639
-63666265653961383634646432376238356331633130626133316133373662386439376534656461
-61333937366433636136326531326365353431656366313563393630613836646538666562313135
-31633735663563393662353830336330366236626630613637373165313937366465396363623963
-32653162393432306161646437643965376231643433616638636636626135353665303233643366
-64636332373332383839353335653762393964623633353361363539323932376666353636323563
-62633133613538306234613137643163346338616461346265383633663161396633303562336637
-38616136626239646664366237323561373939393065313435316137373564643566383335313739
-63616664653835636566616564376131383763373031363538333637396637363437633762363963
-34313835663064666537303764343631626633346130386236303962643738383232363935646563
-64326564383132323563343566663865656235643264303634616561616365323630376131646432
-64393861376639323864366130353435336631636430326634386262376564653936383233616433
-62656166376430373065616330356262376661306236396363646539633863326161313964613666
-31353131306535653766323432373130353530376331326233613064363336373961356336333339
-39383634653531623739316639623561303065396334393061636635613532383764343761633930
-64373635366634376330383234633333363136326337373835323736656439306164346135643163
-34626665303163323139363631363536326639313635646336323264326638383062333265653033
-63633034306266383264363666383231333965306636323761306136633433663139653430633235
-61623334373466383761386365303737343839396631343733323362363736666535613230316235
-65333161633766636635

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