killua

newinfra/nix/apps/killua/default.nix

@@ -0,0 +1,35 @@
+{ config, lib, ... }:
+let dataDir = "/var/lib/killua"; in
+{
+  age.secrets.killua_env.file = ../../secrets/killua_env.age;
+
+  virtualisation.oci-containers.containers = {
+    killua = {
+      image = "docker.noratrieb.dev/killua-bot:ac8203d2";
+      volumes = [
+        "${dataDir}:/data"
+      ];
+      environment = {
+        KILLUA_JSON_PATH = "/data/trivia_questions.json";
+      };
+      environmentFiles = [ config.age.secrets.killua_env.path ];
+      login = {
+        registry = "docker.noratrieb.dev";
+        username = "nils";
+        passwordFile = config.age.secrets.docker_registry_password.path;
+      };
+    };
+  };
+
+  services.custom-backup.jobs = [
+    {
+      app = "killua";
+      file = "${dataDir}/trivia_questions.json";
+    }
+  ];
+
+  system.activationScripts.makeKilluaDir = lib.stringAfter [ "var" ] ''
+    mkdir -p ${dataDir}
+    chmod ugo+w ${dataDir}
+  '';
+}

newinfra/nix/hive.nix

@@ -168,6 +168,7 @@
       ./apps/hugo-chat
       ./apps/uptime
       ./apps/cargo-bisect-rustc-service
+      ./apps/killua
     ];
 
     deployment.tags = [ "ingress" "eu" "apps" "wg" ];

newinfra/nix/secrets/docker_registry_password.age

@@ -1,5 +1,6 @@
 age-encryption.org/v1
--> ssh-ed25519 qM6TYg 1HgGuuBWZKvGpR755SyGybRGIq26JR8qb4x4hywwWU8
+-> ssh-ed25519 qM6TYg zTO/UdUBxYl0Q3IZT7iLOPDUCiWPp5K1a157Qlc6awQ
-6e0gmCgL6CttzzzZ73oUYzpCcvhArAdFJGycwacFaIY
+TfmaPGwtJwj6Qi4nuQDPAcbiS6d+wLNyc101qWtK05U
---- tfUAHcZONQZuZIXtumjCh1Crawf+BSl7djHSHC3WvJ8
+--- Y4KMA/9Tjq2Dpe80sG4UIVgLht9rPdT3qAI1ZMujspU
-Sùs¢ƒ.²QeMçœ~Kàâ!ÙŸ•\‹‡ˆC¥¨<C2A5>qêy¥^)<29>S¸ìGøjaòŽaÕ™
+ò¦äññQ“x3*…QU=àÉHèÙ2Íàˆ30àÏÝ2ñG÷Š
+šr)k/ÜYë¬ÒhcÝ

newinfra/nix/secrets/secrets.nix

@@ -20,6 +20,7 @@ in
   "loki_env.age".publicKeys = [ vps3 ];
   "backup_s3_secret.age".publicKeys = [ vps1 vps3 vps4 vps5 ];
   "s3_mc_admin_client.age".publicKeys = [ vps1 vps3 vps4 vps5 ];
+  "killua_env.age".publicKeys = [ vps1 ];
   "wg_private_dns1.age".publicKeys = [ dns1 ];
   "wg_private_dns2.age".publicKeys = [ dns2 ];
   "wg_private_vps1.age".publicKeys = [ vps1 ];

newinfra/nix/secrets/wg_private_dns2.age

@@ -1,5 +1,5 @@
 age-encryption.org/v1
