Merge pull request #338 from DarkKirb/move-attic

move attic to one device

config/nixos-8gb-fsn1-1.nix

@@ -30,7 +30,6 @@
     ./services/rspamd.nix
     ./wireguard/public-server.nix
     ./services/shitalloverme.nix
-    ./services/atticd.nix
     ./services/initrd-ssh.nix
     ./wireguard
     ./zfs.nix

config/services/atticd.nix

@@ -16,7 +16,7 @@
       listen = "[::1]:57448";
       allowed-hosts = ["attic.chir.rs"];
       api-endpoint = "https://attic.chir.rs/";
-      database = lib.mkForce {};
+      database.url = "postgresql:///attic?sslmode=disable&host=/run/postgresql";
       storage = {
         type = "s3";
         region = "us-east-1";
@@ -42,7 +42,7 @@
   ];
   services.postgresql.ensureUsers = [
     {
-      name = "attic";
+      name = "atticd";
       ensurePermissions = {
         "DATABASE attic" = "ALL PRIVILEGES";
       };

secrets/instance-20221213-1915.yaml

@@ -10,7 +10,7 @@ security:
     restic:
         password: ENC[AES256_GCM,data:80XNExfwBIG3aVNQBc8T2fdN9oA=,iv:JM/HU7vhx28VA9EppxpFc3xRVcAt+kp3JwTuHmFpL78=,tag:pC73+XCsFGTdA+MbTihD7Q==,type:str]
 services:
-    attic: ENC[AES256_GCM,data:Z/XoViD/G6goXoS72sPRxwWW/biLxEUIKkw/O9Kj6/KMbxXQx8cYvkoG3bv5umE6+jcJjwPrthvOUip6jF3D0XgEPuB9dPmeNZURFxhAGkMkcCpHk6enVavhSeb1gciuCQI6hEn8FTaf8jhZ3MsBUfHeFu/rV7UqZvxf4k1/A9sGe81zR8Ez2ZUkb/nEGpTj6Z8Pg9LKUSK0QDVsPRPOcARtmjz35uiTGe8OWBodM+bVQs+F4PA6jfaqOC14STTpRxR296/Mnpu+/pZJTA4bft7JOY1iBMXTKzaK0Zxjwc6h4t0Lok5ORWPOZWCGBwJIvIB8LE/YkbT+vVMsC/rL+Qda6jwUO6tam8VdJknKi1jbboCnZjSIIqC5yD5AcGElUWaQ5Xn+F64HwkK1IgZpl5v7mXWHdiat1uznXGvESaWsgRlbxQWIrCmCvEIOw7ZF7fDArPmkbCU6AIlMOOUIEvgQiR2VWNW2mxovm9pyqPjOr22xw5i2,iv:VB8CsGDiHrGe+5/wq0bkjzyAMicExA3TtbArFQ/3abY=,tag:3WX1DEVdcOluijd1flkmXQ==,type:str]
+    attic: ENC[AES256_GCM,data:r4Ye8/EYHLvUHdlozsnTzOFP2p1cRQituvGdwpuWkM6lHyWA198YDiE87/suNFTBe8NrEnmaQoGRr1QgLHkzrrIdIRI0cWZSMTFdfYgBJHsJ/FlbzGVbtgDOUNVnQ9zJB90v19ZOaDNuWMsdbVqdZZJUIvdbH6bQLXJIY2C8nbhgKSvukja9EpzB+Ee6XIpxjQBScJ7nBl0kW4P7If+fv4P7xa7EsjPO24wJQ4L/c4HH5W2pSiVupcmgjD++hs9mE9yKjhMTDRWOYISpbzYU20e+jMePnEfAcrO6ybqHUziPge5S7twnUw==,iv:A+Yci6wMs/uzFf+81gqZFsHCI2j7+ERQK5OyH+lh/S4=,tag:QY+HonrkI328ERb+SRxmxA==,type:str]
     chir-rs:
         database-password: ENC[AES256_GCM,data:selw9JIny9dNpuMVUlLg50YC4Tqbm2I+/3EEZsDbO0I=,iv:VKmdFvQJsI0KiZNZVLSZjVLGl85Xp/P47/YrfBeUPh8=,tag:NCjXDA9JosqIYFC3sFiIPg==,type:str]
         signup-secret: ENC[AES256_GCM,data:PV4Iau9Wkvmixn8Tirvxy/fuPk94PjkovQlKyF2OqwI=,iv:UtqUFewEthfrGW2xo5rtz3lrnD7LXk1C+msPWGe3f30=,tag:9fuV1SIBK+uOoeIG3K5UhQ==,type:str]
@@ -52,8 +52,8 @@ sops:
             bVJUcDZLWTk3MiszOWp4enRRQmNsajQKF8QJs/Wb0SqnvsQEkRKlS1Ms9xLIdyvZ
             QCFAPclaOfaTLTiRJWXjDneBkMBduYKkRPiXCR+Bn7i4z8ixLXFmWw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-12-31T14:51:29Z"
-    mac: ENC[AES256_GCM,data:1RmJ4S5xhamBWnvBTAgRWF6dNfurP0BFOiMZIivDWf6au/hvk4UEnsrRIn+EsYN7WX0KgRxoRTjprvMMeEJFqU4bGoH8dpHGCbkydIR5jvSiGsJSg95DdNbuk8DYOo58AHvUzcebyp2HQxYm0ho4DFfkLmuLCa1o0o/H2Fm2v1c=,iv:192+KiXK5OizU78CIu9ifCmCRo/L+9Sk9VBy9kZ+t/8=,tag:gReh3GfwwOL7CT0qGDRAtw==,type:str]
+    lastmodified: "2023-12-31T16:51:15Z"
+    mac: ENC[AES256_GCM,data:2UrC2HkY9pRIVn3Uw664NRBjDvK2RNhpVff6M3MUyYvglJwz04dxzS7VVxqVPTAB6wo096lBGWw+pq1LYBSyqXTXaQ5eXQm5zVpZ6d8UncX3DB9sEV2zeQq5o11VS+bj70ci9P5H5mDEsLrPdqUZpdvSNxKv9aujX87PKLAxXu8=,iv:pcZDc1b8dv8uWX1dw1L1xmV87MpBq8IHaEJGrI1Ytjg=,tag:gBe84aQRbQlX+7GJMsAaXg==,type:str]
     pgp:
         - created_at: "2022-12-14T15:34:13Z"
           enc: |

secrets/nixos-8gb-fsn1-1.yaml

@@ -13,7 +13,6 @@ services:
     chir-rs:
         database-password: ENC[AES256_GCM,data:6c8Ey39Lh/MoCJakEGpNFyueH+RAs//HXPKExrsiXiU=,iv:YmajjfpoaTHlbv5VhCk36jgfDetCKOTMqrmMGzXvitc=,tag:eQq7P92TR0txNk161gUUKA==,type:str]
         signup-secret: ENC[AES256_GCM,data:rLpC7HdhTSkDNeRau5iOvicDxeHJC9R3aRIVe65xysQ=,iv:Pm/+ZXWJCtN4Bq87hPaXco78C/cwD7cdCJmApDpS6iA=,tag:NL4T35lL+xauva72f8C+EQ==,type:str]
-    attic: ENC[AES256_GCM,data:q75ahgZD0O56SAXxKoUaVoxqbioreMDtxLXK6K6iTzGhZYabthxmm2RSgUIWuV/sSdDPuuld3eILypr0+G+ujtckyPb8Osc8OAAiZEVgyLac09250nM59Ypuaoqm1qrouD1T2kmPwocVqbWLNz+NzWKnOgX8Yi2lwSPZGXMfhi7THOgb+vyTwSE0PYWubCktynqUM/qw2XgThqp4OYg1V3+nMo3pP3wCtjFu3Vb5HURoUIXTewag08OI0ma6jTkJUARX1ihjuBqW+2/EJ6xVCzq4f1fiWtzjmFYrsFwmScP18modQAB/yHLc0RZOdb8ujSqkJYcHx5SayZ2tBQ+A6DimUbaUfdTLqKF4nPECzZPRfSw079t1t7u1iv95yveCCWmMS9Vslb+zvXETVzg8E33d2BdNQymgYnaavlZiC++hosg9WZw8YqBFxJ7rQqcxAA5kX3VgWg8SbCuHyc2dXVUVIwRaPlOC+QETsK6iDB8+gkt/HOLv,iv:K7zh3b9i9qBTCb6UUIwrFZl3K+td0vafUw/R2JAmckE=,tag:a44Skw4jhlkOfkkkSy5ltA==,type:str]
     rspamd:
         dkim:
             darkkirb.de: ENC[AES256_GCM,data:2Af4PsmTI07QzY/++VrrENe8wovHrUNElisfufyNt4RaiAB0Uq9Bp6BnpIEqLzfDs0z4mY5D05ncVa+K6oZWnAkhTBwIwO/iD6a4v5aOSdMp1BjbAQnJ9OD41+lLw1KZe98qAbjoO0yjtr4ySo5UzQUJ2wm2i7ZHtEBH06Gc1ZIPD64u2rC3/x9m65Xf+NFe7uSn0hBlaVTnuLkA0RwcopvtFXe63PXq93cHc+YCu9O6beppp7p0K5EkOW54l0UuGVbNtHKm+AKbsjzLWBnS3w0tP6mi1GkbBB0DMJrasA+cd8SbQ02kh5t8cvisviDaroeWTGElovqNOiSYZ9PkBAaADBYuR6bDJ9riIH8RrFfmS+lT0XW6OPPGdz9b5AI5A+Xze+36u2sv/Mys+Y+/G2C+uZYgDj1EKYX3DGKAl0ytNlSw7QRa1WoobvcIOfgN5cvmVV56QkSNteEdHGGod0aoiWTgGFwuKyjZL4UBjoDXcXxiCAKeQJ9Kkk0u9IG5JEhsa6W21s1Ea3hJdCaNPXk/vF7d3gM/jzrYNiioic4S/PckYf4u/4NNJhP5QS9ys68uPXZpSxZ7cZnB7ZS1uzvY4Hq/nNBBXmSjGz/G8EaeAfcXtBeRwLnv6HgeDfz03lu+JoZJH4UKUkU0emoP8du1RpMU8lMxuOsOirwVAU2SljZn/P2+reeFsV2hca6/AmXNO8Ez663AcQsxww/xY9tady3ch6k/rixLIYZuhURzFilEwqQAye0KvcnQrwhix/i1ujGv5G2SKHTlpYiQPDDwnF/gYHC4H1kqzRCcRP0CcYeZ3hhBC/fwgkXSxhrKjRmPU9hGsB4LfNnzdbezi4K4XGiOzEy6DD6r+KqHK782U95eaBxDPaD5PTY/jcy4mn5jtalmznPiZ3C68EVTcZQJf/o84fQWPG6I9BIy5PITacqzm8EQC93ZPPB+gdLaUWv56U2ruT/3RgC4eusgBtngydbRP7MaVojasX/NWEV4uhQ6zH7ErEFQDpqwaTNBDhXQUS2DJznQH+xk9M+VxInN1tUvc7UXQ1SBdARFLPzNubRvnyhd05bx1TEGHIqKNaJN6khYOt0ES+wZPjYtx3ctdhzNjajMIjv8rjmEmNoRyyH66GMHEfDbuCkv+VoBkPPWhl5QGbF8NRmN6LxR/GokQgCitfDqBAvuCYhRahurVZmGelcXh3X/eV+aFWnC9TC8aA==,iv:LhtgzfLhkBUsZcEF5oBrUQJLeMkdSN97H9rp8fRdG2g=,tag:vTyG6L9n9LwNe94UNkLyhA==,type:str]
@@ -82,8 +81,8 @@ sops:
             UDRmejBFNTVxeTF6aVFta09OS25uNXcKizOsV9EUukinCAwvpZVrk9x0aXTKQckd
             gGfdCEU0HZXhZg+ikDFzy52+vPo8+gInjscXiXr/gGn6dJoctLqQXA==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-12-31T09:43:12Z"
-    mac: ENC[AES256_GCM,data:5k+HRPJlQOgimJ5y6hPrldpx7lSe0NkXXu0//FQrqVyntbAkrtGbWy3hkWdMfaDYZ8m+qJwncCNFhK9oL+2nwaFamzp3z6IqqbCEgIz2nTn/fUuwV+QidutAuLmp9AMsuNtLkLQpaoQllO/gKahMojvEKKLjW2TEgPSOUp1hm8o=,iv:15XdKpczJ14FeUyydBrLnnTmQGeHOzfZLkpA3xz8YzE=,tag:7JMZdcB8+Vg+gNmD9K7/KA==,type:str]
+    lastmodified: "2023-12-31T16:50:47Z"
+    mac: ENC[AES256_GCM,data:KvsKP4Kt/6p7ECRq3+YU4pl0lR5Chz0UJN9ltR61ne448xpFSu3YpkgnJM3afxOuemdevqY6FogFd/jP0EM8vsrw6HhunmP+696/khWg2Otm7D6mpINRNikGGiddl3JFCfdUXKPiKLGTCRzOca+Jd+BHJQH7hmQ/bwDFRInE1gs=,iv:KNvyMf4OQvR7acIIm6sHrAk7rXxXYonlCZZwYyRnJn8=,tag:sP89erBrtF29C8W8Lxe3TA==,type:str]
     pgp:
         - created_at: "2023-02-18T08:54:32Z"
           enc: |

zones/chir.rs.nix

@@ -144,7 +144,7 @@ with dns.lib.combinators; let
     SOA = {
       nameServer = "ns1.chir.rs.";
       adminEmail = "lotte@chir.rs";
-      serial = 46;
+      serial = 47;
     };
     NS = [
       "ns1.chir.rs."
@@ -237,11 +237,10 @@ with dns.lib.combinators; let
       peertube = createZone {};
       mediaproxy.CNAME = ["mediaproxy-chir-rs.b-cdn.net."];
       cache.CNAME = ["cache-chir-rs.b-cdn.net."];
-      attic = createFullZone {};
+      attic = createZone oracleBase;
       lotte.CNAME = ["lotte-chir-rs.b-cdn.net."];
       status = createZone oracleBase;
       sliding-sync = createZone oracleBase;
-      lotte-test = createFullZone {};
 
       int =
         delegateTo [