diff --git a/salt/profile/mailman3/init.sls b/salt/profile/mailman3/init.sls index d79db65..a3267ce 100644 --- a/salt/profile/mailman3/init.sls +++ b/salt/profile/mailman3/init.sls @@ -2,6 +2,15 @@ include: - profile.mailman3.mailman - profile.mailman3.config +mailman_service_file: + file.managed: + - name: /etc/systemd/system/mailman.service + - source: salt://profile/mailman3/files/mailman.service + - require_in: + - service: mailman_service + - watch_in: + - module: mailman_restart + mailman_service: service.running: - name: mailman diff --git a/salt/profile/mailman3/mailman.sls b/salt/profile/mailman3/mailman.sls index a9a04d5..44092a9 100644 --- a/salt/profile/mailman3/mailman.sls +++ b/salt/profile/mailman3/mailman.sls @@ -41,27 +41,27 @@ django-admin runjobs hourly --pythonpath /var/lib/mailman --settings settings: - minute: 0 django-admin runjobs daily --pythonpath /var/lib/mailman --settings settings: - cron.present: + cron.present: - user: mailman - minute: 0 - hour: 0 django-admin runjobs weekly --pythonpath /var/lib/mailman --settings settings: - cron.present: + cron.present: - user: mailman - minute: 0 - hour: 0 - dayweek: 0 django-admin runjobs monthly --pythonpath /var/lib/mailman --settings settings: - cron.present: + cron.present: - user: mailman - minute: 0 - hour: 0 - daymonth: 1 django-admin runjobs yearly --pythonpath /var/lib/mailman --settings settings: - cron.present: + cron.present: - user: mailman - minute: 0 - hour: 0 @@ -69,10 +69,10 @@ django-admin runjobs yearly --pythonpath /var/lib/mailman --settings settings: - month: 1 django-admin runjobs minutely --pythonpath /var/lib/mailman --settings settings: - cron.present: + cron.present: - user: mailman django-admin runjobs quarter_hourly --pythonpath /var/lib/mailman --settings settings: - cron.present: + cron.present: - user: mailman - minute: '0,15,30,45'