Update Attic keys (#80)

ethnt · Sep 19, 2024 · 4a32126 · 4a32126
1 parent 02947c5
commit 4a32126
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/flake.nix b/flake.nix
@@ -10,7 +10,7 @@
 
     extra-trusted-public-keys = [
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-      "e10.cachix.org-1:/++Tmo/ghEqnLwsQJdXn04c262agRCK5PaPYz8NcVfo="
+      "e10:h64l3MobkrdOGab0Xaambo3ROC/w05Yi70oJ8U8ZEfQ="
       "numtide.cachix.org-1:2ps1kLBUWjxIneOy1Ik6cQjb41X0iXVXeHigGmycPPE="
     ];
   };

diff --git a/modules/profiles/core/caching.nix b/modules/profiles/core/caching.nix
@@ -10,7 +10,7 @@
     ];
 
     trusted-public-keys = [
-      "e10:j68MhGxnMALWw2CxPA7ngnJ5MrX54Ou7YBWxO6COOgk="
+      "e10:h64l3MobkrdOGab0Xaambo3ROC/w05Yi70oJ8U8ZEfQ="
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
       "e10.cachix.org-1:/++Tmo/ghEqnLwsQJdXn04c262agRCK5PaPYz8NcVfo="
       "numtide.cachix.org-1:2ps1kLBUWjxIneOy1Ik6cQjb41X0iXVXeHigGmycPPE="

diff --git a/modules/profiles/databases/postgresql/atticd.nix b/modules/profiles/databases/postgresql/atticd.nix
@@ -5,7 +5,7 @@
     initialScript = pkgs.writeText "postgres-atticd-init" ''
       CREATE ROLE atticd WITH LOGIN PASSWORD 'atticd' CREATEDB;
       CREATE DATABASE atticd;
-      GRANT ALL PRIVILEGES ON DATABASE atticd TO atticd
+      GRANT ALL PRIVILEGES ON DATABASE atticd TO atticd;
       GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO atticd;
       GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public TO atticd;
       \c atticd postgres

diff --git a/modules/profiles/services/attic-watch-store/secrets.yml b/modules/profiles/services/attic-watch-store/secrets.yml
@@ -1,5 +1,5 @@
-attic_e10_auth_token: ENC[AES256_GCM,data:fwn09gl5+rIfsZmejzd9p6gByUULEX9CE3mAIb+Ip4UnG16KSihMHX/vfdpjnz6erx+dcBSm0iWBm7h9/E+IlD9sFzHY/fH7kTNJAL9ThuZl2uEUU1t44KmJiOLumsz3eKtw7onyXuphHKCD4LzjtHS/EmZiFf2gsgLnpfbynM9CC+IA4HVHHrgAUnUAWxbXu80/n8r4Enrb/z/foWHQwzo8z98uv2cQvcfIno+Hh95zEKXH/sC4uZcsGZdaeoQmStKauAb4TBSgZqdYJVw7Myf6OTw2KZrQcyYjFJ5jkeRV0WV9oU3Gikj1NqQ9lfPKM7a7,iv:Z8idiZyrmxy9OUvoWrjLL77IaESafk76Wy+U9mvlG7w=,tag:V62oJpLJpMLfxoOHF/1EeQ==,type:str]
-attic_netrc_file: ENC[AES256_GCM,data:R9PcbEZMABSUF6Ba+os7RbA3Jo+v3cwxGxihx8GwSIfmC0+Sysus+mquba3x7T298AXg02k0CG9vpxdRNvLgpgQlCJh0yoOaweLwrEqM5mAKbmnkN/kCRRMhUpG9ilH5Sk0cD5t2G/ztCB/WgqmoN54bTaxYX1SbaIaUdP6uHP7q69Hfw9Ee2RMpNVZgzA/+5Onz2OMc3f7/zUCadLl6SYnIwJ4DJ7OCoRPkabFplWgDlwGrIGn8M6IBENkX7iLJaJJXLsESDN/fgBG82zCFN16KQwDh7cnDzE597fpvVd0pv/lJW0pUhenENkwhcOAZbk69ktO+M7mmItZv3VT0LnqKfOpD2fJB8vka2So354rcByWA,iv:sLwi5D35z0jE7tOF5GoQLXQhPF7+v+33UN+WmucH8lM=,tag:+thAWxBI0qcryD/81QhuOw==,type:str]
+attic_e10_auth_token: ENC[AES256_GCM,data:xk/QfyuuAA37H97XpIyeJNe5P3SKjI5iIvksNyMmkrLvMaGwskYG2J0kttKnX7ErB7nOA2vdYBGvU71oYunHsr5PtDJZRPfYeuHIoNCDTCEVwCmiQM5Att61TUsgUS/IlT1Utj3pRMZ/uI0XG7ftzHG/kTjwxd1oSHvvO4HGKhc7QXRzPXaDJwwuiwtkMz2wucu+ouDtQycoESa3DT9pIT5Osn7MO48v6W52Dj9x5TQvI8pe4HbxNwNrUpkRjEBKk3ZinhLj7Zvp29DGMd0avp64zmDYyO6DLtwvuBLmzBMzCwdH63xuOae6wGJ1ncVP3CVe,iv:cEz7Aiqqx8g6gKdGPGLcZgVe6RlL0j6aXlHY3kAk7LA=,tag:wAZqBMG13yRgdMkS/vKfLQ==,type:str]
+attic_netrc_file: ENC[AES256_GCM,data:3JA/hmrS+nnPSb5SMfNGme5YRtfVbRX4PAKmhhiwmcI4KFXoL2fM0h5le9lFiGedl5Fw+Bh6wGRbOxNidSeo6tHbh1++zhMRrrSxQIL/BQzqtDm8hHini96jxP6bW699cKM2PMUanZGajsW2O6f7tZshY6eh4KZJsZix6XZOR/0KKa2U4GaQPR2vO2ZbnAMlQGXkg8OjXbQ9WGVPtw/MrDwgwOGbONwFBitCNgZa2OcuB1UQJJN7QBCEDKkkUhxoY0FxBbU/YMEkWQRDtXdpT91X5TYMFujmRcqOD29yH4r3vnCdBuY5CCAsHy72E21vuZawEr7WZ/+Yca/yeiY9r3Poogg+x+QIVnz9bC0s5U9ro/Ug,iv:QDQSe85LqT7cppLoZTzk5nyL0LSoqq8N3Ev6ExO+p7A=,tag:um3tCmwIF/fQXkhfOar0/w==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -96,8 +96,8 @@ sops:
             M2o2cVlteEZXcFpWSld6Q0VheDl2WmsKcw/O+T/wagNhxkNrOMtIRwRmEUooQytz
             nhhG5r6RZMLGWyMSsn+csZI4KZoefZy34p5ymcNMtIm8nkJq5wNgTg==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-09-16T00:18:49Z"
-    mac: ENC[AES256_GCM,data:Y6Z1GXGK6XS/jAWNEgSXhgKS5M+HdLOlzEgtY/a5sKHjePScpVVuTqh8NyVgt9Nz42b3w9i3UAodW9WSygwYrNAtg+iJbH7j3GUjzP8My3+nlNlTkwoFXnvG2KMTTGeBoxKSTnnve2mkE9BY/fp7g3FyzGI4D+NrFpHrSDjUYSo=,iv:jLX4oVs936ck3OLnVVaM4jdOsrNP/9MoRUYc/t+kCNk=,tag:lxbYHMpruioYi46NWrgYBA==,type:str]
+    lastmodified: "2024-09-17T18:44:24Z"
+    mac: ENC[AES256_GCM,data:iSQyjCnmGPDd+t3ivLNZYHzosdQW13zek5toc13VwNJcEyV+FRbXU1tgZqFaa/akIshhs3Ber4+GhE3gV80Fqep3y20q1gG7yzW6ofis0ElxSi1ZEptYUFiuSGg0Tf7nr5CLYjBR2mWrvApB61TnMkZO00HV36qf5PYU/1BQHkQ=,iv:YcWGVZxB5XWT4UfjsjMvglRlFS14KEVqqR1Aj2DbLX0=,tag:XGiI0XNQlBVx3TWOalB76w==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.9.0
diff --git a/modules/profiles/services/atticd/default.nix b/modules/profiles/services/atticd/default.nix
@@ -1,4 +1,6 @@
-{ config, inputs, profiles, ... }: {
+{ config, inputs, profiles, ... }:
+let storagePath = "/data/files/services/atticd/storage";
+in {
   imports =
     [ inputs.attic.nixosModules.atticd profiles.databases.postgresql.atticd ];
 
@@ -9,6 +11,10 @@
     };
   };
 
+  systemd.tmpfiles.rules = [
+    "d ${storagePath} 0777 ${config.services.atticd.user} ${config.services.atticd.group}"
+  ];
+
   services.atticd = {
     enable = true;
 
@@ -25,7 +31,7 @@
 
       storage = {
         type = "local";
-        path = "/data/files/services/atticd/storage";
+        path = storagePath;
       };
 
       # Data chunking