diff --git a/salt/profile/mailman3/config.sls b/salt/profile/mailman3/config.sls index 87b9d96..5e6b6a0 100644 --- a/salt/profile/mailman3/config.sls +++ b/salt/profile/mailman3/config.sls @@ -106,42 +106,12 @@ mailman_uwsgi_conf: - watch_in: - module: mailman_restart -mailman_log_file: - file.managed: - - name: /var/log/mailman/uwsgi.log - - user: mailman - - require: - - file: mailman_log_dir - - require_in: - - service: mailman_service - - watch_in: - - module: mailman_restart - -mailman_error_log_file: - file.managed: - - name: /var/log/mailman/uwsgi-error.log - - user: mailman - - require: - - file: mailman_log_dir - - require_in: - - service: mailman_service - - watch_in: - - module: mailman_restart - -mailman_cron_log_file: - file.managed: - - name: /var/log/mailman/uwsgi-cron.log - - user: mailman - - require: - - file: mailman_log_dir - - require_in: - - service: mailman_service - - watch_in: - - module: mailman_restart +{% set logfiles = ['uwsgi', 'uwsgi-cron', 'uwsgi-error', 'uwsgi-qcluster'] %} -mailman_qcluster_log_file: +{% for logfile in logfiles %} +mailman_{{ logfile }}_file: file.managed: - - name: /var/log/mailman/uwsgi-qcluster.log + - name: /var/log/mailman/{{ logfile }}.log - user: mailman - require: - file: mailman_log_dir @@ -149,6 +119,7 @@ mailman_qcluster_log_file: - service: mailman_service - watch_in: - module: mailman_restart +{% endfor %} mailman_hyperkitty_conf: file.managed: