diff --git a/pillar/role/mailman3.sls b/pillar/role/mailman3.sls index 48d819f..8b34b78 100644 --- a/pillar/role/mailman3.sls +++ b/pillar/role/mailman3.sls @@ -14,3 +14,10 @@ profile: server_list: - lists.opensuse.org - mailman3.infra.opensuse.org + +sudoers: + included_files: + /etc/sudoers.d/group_mailman3-admins: + groups: + mailman3-admins: + - 'ALL=(ALL) ALL' diff --git a/salt/profile/mailman3/config.sls b/salt/profile/mailman3/config.sls index 3eaae78..4c743c0 100644 --- a/salt/profile/mailman3/config.sls +++ b/salt/profile/mailman3/config.sls @@ -29,7 +29,7 @@ mailman_webui_static_dir: mailman_conf_file: file.managed: - name: /etc/mailman/mailman.cfg - - source: salt://profile/lists/files/mailman.cfg + - source: salt://profile/mailman3/files/mailman.cfg - template: jinja - require: - file: mailman_conf_dir @@ -41,7 +41,7 @@ mailman_conf_file: mailman_webui_manage_file: file.managed: - name: /var/lib/mailman_webui/manage.py - - source: salt://profile/lists/files/manage.py + - source: salt://profile/mailman3/files/manage.py - template: jinja - require: - file: mailman_webui_dir @@ -53,7 +53,7 @@ mailman_webui_manage_file: mailman_webui_settings_file: file.managed: - name: /var/lib/mailman_webui/settings.py - - source: salt://profile/lists/files/settings.py + - source: salt://profile/mailman3/files/settings.py - template: jinja - require: - file: mailman_webui_dir @@ -65,7 +65,7 @@ mailman_webui_settings_file: mailman_webui_urls_file: file.managed: - name: /var/lib/mailman/urls.py - - source: salt://profile/lists/files/urls.py + - source: salt://profile/mailman3/files/urls.py - template: jinja - require: - file: mailman_webui_dir @@ -77,7 +77,7 @@ mailman_webui_urls_file: mailman_webui_wsgi_file: file.managed: - name: /var/lib/mailman_webui/wsgi.py - - source: salt://profile/lists/files/wsgi.py + - source: salt://profile/mailman3/files/wsgi.py - template: jinja - require: - file: mailman_webui_dir @@ -89,14 +89,14 @@ mailman_webui_wsgi_file: mailman_disable_signup: file.managed: - name: /var/lib/mailman_webui/django_fedora_nosignup.py - - source: salt://profile/lists/files/django_fedora_nosignup.py + - source: salt://profile/mailman3/files/django_fedora_nosignup.py - require: - file: mailman_webui_dir mailman_uwsgi_conf: file.managed: - name: /etc/mailman/uwsgi.ini - - source: salt://profile/lists/files/uwsgi.ini + - source: salt://profile/mailman3/files/uwsgi.ini - template: jinja - require: - file: mailman_conf_dir @@ -108,7 +108,7 @@ mailman_uwsgi_conf: mailman_hyperkitty_conf: file.managed: - name: /etc/mailman/hyperkitty.cfg - - source: salt://profile/lists/files/hyperkitty.cfg + - source: salt://profile/mailman3/files/hyperkitty.cfg - template: jinja - require: - file: mailman_conf_dir diff --git a/salt/profile/mailman3/mailman.sls b/salt/profile/mailman3/mailman.sls index ec16853..c10c936 100644 --- a/salt/profile/mailman3/mailman.sls +++ b/salt/profile/mailman3/mailman.sls @@ -58,14 +58,14 @@ django-admin runjobs monthly --pythonpath /var/lib/mailman --settings settings: - user: mailman - minute: 0 - hour: 0 - - daymonth: 0 + - daymonth: 1 django-admin runjobs yearly --pythonpath /var/lib/mailman --settings settings: cron.present: - user: mailman - minute: 0 - hour: 0 - - daymonth: 0 + - daymonth: 1 - month: 0 django-admin runjobs minutely --pythonpath /var/lib/mailman --settings settings: