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 8ddac90..0000000 Binary files a/secrets/mautrixfacebook.age and /dev/null differ diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 4dea125..8e33964 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -10,6 +10,5 @@ in # At the point where you want to use it, put # age.secrets.matrix.file = ../../secrets/matrix.age; # Then you can reference the file at /run/agenix/matrix - "mautrixfacebook.age".publicKeys = [ linode user ]; "nextcloudadmin.age".publicKeys = [ linode user ]; }