Misc cleanup for dispatcher

This commit is contained in:
KemoNine 2020-08-09 01:02:18 -04:00
parent 02d16a5787
commit 7d77b38355
3 changed files with 23 additions and 14 deletions

View file

@ -1,4 +1,5 @@
--- ---
msmtp_containerized: true
msmtp_email_address: user@domain.tld msmtp_email_address: user@domain.tld
msmtp_smtp_server: "smtp.domain.tld" msmtp_smtp_server: "smtp.domain.tld"
msmtp_smtp_from: "piframe@domain.tld" msmtp_smtp_from: "piframe@domain.tld"

View file

@ -1,14 +1,14 @@
{ {
"dispatcher": { "dispatcher": {
"url": "http://127.0.0.1:2812", "url": "http://127.0.0.1:2812",
"user": "{{ monit_web_user }}", "user": "{{ monit_web_user }}",
"passwd": "{{ monit_web_pasword }}" "passwd": "{{ monit_web_pasword }}"
}{{ "," if items is defined and (items|length>0) }} }{{ "," if items is defined and (items|length>0) }}
{% for frame in items %} {% for frame in items %}
"{{ frame.name }}": { "{{ frame.name }}": {
"url": "http://{{ frame.wireguard_address }}:2812", "url": "http://{{ frame.wireguard_address }}:2812",
"user": "{{ frame.monit_web_user }}", "user": "{{ frame.monit_web_user }}",
"passwd": "{{ frame.monit_web_pasword }}" "passwd": "{{ frame.monit_web_pasword }}"
}{{ "," if not loop.last }} }{{ "," if not loop.last }}
{% endfor %} {% endfor %}
} }

View file

@ -4,7 +4,11 @@ auth on
tls on tls on
tls_trust_file /etc/ssl/certs/ca-certificates.crt tls_trust_file /etc/ssl/certs/ca-certificates.crt
{$ if msmtp_containerized %}
logfile /opt/misc/msmtp.log
{% else %}
logfile /var/log/msmtp.log logfile /var/log/msmtp.log
{% endif %}
from {{ msmtp_smtp_from }} from {{ msmtp_smtp_from }}
keepbcc on keepbcc on
@ -19,4 +23,8 @@ password {{ msmtp_smtp_password }}
# Set a default account # Set a default account
account default : piframe account default : piframe
{% if msmtp_containerized %}
aliases /opt/misc/aliases
{% else %}
aliases /etc/aliases aliases /etc/aliases
{% endif %}