diff --git a/config/instance-20221213-1915.nix b/config/instance-20221213-1915.nix
index a5d0eff1..760afc5b 100644
--- a/config/instance-20221213-1915.nix
+++ b/config/instance-20221213-1915.nix
@@ -14,7 +14,6 @@
./server.nix
./wireguard/public-server.nix
./services/named-submissive.nix
- ./services/postgres/high-available.nix
];
boot.initrd.availableKernelModules = ["xhci_pci" "virtio_pci" "usbhid"];
@@ -76,7 +75,6 @@
systemd.tmpfiles.rules = [
"L /var/lib/acme - - - - /persist/var/lib/acme"
- "L /var/lib/postgresql - - - - /persist/var/lib/postgresql"
];
networking.wireguard.interfaces."wg0".ips = ["fd0d:a262:1fa6:e621:746d:4523:5c04:1453/64"];
diff --git a/config/nixos-8gb-fsn1-1.nix b/config/nixos-8gb-fsn1-1.nix
index 6cea0a06..74748fab 100644
--- a/config/nixos-8gb-fsn1-1.nix
+++ b/config/nixos-8gb-fsn1-1.nix
@@ -15,7 +15,7 @@
./services/named.nix
./services/grafana.nix
./users/miifox.nix
- ./services/postgres
+ ./services/postgres.nix
./services/gitea.nix
./services/old-homepage.nix
./services/postfixadmin.nix
@@ -30,7 +30,6 @@
./services/peertube
./services/rspamd.nix
./wireguard/public-server.nix
- ./services/postgres/high-available.nix
];
boot.initrd.availableKernelModules = ["ata_piix" "virtio_pci" "virtio_scsi" "xhci_pci" "sd_mod" "sr_mod"];
diff --git a/config/nutty-noon.nix b/config/nutty-noon.nix
index 789a9ac4..db9ca337 100644
--- a/config/nutty-noon.nix
+++ b/config/nutty-noon.nix
@@ -18,7 +18,7 @@
nixos-hardware.nixosModules.common-cpu-amd
nixos-hardware.nixosModules.common-gpu-amd
nixos-hardware.nixosModules.common-pc-ssd
- ./services/postgres
+ ./services/postgres.nix
./services/drone-runner-docker.nix
./services/gitlab-runner
];
diff --git a/config/services/akkoma/default.nix b/config/services/akkoma/default.nix
index f7c8dabc..6d746c7b 100644
--- a/config/services/akkoma/default.nix
+++ b/config/services/akkoma/default.nix
@@ -24,12 +24,17 @@
mkdir -p $out/emoji/${name}
lndir ${emoji_sets.${name}} $out/emoji/${name}
'';
+ masto_fe = pkgs.fetchzip {
+ url = "https://akkoma-updates.s3-website.fr-par.scw.cloud/frontend/akkoma/masto-fe.zip";
+ sha256 = "sha256-8kAF7O3I93npX37XsncNuwQrTLX5Y9w16QV3+SDls+0=";
+ };
static_dir = pkgs.stdenvNoCC.mkDerivation {
name = "akkoma-static";
src = pkgs.emptyDirectory;
nativeBuildInputs = with pkgs; [xorg.lndir];
akkoma_fe = nix-packages.packages.${pkgs.system}.pleroma-fe;
akkoma_admin_fe = nix-packages.packages.${pkgs.system}.admin-fe;
+ inherit masto_fe;
tos = ./terms-of-service.html;
dontUnpack = false;
installPhase = ''
@@ -37,6 +42,8 @@
lndir $akkoma_fe $out/frontends/pleroma-fe/stable
mkdir -p $out/frontends/admin-fe/stable
lndir $akkoma_admin_fe $out/frontends/admin-fe/stable
+ mkdir -p $out/frontends/masto-fe/akkoma
+ lndir $masto_fe $out/frontends/masto-fe/akkoma
${toString (map copy_emoji_set emoji_set_names)}
mkdir $out/emoji/misc
ln -s ${./therian.png} $out/emoji/misc/therian.png
@@ -67,8 +74,10 @@
description_limit = 58913;
upload_limit = 134217728;
languages = ["en" "tok"];
- registrations_open = false;
+ registrations_open = true;
invites_enabled = true;
+ account_activation_required = true;
+ account_approval_required = true;
static_dir = "${static_dir}";
max_pinned_statuses = 10;
attachment_links = true;
@@ -145,6 +154,10 @@
name = "admin-fe";
ref = "stable";
};
+ mastodon = mkMap {
+ name = "masto-fe";
+ ref = "akkoma";
+ };
};
":media_proxy" = {
enabled = true;
@@ -205,6 +218,10 @@
"Misc" = "/emoji/misc/*.png";
};
};
+ "Pleroma.Captcha" = {
+ enabled = true;
+ method = mkRaw "Pleroma.Captcha.Kocaptcha";
+ };
};
":web_push_encryption".":vapid_details".subject = "lotte@chir.rs";
});
diff --git a/config/services/akkoma/terms-of-service.html b/config/services/akkoma/terms-of-service.html
index 61f05a64..1ca0a607 100644
--- a/config/services/akkoma/terms-of-service.html
+++ b/config/services/akkoma/terms-of-service.html
@@ -27,3 +27,9 @@ We do the following moderation automatically:
Unlisting of bot posts
Adding of CWs to unlabeled media
+
+
+
+
+We also offer the Mastodon Web UI. Keep in mind that some features are missing,
+like emoji reactions, quoting, and JPEG XL.
\ No newline at end of file
diff --git a/config/services/hydra.nix b/config/services/hydra.nix
index d78c4746..e24fdf31 100644
--- a/config/services/hydra.nix
+++ b/config/services/hydra.nix
@@ -18,7 +18,7 @@
'';
in {
imports = [
- ./postgres
+ ./postgres.nix
../../modules/hydra.nix
];
services.hydra = {
diff --git a/config/services/postgres/default.nix b/config/services/postgres.nix
similarity index 88%
rename from config/services/postgres/default.nix
rename to config/services/postgres.nix
index 0a688795..25b85181 100644
--- a/config/services/postgres/default.nix
+++ b/config/services/postgres.nix
@@ -19,7 +19,7 @@
services.prometheus.exporters.postgres = {
enable = true;
user = "postgres";
- listenAddress = (import ../../../utils/getInternalIP.nix config).listenIP;
+ listenAddress = (import ../../utils/getInternalIP.nix config).listenIP;
};
networking.firewall.interfaces."wg0".allowedTCPPorts = [9187];
}
diff --git a/config/services/postgres/high-available.nix b/config/services/postgres/high-available.nix
deleted file mode 100644
index cef5126d..00000000
--- a/config/services/postgres/high-available.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
- config,
- pkgs,
- lib,
- hapsql,
- ...
-}: let
- internalIP = (import ../../../utils/getInternalIP.nix config).listenIP;
- haNodes = ["[fd0d:a262:1fa6:e621:b4e1:08ff:e658:6f49]" "[fd0d:a262:1fa6:e621:746d:4523:5c04:1453]"];
-in {
- imports = [
- hapsql.nixosModule
- ];
- services.hapsql = {
- enable = true;
- nodeName = config.networking.hostName;
- nodeAddress = internalIP;
- cluster = {
- scope = "chirrs";
- nodes = builtins.filter (a: a != internalIP) haNodes;
- ports = {
- raft = 49921;
- postgres = 2428;
- restApi = 56708;
- };
- };
- postgresqlPackage = pkgs.postgresql_15.withPackages (ps: with ps; [rum]);
- prometheus = {
- enable-postgres-exporter = true;
- };
- };
- services.patroni2 = {
- postgresql.data_dir = "/var/lib/postgresql/15";
- bootstrap = {
- pg_hba = [
- "host replication replicator fd0d:a262:1fa6:e621:b4e1:08ff:e658:6f49/128 md5"
- "host replication replicator fd0d:a262:1fa6:e621:746d:4523:5c04:1453/128 md5"
- "host all all 0.0.0.0/0 md5"
- "host all all ::/0 md5"
- ];
- };
- };
- networking.firewall.interfaces."wg0".allowedTCPPorts = [
- 49921
- 2428
- 56708
- ];
- users.users.postgres.home = lib.mkForce "/var/lib/postgresql";
-}
diff --git a/config/thinkrac.nix b/config/thinkrac.nix
index a3c7d49b..000aa6b8 100644
--- a/config/thinkrac.nix
+++ b/config/thinkrac.nix
@@ -18,7 +18,7 @@
nixos-hardware.nixosModules.lenovo-thinkpad-t470s
nixos-hardware.nixosModules.common-cpu-intel-kaby-lake
nixos-hardware.nixosModules.common-pc-ssd
- ./services/postgres
+ ./services/postgres.nix
];
hardware.cpu.intel.updateMicrocode = true;
diff --git a/flake.lock b/flake.lock
index 8f0b67f9..3d1abd71 100644
--- a/flake.lock
+++ b/flake.lock
@@ -143,31 +143,6 @@
"type": "github"
}
},
- "hapsql": {
- "inputs": {
- "nixpkgs": [
- "nixpkgs"
- ],
- "patroni": "patroni",
- "prometheus-keepalived-exporter": "prometheus-keepalived-exporter",
- "sops-nix": [
- "sops-nix"
- ]
- },
- "locked": {
- "lastModified": 1668373073,
- "narHash": "sha256-jevN2P7euK8hWc7iEF40cW2UfQsqurHL2Ccw4vz0S6s=",
- "ref": "refs/heads/master",
- "rev": "daf95d1e1e7f0270ac82edd7231d9daed0106a0d",
- "revCount": 21,
- "type": "git",
- "url": "https://git.sr.ht/~bwolf/hapsql.nix"
- },
- "original": {
- "type": "git",
- "url": "https://git.sr.ht/~bwolf/hapsql.nix"
- }
- },
"haskell-flake": {
"locked": {
"lastModified": 1668096377,
@@ -235,7 +210,7 @@
"nixpkgs": [
"nixpkgs"
],
- "utils": "utils_3"
+ "utils": "utils"
},
"locked": {
"lastModified": 1670970889,
@@ -509,28 +484,6 @@
"type": "github"
}
},
- "patroni": {
- "inputs": {
- "nixpkgs": [
- "hapsql",
- "nixpkgs"
- ],
- "utils": "utils"
- },
- "locked": {
- "lastModified": 1668372943,
- "narHash": "sha256-JSbuXzu1cHuu3NbQzRDs3ExPUP89xTNWfTRJG/vzOqg=",
- "ref": "refs/heads/master",
- "rev": "0e0e7c4e82f6583efc8cec47904e0a8deb92191f",
- "revCount": 16,
- "type": "git",
- "url": "https://git.sr.ht/~bwolf/patroni.nix"
- },
- "original": {
- "type": "git",
- "url": "https://git.sr.ht/~bwolf/patroni.nix"
- }
- },
"plasma-manager": {
"inputs": {
"home-manager": [
@@ -577,28 +530,6 @@
"type": "github"
}
},
- "prometheus-keepalived-exporter": {
- "inputs": {
- "nixpkgs": [
- "hapsql",
- "nixpkgs"
- ],
- "utils": "utils_2"
- },
- "locked": {
- "lastModified": 1662960295,
- "narHash": "sha256-4nOsFasQ463Zf8TAlUBydtr5FS+ivpNNcfyWeAdsyNw=",
- "ref": "refs/heads/master",
- "rev": "52fe5366dde3d5a9ee8562fff5b0502544921dd0",
- "revCount": 5,
- "type": "git",
- "url": "https://git.sr.ht/~bwolf/prometheus-keepalived-exporter.nix"
- },
- "original": {
- "type": "git",
- "url": "https://git.sr.ht/~bwolf/prometheus-keepalived-exporter.nix"
- }
- },
"root": {
"inputs": {
"dns": "dns",
@@ -606,7 +537,6 @@
"emanote": "emanote",
"flake-parts": "flake-parts_2",
"flake-utils": "flake-utils",
- "hapsql": "hapsql",
"haskell-flake": "haskell-flake_2",
"home-manager": "home-manager",
"hosts-list": "hosts-list",
@@ -692,36 +622,6 @@
"repo": "flake-utils",
"type": "github"
}
- },
- "utils_2": {
- "locked": {
- "lastModified": 1659877975,
- "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
- "utils_3": {
- "locked": {
- "lastModified": 1667395993,
- "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
}
},
"root": "root",
diff --git a/flake.nix b/flake.nix
index bff20603..8f5ecd74 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,11 +22,6 @@ rec {
inputs.nixpkgs-lib.follows = "nixpkgs";
};
flake-utils.url = "github:numtide/flake-utils";
- hapsql = {
- url = "git+https://git.sr.ht/~bwolf/hapsql.nix";
- inputs.nixpkgs.follows = "nixpkgs";
- inputs.sops-nix.follows = "sops-nix";
- };
haskell-flake.url = "github:srid/haskell-flake";
home-manager = {
url = "github:nix-community/home-manager";
diff --git a/secrets/instance-20221213-1915.yaml b/secrets/instance-20221213-1915.yaml
index f3aad863..0b0499b6 100644
--- a/secrets/instance-20221213-1915.yaml
+++ b/secrets/instance-20221213-1915.yaml
@@ -21,14 +21,6 @@ root:
password:
root: ENC[AES256_GCM,data:wGFQ73r7XiOQ5HTtVwZfJu10Y0ZkBQ4YWm2MUCXyJy0kS2lh942aCOOobn+ZgDwZe2/esaaZi3UZ1sjmAMsRe4E5Fv6eJRXeqa7Ym+3Wj8LsssWIWBX06CkCS/LADUIUekcmDfGq5KLvIA==,iv:lvcSkngLc7phKVsFO0QooID62iI7Cm+qoYvW2nRo9Js=,tag:jTOBdy+EBrxMm5jyy8m3PA==,type:str]
darkkirb: ENC[AES256_GCM,data:ji+aKSQgrVNSASAr23hRppGLnANXKD5CI+pRk6Lb4DHsVd+U0enDu68SAR6vh5xt5t2NlICdnN6K5IlS8DQvNWC+3X5IJb5F0dfBZYcTnu2FdmX1D2XyoniJw2z4Pd2YZLB6+fiVmgcL2g==,iv:GExkGbbImSDOXc8nGD3vGbBr7AIa0ArhaOaV8rOnWGk=,tag:pZB/IBZzNL9Cuv/xNRY3sA==,type:str]
-patroni:
- postgresql:
- replication:
- password: ENC[AES256_GCM,data:Rtvp3uFW5i8Ql2rmkqJEqwdePXvqcRH2pc1UVn1MIlBmbSupklkdnObnB6GHDPLpNB8e7WS3pg3DW7PoNCtTHQ==,iv:ON96cAS/TIxUwGePwhRQdwe/e4VEZ7AJrZbS5SpB5GY=,tag:qlUhxoGriNrYHnf8xJkK0Q==,type:str]
- superuser:
- password: ENC[AES256_GCM,data:biKsnCeSvrF+ALiflH0wbn+k9Lu+WUQinojSsRZKcQ3Btez/8x4BYM3FGekG+bKM+YGjYOb3hTEuElbes4KhLw==,iv:fhGxZ3RlRyJ0h+1m8pycHI+eHaYTZ6WUwJGiSNtyvdU=,tag:XLtU+ZhBz5Ea9K0iZpZVQg==,type:str]
- rewind:
- password: ENC[AES256_GCM,data:3SFUf/vesfzA8lM/ND/89yvJga5SNBFilRZNdDCw3wfCBmqtWnQB5P3BuEvR1Ccao6H9dKQuEn32EQVZcVqCrw==,iv:JiseXAZGflG3JtL+jMkZ4N1jAutTvyuAxIuGHbTMvZc=,tag:ZrVCC6M3xtXss5zXoFKtiQ==,type:str]
sops:
kms: []
gcp_kms: []
@@ -44,8 +36,8 @@ sops:
bVJUcDZLWTk3MiszOWp4enRRQmNsajQKF8QJs/Wb0SqnvsQEkRKlS1Ms9xLIdyvZ
QCFAPclaOfaTLTiRJWXjDneBkMBduYKkRPiXCR+Bn7i4z8ixLXFmWw==
-----END AGE ENCRYPTED FILE-----
- lastmodified: "2022-12-15T18:48:50Z"
- mac: ENC[AES256_GCM,data:Mg8cfwxhjPfJHHwEI3R+ZMeJUzl/caVc/V3UxDwV4VIeAT/d+WDVtdanF6ro4SyELbR9PdWC5q8wLTlpoz/CAjQvoPI3WEmYMtxmMBuZATy86EWz07FEltaod0yYcDvQ1RW24Km3gWrghHMBQUehijG+xHI84jvv8o+LL+ItktI=,iv:47ms+YmKjNC7wnox4Lpxp0m4eyMDJ+BNYI7JUokvyWk=,tag:sRL/JO7MKbFcf3gx064r9g==,type:str]
+ lastmodified: "2022-12-14T15:34:13Z"
+ mac: ENC[AES256_GCM,data:9DHLfOjTVKWbsWiUDr7pu5pyh6dzoExcgjRsAd2HMtdu+R/Y04Zy5dbCJpFu4mvyRD9GJ5aI4hufYRLvFsTuO9k8aWNUbqb1IYnX+D6zzLlecCHxEJ6zhm0PhjkcuN0XxFhBQb/aCUaisP891PqHM8ZbXblIaCdl4FFX/me3Cls=,iv:MnMInA14AxnCPjLYvksSdZVfpvcIjpbLSQRMbzSYr2M=,tag:eQsCwg6S60FpZ4bxaBMiJg==,type:str]
pgp:
- created_at: "2022-12-14T15:34:13Z"
enc: |
diff --git a/secrets/nixos-8gb-fsn1-1.yaml b/secrets/nixos-8gb-fsn1-1.yaml
index 8b071a63..ce0734f9 100644
--- a/secrets/nixos-8gb-fsn1-1.yaml
+++ b/secrets/nixos-8gb-fsn1-1.yaml
@@ -17,7 +17,7 @@ services:
cache-key: ENC[AES256_GCM,data:aLUW21G4ubmxS97LOwvUY+9ovrk02tZwq3D6tSO5tK9DwhySEuquQIHKsmuhsQtuCZRDLPgRh+T1XIKykWxv0S42NhdMGiE6GuRs8SbnEwcYMHwEPwHHMppG38G+EEKmTA==,iv:nm0yWYS8xk2C5mn3lpSEocqmCFOx2rL57euMfcXOXHA=,tag:WXEAMiMS9S/0hKrd63mBLQ==,type:str]
bunny-key: ENC[AES256_GCM,data:Jby03Y/0MjzED+fGNn8dLQkVhR9D5mhz8gzkG27hxQ1UezdzhxaPV56fIeCmn8yDespwMLMjEXPiIsM/GFS0y58ctl7OHuEW,iv:3R8+z/KuRaqybs4KbfZtrXiIAMZ5oCIH8tZhFN8MjWs=,tag:VIb442EBs0TlLfwWNvMmng==,type:str]
peertube: ENC[AES256_GCM,data:7ZFddxNg4bgXnn56OhcY23aU7Yz6qIyQgOxXg0wDgG7jOyefU2VAQwupmr0OUmD6I1C12gGLv0JymktVSLcZ4pEIhx/cbSmn2dHrWqHDyzp/xRfUYFjTxtc+rKQUpH4vX9hnqC0dx7Hp9/7kIPGQOTkUneg/f9amw2zZlMj/XsuUpzSF5g==,iv:KdaWy211C2H5QTVweLWmE8/r3GV2StTJUE0fXrudo4U=,tag:5WMWhJMgH11byV7EHIHn2w==,type:str]
- akkoma.exs: ENC[AES256_GCM,data:snEg7wZKp0Oa+tQnZjjeMwUbsFXdFHP2g4UwjPIHit2YYuR7HJQGra6RP+2mnmr9v8rceWyEXx8JQi5zbveT/NAg6Hp9WZ3gI2ClwazchiAeJ35wMHi49AgfSaRIVjDam1EI2uOfxjOUi5nsgTqb5raQDmwFV/NsK8qCUwzHb9oGoaT+PV3kl601Ua6gWWVoB7vX/X5NIxfxx3cTvzYPRdlJqNQUHCHLIrGO6qkeu0iVeJiU8iTCG/7ZFSP5mbO8d/H3LmRQbenPpCYSTdRy1zNwHCk5THtmcoMiytpj8/AmMJS0Yq8JcKST0fdgevU0eV4c6B34ZbRS4hKBG/ppnGy/WnnN1i/R14YP6SPmbsHoYJ/4ksAMS7TvQFnes1HEMoMkM5gwCyoiEV9GLcs/NhWwVxKZnLtb1S/hwYWJ32WnJuQxzcspR+n7dPawD31bxO1sT4tfmRxU3eFtO53g9TkNDLVV8ntZHZlnc6WKOVW6eeVHmrACaJO1zfJpnc6oEAiay5fK0xMRlmLvhZcDu8USHj7IGvaEn5G2HgmDjxmOJeM9T9S5+yZUkfGkbQSAKzPbcXZQdvdepqqHibBNSYgiIvIHojqLUy/cjQwB7Yek13EwsC2KJR2j/IsrdPr6Qef6Cru4aUh1IN+IiBVseo/ohOGKJADf0gGfW4ul84SrAIuMGM+nKN0LFv1XLXXlkSYcBCiyUfwoO0rfeU/a53NZKR+Vk7MvMF3n1DW6KZ3Nlo2/8VMZAgBdPk3AHjpcAYqMMjbuYg8QJ8XKgs2u7f9LmIcVWbmHR48ZdzswUGHGVSb+Uf+/gu2J7sEFFu2vqZb9Kzwglmo1tmN7ZvElU3EsolqVX3ybs/PEOtwIISbfHBFLgiYiUwm0Qu/BoMMRs8mRA6USDRxdCjD4OWeqJ5m6XfZN+qJne+rz1B+FmQo8uXBoVLiGbpymGX4nIGl61rfdfsrAYMtgCPL9xky5BiieSUb8C27/P0XXMp4=,iv:HRszf3GE1/4xFwdWpTF7sz9TIKXO/2Y8j5Qd+Dk3zj0=,tag:iLSSIiOG4m+YuEcfCXyf/g==,type:str]
+ akkoma.exs: ENC[AES256_GCM,data:AvM8TmFY3gOa+zLGp77v3gkjCGqqSUBU/ugrfAjMGKeB/6caL9zsmSVPSSq49/rrMRKB9rOFZhzwUGQmTVDP42G2EghMh5OWWZ+bn3R6kVgNW0wahZp0Wjx8+HvzYH1oL0+pk48qG76w3m2xfdTUGi3hmPEXlOeBuE3t127MDHtJm/+ef2yeFyohw39serNbecgeFNY/fdKmJqIwTPxGyPD08UV/lQCDSe+rVRGu1hRWUW4cV1nwYXRxCPdKOxgTKN2qrizzn63JGqbfK+c7zgRao+UEsIIH6ao2PhX9fCQlRKdYnY62ByHvsX2c/RZHp62+tl5Cf2XwOogImfAktDfR/cNTCE8/G5E8u0E5adeOuleRgarPcag0sX/6GP1ug99BJQnkI5784V4h/Zl6eMlXWc632SQ1XtTXkRl7/XaMYiMR8KrBKOXy8FeSS+3ytY8liuL8RiVD7nueD8Ma2Ha/Ns4PtpYBify6NwrM5ecHvMA6VbhWl64GzvEYR0qkJfjqgqSYBmty2lqEFZkmyXEbK/0OTIzH0zEP2WbAWnofLder8FfZH+iOpTkBcrXozOd8B04WuabZZIqDtaVIss1kjqEmPCIxypXjNDNz8QgF3XsOj/5/RXmSnxtp5vCD+4pbWp8GNLmgGnFsd39V0S88PeJmKG3ucvUosLcCpL+jLrE7Y+BLKdzyh9cqibHSU1Noj+iN9fRA9sp76tqRwtuotUo8rbM+H0EuxDbgu5rSSo98it5ngZfzzM5YzhUm0Trpd/6AsEaNOGN9QlJHAQcB575kK4qd6j12rs4mtFc0v3NhzCkR0Crh1ysv7MSnJKBUr+Ui+v7WKEH24D/8RAS9IIaqQ/Pob1eVQeWsAdSG+mZkY8a7mJWhjQybCqRff8YpcV8QqCvxUXx7THCL7WBNziozOSb4hS1ws5kaBEVaj390C8CSFS7JIzXGDkcq+gDZH02wjYWZ6jIRh6LHfIskRH3crjH+n3EvmEOL+8XdA7aO3L0YjMoIqQkDs9+jec/QA5slf8U4jf5oq/afPfj1/8CgbSKtu62xEr3nM2IcvEyhOJU00XOygHw=,iv:IFYqcza3nxT61uLKkd2prX9u5WpWocuxYml+g595rR4=,tag:rOEYiICiR3OabTv5zSFuFw==,type:str]
matrix-media-repo:
access-key-id: ENC[AES256_GCM,data:2/H4GA5iHAkvl5XgLmxm9tnxIAps4YokpA==,iv:661Dt7ZYNsKYyp3yG1DW2n6eRezhN+vMjSQcg4V8qR0=,tag:jn/0Uj6//gAaAdXybUwLwA==,type:str]
secret-access-key: ENC[AES256_GCM,data:RhyAyU81pmOlD4hlGkOyutLPpUI/QsleJYmubCZJfA==,iv:8BCVnPkW+sa15Cp1eG+thvDb1U5EE+GsIzgNlsSsxMw=,tag:PXDPCEzG31r4u0eF7B258g==,type:str]
@@ -73,14 +73,6 @@ email:
password:
root: ENC[AES256_GCM,data:AmwmR4I14s8mGTJidm4yEys1pPlLSRWoL9632IZSM1pAgV1H27KZIi+z00JUqnkvaCwuOsUH77tl9cSIK3UN1GUMbMaev3Ltln8hshRIYXN/bgg7K2JlZ5rwjLYjvxbwEBGEG8mBubHSvg==,iv:uoUiZ7t0u2ezAI1cwf86YxQ30hTlu6o7g3avzyBKWn8=,tag:Agn3UgC6PO5TdegGNHiZPw==,type:str]
darkkirb: ENC[AES256_GCM,data:DSecZ2Fw8akFfzor30x/lPVztZcaxM5YT2gTsFYJxV/GQHODy9htHT7blTU4tWzAJsUXqFo/GzcBIwyJZ1ox3jVpAqznaBuQxslrgMurb6T47wsUcbjmX6bkDGra4iQEYrRPyXlJgKpmlw==,iv:XY4S3skY2zbq771Y3Tva2povZRfcXEOhweajzvI1ebk=,tag:DrHRNFgYpNWCPIY1zbURKg==,type:str]
-patroni:
- postgresql:
- replication:
- password: ENC[AES256_GCM,data:iMbwJTCn0IQ7rm/W5+vVLyHCKQfFpkGDXb0lNQJtAO/GBioQ8TLcp5djhAlHljCt6uKCPqkQaN5PxRvAijUQUw==,iv:rmbgTxYEL5ANJqoDZatzXGflg9nDbbsD9/1jb26RFME=,tag:wB9YV997ForDjJxZWSYaig==,type:str]
- superuser:
- password: ENC[AES256_GCM,data:dxAfTgyDtiNNhFfjmfgZIdTZf4H4RktD7uX7ywKSOOkLkrQRbbrM43voxC4hiCPNKfDXOKODLTYKdoFz0UZQBw==,iv:sT44JwP4dNIfE9ImohTvPt0XNlFucJCHIsALZ8oT/O0=,tag:XCxegdIMJhwLLejv1RpQFg==,type:str]
- rewind:
- password: ENC[AES256_GCM,data:8svavhNeEtOTKfoUNmlEamlGy0bS1GnefUvTpPs624ied3nXc9lhOyg1ZT4tXY5OmL9Qy7Xzr0YgTLJt19dQVA==,iv:y8+Pl251pHoZQK70uJQ44odKSXTcBSyEykprQOyHN08=,tag:BbZJnEQOiTol+UrrzQnoHw==,type:str]
sops:
kms: []
gcp_kms: []
@@ -96,8 +88,8 @@ sops:
N1lNTTRhSDFsczd4VjNudUU2NEt4MUEKdVJIJmaoGcwUHa0BGB45jqYnm9aPVZxP
dl1vkMx8EAiKhWKbBwQm5fFZcNh371rspGE7KOXmwNbNWef5bVfHpQ==
-----END AGE ENCRYPTED FILE-----
- lastmodified: "2022-12-15T18:49:04Z"
- mac: ENC[AES256_GCM,data:WyZHDnHUtzyD7G9B1pZ61u4RdMf3TkQK8DUFNS1+fnT5ix0T9N/tMq9xgD1xvkey8PJpoSXeAPcCGlom8VwyWOw0reiJXGIgXd5jW28YSOlP8Sqtq+G37vSavCFfvtEI0ZwCt9mtB+hPvzGQK5n0mRb8LvuQQlZThji+yMSDPfo=,iv:trpJ/FVMlbGXkvwTRJjiu/ewfs8uq5twkj26gmPrVd8=,tag:U7km68CPWBu/QQlnhbRMCw==,type:str]
+ lastmodified: "2022-12-16T10:50:50Z"
+ mac: ENC[AES256_GCM,data:TwGBJ9yMzMprXc96neQaBtv1lI5aJDjHbZ0HbtylKrNCenyTSg7qIhtazJb4yyyy6ITLQyQtltuDYm5pMogITw9IUqeK2C8aO4Vs+R7/4E0RG/+ZD9jB4xROiV7jWZSNvnYWB+aza4E68JLwL44kvT8Dt9TAvPG6av0jTEhaycw=,iv:RqRV3gyq5n8txCOlJESzQTT+uyZ8Mz9yTOsDVk8ClFE=,tag:/JPI0ObhrewfdiSSeUTtgQ==,type:str]
pgp:
- created_at: "2022-02-02T17:50:42Z"
enc: |