From 3fef58e8883ff97e48924ede95f707170a6682dd Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Wed, 19 Jul 2023 15:46:49 +0200 Subject: [PATCH 1/2] configure bacula --- flake.nix | 1 + modules/bacula.nix | 39 +++++++++++++++++++++++++++++++++++ modules/course-management.nix | 5 +++-- secrets/quitte.yaml | 8 +++++-- 4 files changed, 49 insertions(+), 4 deletions(-) create mode 100644 modules/bacula.nix diff --git a/flake.nix b/flake.nix index c486812..77c4efe 100755 --- a/flake.nix +++ b/flake.nix @@ -25,6 +25,7 @@ inputs.kpp.nixosModules.default course-management.nixosModules.default ./hosts/quitte/configuration.nix + ./modules/bacula.nix ./modules/options.nix ./modules/base.nix ./modules/sops.nix diff --git a/modules/bacula.nix b/modules/bacula.nix new file mode 100644 index 0000000..9257211 --- /dev/null +++ b/modules/bacula.nix @@ -0,0 +1,39 @@ +{ config, ... }: +{ + sops.secrets = { + "bacula/password".owner = "bacula"; + "bacula/keypair".owner = "bacula"; + "bacula/masterkey".owner = "bacula"; + }; + services.bacula-fd = { + enable = true; + name = "ifsr-quitte"; + extraClientConfig = '' + WorkingDirectory = /var/lib/bacula + Pid Directory = /run/bacula + Maximum Concurrent Jobs = 20 + FDAddress = 141.30.30.169 + PKI Signatures = Yes + PKI Encryption = Yes + PKI Keypair = ${config.sops.secrets."bacula/keypair".path} + PKI Master Key = ${config.sops.secrets."bacula/masterkey".path} + ''; + extraMessagesConfig = '' + Name = Standard + directory = abel-dir = all, !skipped, !restored + ''; + director."abel-dir".password = "@${config.sops.secrets."bacula/password".path}"; + }; + environment.etc."bacula/bconsole.conf".text = '' + Director { + Name = abel-dir + DIRport = 9101 + address = 10.144.0.11 + Password = @${config.sops.secrests."bacula/password".path} + } + Console { + Name = ifsr-quitte-console + Password = @${config.sops.secrests."bacula/password".path} + } + ''; +} diff --git a/modules/course-management.nix b/modules/course-management.nix index 65940f2..ea99658 100644 --- a/modules/course-management.nix +++ b/modules/course-management.nix @@ -5,7 +5,8 @@ in { sops.secrets = let inherit (config.services.course-management) user; - in { + in + { "course-management/secret-key".owner = user; "course-management/adminpass".owner = user; }; @@ -33,7 +34,7 @@ in }; services.postgresql = { - enable = true; + enable = lib.mkForce true; # upstream bacula config wants to disable it, so we need to force ensureUsers = [{ name = "course-management"; ensurePermissions = { diff --git a/secrets/quitte.yaml b/secrets/quitte.yaml index f1c2a11..7df8a20 100644 --- a/secrets/quitte.yaml +++ b/secrets/quitte.yaml @@ -23,6 +23,10 @@ vaultwarden_env: ENC[AES256_GCM,data:X8wdQSieXfgNUqtoFRgz43jsWyrUQ1wxsM9L5iHoE8Y course-management: secret-key: ENC[AES256_GCM,data:3WwhgZ+ElLOdEgdy/EoOL1vqkcXfnOnUZMKUsD9rd7I=,iv:eMo7HeOkSPGpCbLMi/6XoD4MXd27OageRsz70lyXNf0=,tag:u3H9BSv+7lasnBl29l8o3Q==,type:str] adminpass: ENC[AES256_GCM,data:WUDsz3S88y590oStJinwukT8hJ+0dJ9/To1pDUWEN6o=,iv:5VSZohH2l/RNTNaWqMd9Y0JlSs7Cg1TRbeTR+OKhedA=,tag:LagNEUEKhNXIRKNwjmizbQ==,type:str] +bacula: + password: ENC[AES256_GCM,data:jxNmvGLLw68vDZeFiTqS7E/Af3ot0EaRZ2bbn7eLbQ0i3Xyc3vvNqLF4j5U7MOxJ,iv:lfPpWXz2h8iSyECaPVJzi8sdks7fxPHewHagaKCBHY0=,tag:5fHWGeC0s95IKlRCWEYsfA==,type:str] + keypair: ENC[AES256_GCM,data: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,iv:DEzZocX7nChUd6L9v3iqEeMcxWCZY+kbUnDLbikBVe8=,tag:8iPhbcAfQXb4GXMEfuvxqQ==,type:str] + masterkey: ENC[AES256_GCM,data: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,iv:G85YO9nGE6ABZS5LPEBhyaiU/Zei19H3ImERCjk8hQY=,tag:qC+vJPy9bD5k/kV/z/CBaA==,type:str] sops: kms: [] gcp_kms: [] @@ -38,8 +42,8 @@ sops: NEJBTHE2end1RDlHRTNFYlZjTjhib2cKmQRHpBKZ2DbQ5CfOwcSPfZAm9fnnpxUk +LcR8haK//O3N2uNf9etDW3VsT5ipPucCdFU1m/v9L5tcN6ZP8WP+w== -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-07-19T12:23:17Z" - mac: ENC[AES256_GCM,data:QLrZopVD2iL8J4KH4HTM1tkEWmPqY0U6g2bKmhb7R1ZzbopqJfQezv4zqcp/2H8Zz17X4clZ/TidetmBm7avjfj9znegTL4MsZQYqCe+qG6qlXF8GcGjJ/Wja8k4ofCyvsXHarLEulPZKxSELGrU0B6FBUmvnWrV8k4IRGad8pk=,iv:mbv+8AsSOmDasOXOc4r2mx1GCmnRozwgzSDh2U44afk=,tag:cKuWuB1dVJfU3Wq7wB+tBQ==,type:str] + lastmodified: "2023-07-19T13:37:39Z" + mac: ENC[AES256_GCM,data:88GxfgjyJM0LzlaAW1u8CMbKuFXxffY4OAPwxl+nBbzDKwz1M5Vv6EFJnngwYARiE/5F/2lxZIE/uIJtafr+0hmzvaOHg0ISFfg72BmB64P7i8Y1i/ICCsZ28ZDAA5to5J9TzZx+0e1bGziBKvHveEtaAWUbGIBfHCxV9jw0zWw=,iv:Nk61fI0h2QDUunR9xdYpFhIaNtdF0RLyRTliiNTKGHo=,tag:wjQfe2n3c2GeHeRgstARBQ==,type:str] pgp: - created_at: "2023-04-23T17:48:54Z" enc: | -- 2.44.2 From 8b30a10c0f24892f6689bf475e172ce3b5248e33 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 19 Jul 2023 15:56:07 +0200 Subject: [PATCH 2/2] bacula fixes --- modules/bacula.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/modules/bacula.nix b/modules/bacula.nix index 9257211..3166da7 100644 --- a/modules/bacula.nix +++ b/modules/bacula.nix @@ -9,8 +9,6 @@ enable = true; name = "ifsr-quitte"; extraClientConfig = '' - WorkingDirectory = /var/lib/bacula - Pid Directory = /run/bacula Maximum Concurrent Jobs = 20 FDAddress = 141.30.30.169 PKI Signatures = Yes @@ -19,8 +17,7 @@ PKI Master Key = ${config.sops.secrets."bacula/masterkey".path} ''; extraMessagesConfig = '' - Name = Standard - directory = abel-dir = all, !skipped, !restored + director = abel-dir = all, !skipped, !restored ''; director."abel-dir".password = "@${config.sops.secrets."bacula/password".path}"; }; @@ -29,11 +26,11 @@ Name = abel-dir DIRport = 9101 address = 10.144.0.11 - Password = @${config.sops.secrests."bacula/password".path} + Password = @${config.sops.secrets."bacula/password".path} } Console { Name = ifsr-quitte-console - Password = @${config.sops.secrests."bacula/password".path} + Password = @${config.sops.secrets."bacula/password".path} } ''; } -- 2.44.2