From 00109d7c09a09bc2a9c370378096f75f5196f426 Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Wed, 5 Apr 2023 11:39:43 +0200 Subject: [PATCH] atticd: use postgres --- agenix/hosts/attic/atticd/environment.age | 40 ++++++++++++----------- home/programs/scripts/attic-system-cache | 9 ++++- system/nixos/atticd.nix | 1 + 3 files changed, 30 insertions(+), 20 deletions(-) diff --git a/agenix/hosts/attic/atticd/environment.age b/agenix/hosts/attic/atticd/environment.age index 4f4b13e..6428a05 100644 --- a/agenix/hosts/attic/atticd/environment.age +++ b/agenix/hosts/attic/atticd/environment.age @@ -1,21 +1,23 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE10R3A2ZyBBS0pw -KytWYmJDN1phZUsrdXFvYVRtVktSdFduK0N0NDJLVVZjV3d1TjBRCk95Zld3ZDdw -Mm41c0M5ZjBvNm5YZ3hOa3NOOUxieTV5M3g2bk1nL29ONkEKLT4gc3NoLWVkMjU1 -MTkgc1ZmNkNBICtmUjVTblVyTVAxaTZUbXRPUHg2N1hudXNMcy9LMWpXOXVPWlBV -cXdJeEEKL3pldlRuaU9qb0N4ZS9KMnJVZWExK1VmT0NUZS9zRkNTcyt5ZDlQSjlO -MAotPiBuRS1ncmVhc2UgPXlTTDJlJiB7cCsmXkIgdTA6bwovYXlyeWhCYzFCa3ZR -M01BcTI1MzRQTHZ0UWorbW9rNXVRZkR1cmxxQlE0eUUveEpVa2hpWVExVm1UOFVE -YmVQCmZsM0VOTk0vM3haNHBVS0RUajJJRXg5ZUd1ZE1HdFprUnVLLzcxcG9NNWRF -RVBwWEtqOGpQV0EKLS0tIDJCR3FadFNRSUxidURtNzMybFYyMmtDUktnY095SEFO -MCtFTmMwVFgvVnMK0Fe7h1nOY+V7gP3V4gWwMJ/EXC9a0Jc1lFwH1gKFAw71epul -1PMsdO2T8lTn43r9A8B6Q2P53w37JKGheIUo58OfuQDuBNE7tliNMyQ28Lw4B4a4 -NaIa980GSUE/mycowS5pn1G/Yw78iLyzpVaMlqQN+0p9JljvydOV4z7Qnjawyx8o -MdLEg6dtCrutPW3DW9hd1gwJxkFevFZcOW98y8EbVOrtwQwkhT+2yyM8w4fq60CK -rurgybWFsj943YZwPD/FT9Tt64CLpO62Z6P1I/nQZjTSpkCiVwFJD0gP2xwTvGMj -fmEtlHg83lzEaO0X40m8PKAce7b0GVbLW/UjGkQ4QFvsRjkJCKXW7xKXHCXGDm85 -PWa3XWS7I/mtvBJuYS2uR4CposhZ8XSsluk0xRVOgZw7Mwq4aZlAN67gdsEQzuqR -v2+TWg26MWe9Kqinraj7zy20L81bkWovDGApcVI5QNPIP6v9wQipLQVtsQbEN6p8 -Int8Y/gI+YJJWhr13sD1KVwqvXAioI155SvyXlcLip2tNbjEip/HF7bJUhxo/fEc -H6QZ4am3o6sv2F0yzzUuQtwakS1pAY2VmT/zXb/Yd4B8KyKGnVh51Xx6rPo= +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE10R3A2ZyA4RHBQ +Q2w0dUl6d1RpLzBXWklFM2kvZ2MzZ1VLMWFuK3c2ME4rQUJyOWlvClR6QmJqVytD +WU1RQlFKWm83SDQ1ZlV5THprQ3ZjTnpDWGwvSkorM3d1QTgKLT4gc3NoLWVkMjU1 +MTkgc1ZmNkNBIFNObjh1TVY1M003ZVlWNmhXRlNCemdmM1hWV3RmWUFCRkpOMGJw +OTQvRncKeXE4cVhqK0tQVHp5aDEzNGIrUVF3NmpuYmFScEJ6NEtVbURjb1Y2MG5C +ZwotPiBfTWNMZkAtZ3JlYXNlIDZyNiBXIDQjbnZFIE9+CjJ2d3JvK3gzcjhQMXJI +RWdYRGlvdE91RjFuaytmZG0xMGt1ZVdnSko0Uk1FajNLSTYwaSs4R0ZmTVVyMXRx +VngKWGw1b05Ya2UrVkw5V2NTWng0eWJKdzQ5MkJmclNnCi0tLSB2R1lxdDVabnBU +TUErU0U4SEMvZ2RValllak9ya3JBM2FTL2QxM01sOXU4Cg8fsQVNY4kNVEY2cK3Q +S7lZ1Xlkh6KLqrIos8Nh4k8sINEBY/MvF/prMSaJUxVaCArXIleAK353A2SK8hCk +infI/rRt3STKonXNDXCBJpbAjQwVTO3x5oFk0b7QnDn9wu8LsaOKdsnPhVF+ZHNH +Rj7d/o5e0icyeej8cxU4s2D69vIgENPt8EllRt3kwFM7hOdxLQWKh5rAMu6jX2JH +YLqeHS23XUulASY4ghOQRvZ8eXVLOo1E5WLzNh+P5OJ+L4hn8DqdMaKb/Lictawi +X8T2phcS9abIjIzdwACODLBLbVpvvlAaC5V+O7faNFQ691fOjdYi1IVicL83etAL +Ij3vVkZESApFUqRhRUesZwrMjwe0iQLMNj8VzZ0g5Doc2hKyQE6P0A0wA6LYrasU +OzjeQBfGLewrtIOBWqYupJi8BLQhb+sawbNovHXL6QiskZY/pXIvIYSZATdadcHH +iKid+DlWiXqdaqQUZosub6NxXxzsVE6YC8etvne/gwdGucMsKF9AHSjO78ukQ7yz +6BInWthmSihAc0gvtfyi9vDjdXRpa4x8+oS8Xrdj71R7813HTps+ILlKzD/YyE/O +cK40hQWun6vy4xaCv/gL92Z1RpbSxGlbFYdm12DmuXuc2fPx5KcBYvhTIIAfbrMi +Mud6FrYfMFZFd9VdmqcExHU/lftNvYpRTOwgL7rFlIXU64jbCyivXinhI5z+xxl8 ++g== -----END AGE ENCRYPTED FILE----- diff --git a/home/programs/scripts/attic-system-cache b/home/programs/scripts/attic-system-cache index d3aead3..0f30017 100755 --- a/home/programs/scripts/attic-system-cache +++ b/home/programs/scripts/attic-system-cache @@ -5,4 +5,11 @@ set -f # disable globbing export IFS=' ' echo "Uploading $OUT_PATHS ..." -exec /run/current-system/sw/bin/attic push nifoc-systems $OUT_PATHS + +if /run/current-system/sw/bin/attic push nifoc-systems $OUT_PATHS; then + exit 0 +else + echo "Ignoring error ..." + exit 0 +fi + diff --git a/system/nixos/atticd.nix b/system/nixos/atticd.nix index 8b44556..1505b85 100644 --- a/system/nixos/atticd.nix +++ b/system/nixos/atticd.nix @@ -13,6 +13,7 @@ in settings = { listen = "127.0.0.1:8080"; + database.url = "postgresql://attic?host=10.99.99.3"; allowed-hosts = [ "${fqdn}" ]; api-endpoint = "https://${fqdn}/";