From 176cff5e6dc893b3dfd7ef4e62c41abbe82330e1 Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Thu, 26 Sep 2024 15:23:43 +0200 Subject: [PATCH] feat(dgsi): Update source and settings --- machines/compute01/dgsi/default.nix | 9 ++- .../compute01/secrets/dgsi-kanidm_secret_file | 56 +++++++++---------- npins/sources.json | 4 +- 3 files changed, 37 insertions(+), 32 deletions(-) diff --git a/machines/compute01/dgsi/default.nix b/machines/compute01/dgsi/default.nix index 22c31cb..968f55b 100644 --- a/machines/compute01/dgsi/default.nix +++ b/machines/compute01/dgsi/default.nix @@ -131,14 +131,19 @@ in "profil.dgnum.eu" "dgsi.dgnum.eu" ]; + + DGSI_EMAIL_HOST = "kurisu.lahfa.xyz"; DGSI_EMAIL_HOST_USER = "web-services@infra.dgnum.eu"; DGSI_EMAIL_USE_SSL = builtins.toJSON true; - DGSI_FROM_EMAIL = "La Délégation Générale Numérique "; + DGSI_FROM_EMAIL = "La Délégation Générale Numérique "; DGSI_SERVER_EMAIL = "dgsi@infra.dgnum.eu"; - DGSI_KANIDM_CLIENT = "dgsi_test"; + + DGSI_KANIDM_CLIENT = "dgsi"; DGSI_KANIDM_URI = "https://sso.dgnum.eu"; + DGSI_MEDIA_ROOT = "/var/lib/django-apps/dgsi/media"; DGSI_STATIC_ROOT = "${staticDrv}/static"; + DGSI_DATABASES = builtins.toJSON { default = { ENGINE = "django.db.backends.postgresql"; diff --git a/machines/compute01/secrets/dgsi-kanidm_secret_file b/machines/compute01/secrets/dgsi-kanidm_secret_file index f47a017..aeea6a7 100644 --- a/machines/compute01/secrets/dgsi-kanidm_secret_file +++ b/machines/compute01/secrets/dgsi-kanidm_secret_file @@ -1,30 +1,30 @@ age-encryption.org/v1 --> ssh-ed25519 jIXfPA 7Nd4K/ivG8LyRcT+XhfN8K8OmoGKUPiUacgd5H/YyCY -qHdajtgWM/ON3VHB76DhkDF0BCOhA5UtDTTiOM8Woy8 --> ssh-ed25519 QlRB9Q 25AYqzBKePKEH4Ml+9xB+YxSvIIMY/M7Qo+LomdivHM -SQN/1T/Judvtk8TjhUxhCsJVS73bLqaih6Gn8weVjvs --> ssh-ed25519 r+nK/Q iHlAURzupmiysH9XtEqhg+wbgYlsdLHvVyRzMsWsVmg -R6yA3bt+5E5vhIVEHxu8h3sB9FjLiUH0tp5SKzHM8Kk +-> ssh-ed25519 jIXfPA zSfj75mxEod8RszD4XGaFIeMvcLnBgUHShIW5yFPdiE +YXaCFZ07BMzehG/PCUFDEzRy+y4c+IESO9kcLx+eG8M +-> ssh-ed25519 QlRB9Q 39DPdLnRMs5YSQOr/rY2nXO/8s/oCnYDkRex51tZayw +W3GbNP7qbgW2b0RoZmcWH0kLtQaIV50APGcntjMfn8o +-> ssh-ed25519 r+nK/Q dnX8kPKvyHS5U1N52QTDwonaHbBh8sv2DPBL1PoBO2E +mxduSFeWB4tJlrHDEthNKGv/vxzeWUtNwq1b2nDP6Z0 -> ssh-rsa krWCLQ -BxDfl3xriUdWiihr0RtfSpJ0UtDnF1oTa3n/1w4AMPNowh+kIVRKuaWFa+sVIJMB -RZc+vdymNoUg/i3lAzlX2mo17LGEnX1jGSHtsMY7j1psS4b72i3hCvBLQ9n+kir7 -ub1CVvrsgn6SMzjQWrSNP6IsIPmYcgfJ2pG0J7oD8T6s0hnemm9ywtCmdpiVjh+O -C2DB10qgVACLWOd/Gqd7ILiqeTOlaDHjuFJ3xRoUd7jzeOnG4BZOV8mfT443MoIa -Kg/prr+MN9uf42a6iLb5avf8ZZLnrzoIyT5vJ3BFt1aUz3FX4DyZUrZmhm9pmYR9 -4YTArDtTP6X3+Rimd5rlbA --> ssh-ed25519 /vwQcQ NkudSMrSLIE0WOE3ScJSMBKwVnuz9p3UwKGg9SPDGiY -w2rE2oO1bs0eoySeS0tT0Ic6Hji9qD7iNn0qYiwc2kU --> ssh-ed25519 0R97PA YH3uoQ/zJR/lrvC0TuWTSig/AJYsxI7sVrEhS173i1E -DOdCOmorgGsg4hAXV0nYg9JeDmon2JY02iKq614jxUA --> ssh-ed25519 JGx7Ng YV6RIaM6oIoajPXVDrOuLRy2897e8LUEibyLiS/gf0o -xz+guHt2N+tfIX5kvpxGDNqaez2VA8dD+QTu7fK7Pf4 --> ssh-ed25519 5SY7Kg 4DhAsi0gqOunzEzlFFKeP3qYWos9Mc1UpVCDVQIBEws -4/duAufrk/GHSbj5tEXdL+C+2AO+Es375as+/R+6PgY --> ssh-ed25519 p/Mg4Q +5WtmMV6ruLgQoTZpmBztrH+FS2aCKFcwuLKcweLr3s -xRIVcBt4wV2PtEhO68sJ8/FB177QAq6zoZ1Dwfg1kPo --> ssh-ed25519 tDqJRg wWaBzLqsoPa8/0hjl4eu07dQvGFMLI3R6IrNNZzquBU -ppzkds/p5BF2dIRZERhDD3rtQNxKhlIaoxCSIf20yJQ --> T9':1EB-grease / #'BD[s -lZHA3xsgAESG ---- uk+H++45TIOcuW3Qj4/D1S65Kw8OEb5ZHqWWIlYlSIg -u=JftQ]Epf Oed<ͅ6G'ơa.^H|L*QN5MGatʶ \ No newline at end of file +QN1OOmCREY2LljXm0+TAsOSkjIQ0RXyX8w5TVOOus5QAt1WTJan/mm4X1SviWqmn +UFDIeCoG2l5tBSyZr4VpnDeq7koWRA2eC7WnwWW47PQIRFSyjf+sy00rGR9kxVuL +1M9gsAGa5sud/PvmgSPSLsGhhrPsH/ZxN9beyIXIwmssmjN34KygUz9+u4T8IkVz +oxdq75LMzE2o0gcgC1EZ5+rDq0NSPQ9+1KgqwJuKlLKRXGdudgaVEUxX60g2ZnkX +8fNEgxqEkQ5MNnPfwbVumF6SWmMWyZSJ0rwHC94O1RdRNDcD3yKimuBmNSv2X+3L +cS3kE9LfNst2zBKHBGBOHQ +-> ssh-ed25519 /vwQcQ ZD8aiyO6fWEM9zG0iPP1/lftRPNl+mmFLHvGxVpSWzg +ZcTmN8zSHz8iLQmCLTZCdaqX5En/KrciR8KHwoXl8t0 +-> ssh-ed25519 0R97PA xLQYBS5ozP1e4NWVa9yahN2OQB0Luw7mm3nBYdoHyRI +SKTRzLfGNFQ9fSX8ZFkKIYPZ4If5QrxcmSoBoGVG2Xk +-> ssh-ed25519 JGx7Ng XPo1QJ8OS/ShEAaXWwzZCS1p5/C6mLNlk4Us63YTVQ8 +HGbfr8WBfCDKnIlATAeiE6JcLWCbn64vn1Cg7i9QGbA +-> ssh-ed25519 5SY7Kg CFpRcZmZ7DTspxkmdD8x7dRh1mqOHpTF7GzW5xBtLxw +n1n6/Ciwwo4rb3Cb6Yv/b1dHSvVAbCuDZ52maNpCexg +-> ssh-ed25519 p/Mg4Q km6ZjasKtOlaQL8rdVXkjRP4sooql15PrW0lz6YZaDg +Yrpi65IC3RJS3YSAChKjVyvowGxxmSPFkwa6CXUYVZ4 +-> ssh-ed25519 tDqJRg au3x6e4L1os7OH4WXbdST74LhMsHPjP6KYrTWKUc1i8 +zxKFk51MteTETWEu8peSH/lninM3zZkQi+Xjx5OQMTU +-> l$R6Y:c1-grease +MY0HS+ErZAtAhg +--- w+3gxmkrZ+xxSAQHbERgvsqur0v6k2/U0KUsfegRGcI +7ڔgp7\E~$\ĔQHR2'k4zqȦ'N!{@qx΋,+iT \ No newline at end of file diff --git a/npins/sources.json b/npins/sources.json index 24a74b9..f1f1431 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -57,9 +57,9 @@ "url": "https://git.dgnum.eu/DGNum/dgsi.git" }, "branch": "main", - "revision": "5381b0379b112778cee05f7fa5dc989da96a77ba", + "revision": "7885252b4a745426ff9cc062ca00d18b98f0723a", "url": null, - "hash": "0r7k9mp04qwffj5f1xnqzfiwls6higjcj1radr3gh53sslvp36ca" + "hash": "17357ajk94j5dxn4c815waa4psrpl0pb881js06xiqaqpj6k13rl" }, "disko": { "type": "GitRelease",