From 960426f68f6d91d0bf5c6b600f6a927a8c24b370 Mon Sep 17 00:00:00 2001 From: stuebinm Date: Fri, 26 Jul 2024 15:06:04 +0200 Subject: [PATCH] Revert "s4f-conference: another mattermost" This reverts commit d933a6ef982ccee068d92d9059ae3e32154890f8. The conference was held months ago, and as agreed beforehand, we would delete this instance after two months, which is now. This revert was partially done by hand, since sops does not play nice with automated git merged (these lead to mac mismatches). --- parsons/configuration.nix | 1 - secrets.yaml | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/parsons/configuration.nix b/parsons/configuration.nix index 1d047ca..e7db340 100644 --- a/parsons/configuration.nix +++ b/parsons/configuration.nix @@ -20,7 +20,6 @@ ./uffd.nix ./lxc.nix ./monit.nix - ./s4f-conference.nix ]; hacc.bindToPersist = [ "/var/lib/acme" ]; diff --git a/secrets.yaml b/secrets.yaml index e9e82ca..cbd1f46 100644 --- a/secrets.yaml +++ b/secrets.yaml @@ -11,8 +11,6 @@ auamost: restic: s3creds.env: ENC[AES256_GCM,data:9WNu5S4KmdMXdshSpawEjIexAKH6vZCPwb9xyq6xmerly1lxSfFZzgg60M0L3L+I4joLTVi23YBB8Eh6Xfx9GgxNww7w7BjMCQs/X16ecDWlb346TKf+,iv:Gu4CbXXJAlQYXRqOjIAUYmn8EU4mrvcOVc2eCh1Ikzs=,tag:1xpVIonHiAGHsXTY9liPQQ==,type:str] system: ENC[AES256_GCM,data:RIgO0QHVjwp2D3LoU62vLzepASdsXxu0DqUTA6Voa3K1d4xFHX2u+UR8AcqR,iv:O0K8i5ivne7WU+ygDEUcrvKW6DIfXjVPY63gpfsxEFE=,tag:n/1atQ5qlyB0SMHrYiTCrA==,type:str] -s4f-conference: - env: ENC[AES256_GCM,data:e4Fuurb37YQvracqLA8Z1VQL5MpiARE35NKCNdLgyxyVNRm6zSATwyH8DvkST8zuYadAv9wOwjv5q9Xlv7CWBFPyMMjkrHPZORJI,iv:36EGmqqIpeNWylinu902MFU3MZf6sPRWvUrSl5usxHI=,tag:XxoTdq10zgr6xtMn4TYDOA==,type:str] sops: kms: [] gcp_kms: [] @@ -100,8 +98,8 @@ sops: bndBTXJhQVE2OVlKeGNTbzJlL0duUzAKIWdesesYvBIN/m36fhzxq30+IT8qp/pF S6i7QqZF75y2BpEoupRCqNIAsHrouUE+U9ZQJZO8m9J591mWvbVJIw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-05-19T21:17:46Z" - mac: ENC[AES256_GCM,data:rzxX2fl+EQbhQUcmr6lKoYcUpAb1G3IKjsJJjCrMKN5t4oevI85GtTU3Q+pLrIFLjfkgIV8yiNH4usg0ghtoahQUkrnlZxkOoCktfgM67hRcUniY8UUxY4HqFFK3KzXFqc8Q4vXrerQgJy87Xg+ret9wCQXBbM3AB+B1fsmLE9s=,iv:pm1FakBlOFibps6R5kXMUq+IEl074mEmRIQmdeDxPs4=,tag:hQsV0NZNgDGYjFOK7+SKqg==,type:str] + lastmodified: "2024-07-26T13:05:44Z" + mac: ENC[AES256_GCM,data:9A8nX155dpCC1cvdH1hgeNKh0tt5FMaOKU7vZQ33jfWbiXOsJbp5iHKXxWOexFc70acyhdweoHwq61oJm2mzVufJIPA55ZAUItQcDXJCCeu6KswHug0tQtKHoCRSwdTdMTRNom4XjrpA/j4WWpuhoilyknycXqTpGHHVSdL2lYg=,iv:N0zwzGtGzAxhbmLzslbkXSr/iKmq5FeyT/iWeE4x2hQ=,tag:yIoLXpqlU2SlVRK5+S/qaw==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1