--> ssh-ed25519 5bWSnQ yYpbqupe6d0ZiH4CxnkHx6clUSI6VOAwiFicoeghIi8
+-> ssh-ed25519 5bWSnQ EtJ6xvnAKqBQAcMkg8ZvqlKLds+fAurbMDwa2y59WzY
-Q1rxBbAhYeZfi5uSNW7/kE/sn15ZpDSxC/P8/SuekWQ
+1K7hYZsklt50rzd3m3s+eJz4QRnLffCTJkNdg5XgXko
---- CsY6lrPSTBryg9t7U1FfnoAYoz0pDRhRpkTy+bsJrZc
+--- rwXlwZH92YleL48/WiC7+sjUSPRcIak5S4UIkhoSD10
-E¤›'¯½fŽìå0Ö7TÉBcôœã¯¦<14>±‚-߬½&‚K¬“pdç~¯ØG„üÄÁµm8: )L¡pyÎòœ x˲ûÑ<ˆÿ
+ўµ.µ“‚ВТSњWущб<-э8YДЭ?и)T&«ҐьЄГЉќN¦БЮ2ЫZJ¦„;в&СТВ39dъФ{ё8љлЭ:yЬ^ЯKл™І*‰

newinfra/nix/secrets/wg_private_vps3.age

@@ -1,6 +1,5 @@
 age-encryption.org/v1
--> ssh-ed25519 XzACZQ Z787iJONQm/qtLcIIeEKXYd2nu+fuhUnUGgtCsYzmAk
+-> ssh-ed25519 XzACZQ zCt7Biavy5amayc4xU57K6vv+4/MgKZRhNwvA6xdJQE
-u9LPx7wwwUzBvAUQ1VudVMQNPGiUXrgF9bt5o3gJpCE
+z/TWt8WbdZcXsbZSmiJ/Yp1ormoVk88HlXxY+8lmF60
---- zOK68y4biCz5HLuRpQC04CdmAzJTJNErdYCOpopv4gc
+--- x5fpB686RpY4KxbKu940m29V4E+wdzd417YaUxzT4V4
-
+Ť®a[…G‹‚ěŢg”牢¶ÎŰ<C38E>Yß'¶<>ą*|ÂŰWmPBR–ZĎ­ţb\ůĘłÇH›AO$„űkĂÇť .8{ô'nŻş4«#Ľ'
-ł3˝Řţ‚nu™RČŹŰđäć±qţ¬ón0ť­=JC˛Sţp€o<E282AC>FĂŹ‚]ťĄĆhy-ľX
\aj<08>˝|n~˝#0ŠŹ#kg5ŚČŹ[¶s

newinfra/nix/secrets/wg_private_vps5.age

@@ -1,5 +1,5 @@
 age-encryption.org/v1
--> ssh-ed25519 vT7ExA dkSxicpdvSQagXqKlUQniPWc+rlJX5jNm+z4hGTBpTE
+-> ssh-ed25519 vT7ExA CiVQ2IEuo9cylHm0eq8jH6gVCl9rH3hOoPbu5z4ye2o
-SdMHYW1u1KZ9oA4Jvd+GS95NC3vNWOvwziRtnuSJVP8
+b2OM+VVNBul+AbeMRCfGyauki/OtDDQ6i3vyFSe2U/E
---- ceiXWtAwbztkvzcqIs5c/PSZm8i1LebKoZwq2asmDv4
+--- IBWDOHXQNklZZRKsWEZt81tMNqw6HJFFk7U1HP8sgXs
-I¤^»þ7ÞÜhá!ü
EB–)<29>ê%ŸQ¬£ˆÔ+TJÕ(iïã[a"ö@nHÿPüØÿðLÁzÛ-AH[…NJikê8>¿a£Ð%ûáŠ
+JDžÍl”q¢ÅLÖ±jb÷ëBº©‡ZÿeÄkl.“o\Õïê|op
àAWÞʦ̂1¡h>NסÈØ`åf^ V‘Zâ<5A>½¿Ó?«

newinfra/nix/secrets/widetom_bot_token.age

@@ -1,5 +1,5 @@
 age-encryption.org/v1
--> ssh-ed25519 qM6TYg qQle0goi67ti4vBo08kuW0eMyu84L/BD1DoWJG9TVEk
+-> ssh-ed25519 qM6TYg 8PHArngZr845Vyzvr06Syrn4w3mV1vbeMKnSzd7PtUc
-UuPIdnOsyQM/o4Mt4y9gVis0jyMuxg30h5Gqc52BqCk
+GoI7ssVbQzlQAZPopxMpyKdhv1BixF+eac5nQA0Q+i4
---- SJmbppqEFhPnb5k2DlyeUuHGzB6nYJcOBvr0s7Y//ls
+--- c/MJSct6IxWiitSeEGez2c55nQ94A22OuM4NliuHpOk
-jnl³}.r<>ø‰<C3B8>#SF&¿ðjÂ;Å«b“ÖùTxZQ{·;öa$ão"ÿ<>Þßß™éºípJå½Ö~ÛÃd<19>ùÊ
<01>¸EÅ~¶XQ+°e<C2B0>)|l‚Ú7>÷/û<>½
+ÿw*­_P‡fÁYÓ×Yç-‡š¡©ylAtˆÙ½U!ÀAЇUì³1÷5f‘cFùÀ/ðžœcÉŠZ%)NÁ¯÷Áhƒ‹âTtd–þÅÈÚ?²›7>ë:UÅkü

playbooks/vps2.yml

@@ -15,14 +15,6 @@
         hour: "7"
         job: "/apps/backup.sh"
     #####
-    # APP: killua bot, /apps/killua
-    #####
-    - name: Create /apps/killua
-      ansible.builtin.file:
-        path: /apps/killua
-        state: directory
-        mode: "u=rwx,g=rx,o=rx"
-    #####
     # APP: karin bot, /apps/karin-bot
     #####
     - name: Create /apps/karin-bot

vps2/backup.sh

@@ -65,8 +65,6 @@ function upload_directory {
     rm "$tmppath"
 }
 
-upload_file "killua/trivia_questions.json"
-
 upload_pg_dump "cors-school" "cors-school-db" "davinci" "postgres"
 upload_pg_dump "openolat" "openolat-db" "oodb" "oodbu"
 

vps2/docker-compose.yml

@@ -1,14 +1,5 @@
 version: "3.8"
 services:
-  killua:
-    container_name: killua
-    image: "docker.noratrieb.dev/killua-bot:ac8203d2"
-    restart: always
-    volumes:
-      - "/apps/killua:/app/config"
-    environment:
-      BOT_TOKEN: "${KILLUA_BOT_TOKEN}"
-      KILLUA_JSON_PATH: /app/config/trivia_questions.json
   #### Karin
   karin_bot_db:
     container_name: karin-bot-db