diff --git a/host_vars/smtp1.pyrocufflink.blue/main.yml b/host_vars/smtp1.pyrocufflink.blue/main.yml index 4b5b739..4f4c29c 100644 --- a/host_vars/smtp1.pyrocufflink.blue/main.yml +++ b/host_vars/smtp1.pyrocufflink.blue/main.yml @@ -1,5 +1,12 @@ smtp_username: admiralnemo@fastmail.com -smtp_password: '{{ vault_smtp_password }}' +smtp_password: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0Vm04bVVRczlUQWQ5UU0r + b01aU1Z1SVpHL2sxWmhTbVhwdWRITnc2Y1E4CjliY2pNN01ZWWxZY0VYeXhBellK + emVGbXIrZnZpNUtQd0hDSDNMS3NseU0KLS0tIFRYejJnSXoxc3ZXbW1ZK0tiSjI4 + MjRzODRiOWdmUCs3WC9ublRScVJlOVkK7Iqsrl3L+OxUNy453XyMrun30J4U2kpS + gHja7Z8CIQ0ZusNdCJk+qlsf4isrRZE4 + -----END AGE ENCRYPTED FILE----- smtp_inet_interfaces: all # TODO: Dynamically calculate these smtp_mynetworks: diff --git a/host_vars/smtp1.pyrocufflink.blue/vault b/host_vars/smtp1.pyrocufflink.blue/vault deleted file mode 100644 index e9dc06d..0000000 --- a/host_vars/smtp1.pyrocufflink.blue/vault +++ /dev/null @@ -1,7 +0,0 @@ -$ANSIBLE_VAULT;1.1;AES256 -31636633656134376432323061363839623233323233636631333239653636613936383265393331 -6163383761623165643632366264643433326638303338310a363833336566643939333830343237 -64343965623261393462643136353330633562343636386361333434663464626434633533613434 -6635303234333462330a323037623632633366356463653739393034393863356434383430393066 -36376461366166383365643366383033333365626161366634343562366361316561333566393831 -6262396438326461666261346562376563643630653566633363 diff --git a/roles/postfix/templates/sasl_passwd.j2 b/roles/postfix/templates/sasl_passwd.j2 index ebc26b5..00ba178 100644 --- a/roles/postfix/templates/sasl_passwd.j2 +++ b/roles/postfix/templates/sasl_passwd.j2 @@ -1,5 +1,5 @@ {% if smtp.mode == 'relay' %} {% if smtp.auth|d('none') != 'none' and smtp.username is defined %} -[{{ smtp.host }}]:{{ smtp.port|d(25) }} {{ smtp.username }}:{{ smtp.password }} +[{{ smtp.host }}]:{{ smtp.port|d(25) }} {{ smtp.username }}:{{ smtp.password | decrypt }} {% endif %} {% endif %}