From 57b31f4a8747604cd702ec2a42f507f276ee0738 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Wed, 20 Apr 2022 02:53:03 +0000 Subject: [PATCH] Try a new encryption for when we need to read a file --- .gitattributes | 2 ++ hosts/linode/synapse.nix | 11 +++++------ hosts/linode/synapse.nix.crypt | 12 ++++++++++++ secrets/mautrixfacebook.age | Bin 2898 -> 0 bytes secrets/secrets.nix | 1 - 5 files changed, 19 insertions(+), 7 deletions(-) create mode 100644 .gitattributes create mode 100644 hosts/linode/synapse.nix.crypt delete mode 100644 secrets/mautrixfacebook.age diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..2900349 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +#pattern filter=crypt diff=crypt +**/*.crypt filter=crypt diff=crypt diff --git a/hosts/linode/synapse.nix b/hosts/linode/synapse.nix index aa71d81..2d296e5 100644 --- a/hosts/linode/synapse.nix +++ b/hosts/linode/synapse.nix @@ -6,7 +6,8 @@ let domain = "${config.networking.domain}"; fqdn = "matrix.${domain}"; - fbRegistration = builtins.fromJSON ( builtins.readFile config.age.secrets.mautrixfacebook.path ); + fbRegistration = import ./synapse.nix.crypt {}; + fbRegistrationFile = "matrix/mautrix-facebook.json"; in { services.nginx = { @@ -69,6 +70,8 @@ return 200 '${builtins.toJSON client}'; }; }; + environment.etc."${fbRegistrationFile}".text = builtins.toJSON fbRegistration; + services.matrix-synapse = { enable = true; database_name = "synapse"; @@ -89,7 +92,7 @@ return 200 '${builtins.toJSON client}'; } ]; } ]; app_service_config_files = [ - config.age.secrets.mautrixfacebook.path + "/etc/${fbRegistrationFile}" ]; }; @@ -100,10 +103,6 @@ return 200 '${builtins.toJSON client}'; }; # Enable Facebook bridge - age.secrets.mautrixfacebook = { - file = ../../secrets/mautrixfacebook.age; - owner = "matrix-synapse"; - }; services.mautrix-facebook = { enable = true; settings = { diff --git a/hosts/linode/synapse.nix.crypt b/hosts/linode/synapse.nix.crypt new file mode 100644 index 0000000..56bef7e --- /dev/null +++ b/hosts/linode/synapse.nix.crypt @@ -0,0 +1,12 @@ +U2FsdGVkX18oPFqz6C36wMep7NFLW1+gHEgSX2ltuQVRFUV5inWVu20TxSbwr5Lf +51sP6mT8A88DoTkUaKMiUdeDF5kRpi9534ZZ2WocW5Vax5DsAo3uAA6xP3DX+Ple +ADjJZzGyMJB9Wu8vYwLARS24gYENTThP03Cx8JpwgcijulZGRtN3ud7JMnWCE1Wu +rrppjy3L2VXi/ewsfvIH8kD15sixUPQ80eb1Q1ZESDNVCunmVjOTclnVaMoX4iuE +D/irD5JsbAN5f7Gn65vEMlNy5cl7pP8Jn5PWYj6dXFpq7h+MXX2lW2D3hoQKkXcE +nSIJ4KUdgiSVXO3f673t5fOvvcjOkyB+hAdPXJo70/i7opvJf+aqxtHnit3dIlBp +Kx0cy2v+1Rp5cYvM2Rp95vZOKsmYwDxtu3ef+MKdyrCxViqb44jXraUQzKR2CX46 +bb2IO1q2MZ3XkSAS3+zCe4ze6EISiUkC0d0ISL+Zx+09MLCliL+LmvIxD4vv7KnQ +rxzeJAYsKVB8kQrgTtdvthHrgfBpyC0b9IIfYX0AZz1Xb/AN4K4H2RJXN1JMIWq3 +K0SIAbG+2tyPuE28kHfQap1WYJJf+Y0S3dkskV+vDctQ2Ac3qR9pzIeb+kOoflhV +7EwuSDbpYrby5NVFH55b1gm4iZdU7BpScCSyOd1ku5Tv5lFnuihCKd93qh4J2jU1 +1qwm6uI3ao+ZeiJuweXIs1hG75IPhxcDhiynbrZOH08kLnMj6hCPxj9rjPWQS2Sg diff --git a/secrets/mautrixfacebook.age b/secrets/mautrixfacebook.age deleted file mode 100644 index 8ddac90d46e3c436edb7bd61fd216107562c684b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2898 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