From 52ac4ca77520b78629119dd56d7f3e776090453f Mon Sep 17 00:00:00 2001 From: h7x4 Date: Sun, 25 Jan 2026 20:56:19 +0900 Subject: [PATCH] skrott: update dibbler + config --- flake.lock | 8 ++++---- hosts/skrott/configuration.nix | 12 ++++++++++-- secrets/skrott/skrott.yaml | 7 ++++--- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 8746d91..6498a3c 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1768138611, - "narHash": "sha256-KfZX6wpuwE2IRKLjh0DrEviE4f6kqLJWwKIE5QJSqa4=", + "lastModified": 1769333902, + "narHash": "sha256-f3HiO+3XoiXhrcnKdNA/oVY6qKJ3n/sswFxzarBlgiw=", "ref": "main", - "rev": "cb385097dcda5fb9772f903688d078b30a66ccd4", - "revCount": 221, + "rev": "e771fb02400fde38f11e740830c842fce6388d7b", + "revCount": 226, "type": "git", "url": "https://git.pvv.ntnu.no/Projects/dibbler.git" }, diff --git a/hosts/skrott/configuration.nix b/hosts/skrott/configuration.nix index 695a34d..4710593 100644 --- a/hosts/skrott/configuration.nix +++ b/hosts/skrott/configuration.nix @@ -25,7 +25,7 @@ # TODO: can we reduce further? sops.secrets = { - "dibbler/postgresql/url" = { + "dibbler/postgresql/password" = { owner = "dibbler"; group = "dibbler"; }; @@ -56,7 +56,15 @@ settings = { general.quit_allowed = false; - database.url = config.sops.secrets."dibbler/postgresql/url".path; + database = { + type = "postgresql"; + postgresql = { + username = "pvv_vv"; + dbname = "pvv_vv"; + host = "postgresql.pvv.ntnu.no"; + password_file = config.sops.secrets."dibbler/postgresql/password".path; + }; + }; }; }; diff --git a/secrets/skrott/skrott.yaml b/secrets/skrott/skrott.yaml index 41dcbfb..5a6b76d 100644 --- a/secrets/skrott/skrott.yaml +++ b/secrets/skrott/skrott.yaml @@ -1,6 +1,7 @@ dibbler: postgresql: - url: ENC[AES256_GCM,data:rHmeviBKp5b33gZ+nRweJ9YSobG4OSOxypMcyGb3/Za5DyVjydEgWBkcugrLuy1fUYIu1UV93JizCRLqOOsNkg7ON2AGhw==,iv:mWgLeAmnVaRNuKI4jIKRtW5ZPjnt2tGqjfDbZkuAIXk=,tag:iHSkFcMmTWEFlIH7lVmN1Q==,type:str] + #ENC[AES256_GCM,data:yba7PUxGNu9mcPwU4xoPlOon/9LAmzIK9Cf4e/1lRiNoCVtCo1MTZ4QH/pC8sZ1IlyaSp8oxZ+iDTwQ=,iv:nO/yeuzeNZL5BgrIAfiegj2UYmkrdbnXCkTqpt4DUFU=,tag:Lk9CKkx810URPrgeGDUuYA==,type:comment] + password: ENC[AES256_GCM,data:2iQoQR2IbJs=,iv:cW6Eav6mBoMLM37cs867k+spNUNc7NWTqcqFqEKO9vQ=,tag:4Tn1mEKFTP/iikXzVL6JlA==,type:str] sops: age: - recipient: age1ug30gg4y7ftuya0wdv7q0vh4egn00wlv2th7mt7cgc2ze46wmvyq9lq6ge @@ -48,8 +49,8 @@ sops: ZE5tMXJOYlFMOVNJU3FEZFB4TlZ1U00KHnunzKMy91oc92ptcaKCE1sfkhFGvf0S vRX/nyQnBGqD3X3yfvkt+aQnoLxcjoanpJVM9VeigyPu1mRg0OOxXg== -----END AGE ENCRYPTED FILE----- - lastmodified: "2026-01-11T17:28:43Z" - mac: ENC[AES256_GCM,data:l43vquKg33LndSXOm0hsPcalQRXjqbb30QvptXuBsmQrcEVVh20Aqp92l+rwgv60P03ZtK4SKxm/udVVoqViFTwCLYtCC5GEn4OqbD94LQKzl+XLe7yLWwv2WF8ueu170YpZ97uFxUrhOoaOaKUgnAV+4CocixG5hfadpqA3yYE=,iv:a6RRILzz4gDUuiSZPVoqjlIMu4NZG+D5Q+brusfh9PU=,tag:Y8nKbnctjka44eH15x8oCA==,type:str] + lastmodified: "2026-01-25T09:41:12Z" + mac: ENC[AES256_GCM,data:1v7TceR0F+s88jrps1O8XZbjl60ynp1eTtjkTIN4xT3x3QMUPNUa0ddx5wHh1AO/uxUViu/EUKayWRGN3cYoXD2fMCwCNTleoXrdSxHcPU5VGzd7LLr4KAPTSZrCFfPR3DdDcSnLubVZw4FDSkUYAXIs6KAqxG5lei0ozESqm6A=,iv:1/pYnWi6/I53BFDfPiUjglJT9DOeDFKV0xqMYlNUXQQ=,tag:PI8mgdwM4YfGw0MmSpDBDw==,type:str] pgp: - created_at: "2026-01-11T17:12:49Z" enc: |-