Updated to nixos 23.11 (#41)

dd-ix · Jan 5, 2024 · f8d73e5 · f8d73e5
1 parent 1cfcf56
commit f8d73e5
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 62 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,7 +2,7 @@
   description = "dresden internet exchange nixos config";
 
   inputs = {
-    nixpkgs.url = "github:revol-xut/nixpkgs/listmonk-patch-tassilo";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
 
     presence = {
       url = "github:dd-ix/presence";
@@ -22,6 +22,7 @@
     sops-nix = {
       url = "github:mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs-stable.follows = "nixpkgs";
     };
 
     keycloak-theme = {

diff --git a/modules/management/keycloak.nix b/modules/management/keycloak.nix
@@ -1,7 +1,6 @@
 { pkgs, config, lib, ... }:
 let
   database_name = "keycloak";
-  username = "keycloak";
   http_port = 5000;
 in
 {
@@ -17,10 +16,8 @@ in
       ensureDatabases = [ database_name ];
       ensureUsers = [
         {
-          name = username;
-          ensurePermissions = {
-            "DATABASE ${database_name}" = "ALL PRIVILEGES";
-          };
+          name = database_name;
+          ensureDBOwnership = true;
         }
       ];
     };
@@ -33,7 +30,7 @@ in
         host = "127.0.0.1";
         port = config.services.postgresql.port;
         name = database_name;
-        username = username;
+        username = database_name;
         passwordFile = config.sops.secrets.postgres_keycloak.path;
         useSSL = false;
       };
@@ -96,7 +93,7 @@ in
 
     path = [ pkgs.sudo config.services.postgresql.package ];
     script = ''
-      sudo -u ${config.services.postgresql.superUser} psql -c "ALTER ROLE ${username} WITH PASSWORD '$(cat ${config.sops.secrets.postgres_keycloak.path})'"
+      sudo -u ${config.services.postgresql.superUser} psql -c "ALTER ROLE ${database_name} WITH PASSWORD '$(cat ${config.sops.secrets.postgres_keycloak.path})'"
     '';
   };
 }
diff --git a/modules/management/netbox.nix b/modules/management/netbox.nix
@@ -10,9 +10,7 @@
       ensureUsers = [
         {
           name = "netbox";
-          ensurePermissions = {
-            "DATABASE netbox" = "ALL PRIVILEGES";
-          };
+          ensureDBOwnership = true;
         }
       ];
       ensureDatabases = [ "netbox" ];

diff --git a/modules/management/nextcloud.nix b/modules/management/nextcloud.nix
@@ -11,9 +11,7 @@ in
     ensureUsers = [
       {
         name = "nextcloud";
-        ensurePermissions = {
-          "DATABASE nextcloud" = "ALL PRIVILEGES";
-        };
+        ensureDBOwnership = true;
       }
     ];
     ensureDatabases = [ "nextcloud" ];

diff --git a/modules/management/vaultwarden.nix b/modules/management/vaultwarden.nix
@@ -9,9 +9,7 @@
       ensureUsers = [
         {
           name = "vaultwarden";
-          ensurePermissions = {
-            "DATABASE vaultwarden" = "ALL PRIVILEGES";
-          };
+          ensureDBOwnership = true;
         }
       ];
       ensureDatabases = [ "vaultwarden" ];