From d49c159843b3bfa51cb221f3d1fe89b102ae1f72 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Aug 03 2020 18:07:35 +0000 Subject: Merge branch 'hellcp/mailman3-theme' into 'production' Set up theming for mailman3 See merge request infra/salt!433 --- diff --git a/pillar/role/mailman3.sls b/pillar/role/mailman3.sls index 9047165..0145462 100644 --- a/pillar/role/mailman3.sls +++ b/pillar/role/mailman3.sls @@ -1,7 +1,8 @@ -{% if salt['grains.get']('include_secrets', True) %} include: +{% if salt['grains.get']('include_secrets', True) %} - secrets.role.mailman3 {% endif %} + - role.common.nginx # Special config for mailman in the postfix relay profile: diff --git a/pillar/secrets/role/mailman3.sls b/pillar/secrets/role/mailman3.sls index 9a923bf..5c78a3f 100644 --- a/pillar/secrets/role/mailman3.sls +++ b/pillar/secrets/role/mailman3.sls @@ -272,6 +272,99 @@ profile: mr/gcg== =R22r -----END PGP MESSAGE----- + secret_txt: | + -----BEGIN PGP MESSAGE----- + + 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 + NDZ/8itXWIG9JFER8NHtMLT5aITe+w== + =g3oz + -----END PGP MESSAGE----- + postgres: users: diff --git a/salt/profile/mailman3/config.sls b/salt/profile/mailman3/config.sls index 5e6b6a0..9d7f2f4 100644 --- a/salt/profile/mailman3/config.sls +++ b/salt/profile/mailman3/config.sls @@ -6,12 +6,6 @@ mailman_var_dir: file.directory: - name: /var/lib/mailman/ -# Preparation for when we have a set of templates for mailman core - -mailman_template_dir: - file.directory: - - name: /var/lib/mailman/templates/ - mailman_webui_dir: file.directory: - name: /var/lib/mailman_webui/ @@ -21,15 +15,20 @@ mailman_log_dir: - name: /var/log/mailman/ - user: mailman -# Preparation for when we have a theme for hyperkitty +mailman_lock_dir: + file.directory: + - name: /var/lock/mailman/ + - user: mailman -mailman_webui_template_dir: +mailman_run_dir: file.directory: - - name: /var/lib/mailman_webui/templates/ + - name: /var/run/mailman/ + - user: mailman -mailman_webui_static_dir: +mailman_spool_dir: file.directory: - - name: /var/lib/mailman_webui/static-openSUSE/ + - name: /var/spool/mailman/ + - user: mailman mailman_conf_file: file.managed: @@ -43,6 +42,16 @@ mailman_conf_file: - watch_in: - module: mailman_restart +mailman_conf_symlink_var: + file.symlink: + - name: /var/lib/mailman/var/etc/mailman.cfg + - target: /etc/mailman/mailman.cfg + +mailman_conf_symlink_etc: + file.symlink: + - name: /etc/mailman.cfg + - target: /etc/mailman/mailman.cfg + mailman_webui_manage_file: file.managed: - name: /var/lib/mailman_webui/manage.py @@ -62,9 +71,9 @@ mailman_webui_settings_file: - require: - file: mailman_webui_dir - require_in: - - service: mailman_service + - service: mailman_webui_service - watch_in: - - module: mailman_restart + - module: mailman_webui_restart mailman_webui_urls_file: file.managed: @@ -73,9 +82,9 @@ mailman_webui_urls_file: - require: - file: mailman_webui_dir - require_in: - - service: mailman_service + - service: mailman_webui_service - watch_in: - - module: mailman_restart + - module: mailman_webui_restart mailman_webui_wsgi_file: file.managed: @@ -84,9 +93,9 @@ mailman_webui_wsgi_file: - require: - file: mailman_webui_dir - require_in: - - service: mailman_service + - service: mailman_webui_service - watch_in: - - module: mailman_restart + - module: mailman_webui_restart mailman_disable_signup: file.managed: @@ -102,9 +111,9 @@ mailman_uwsgi_conf: - require: - file: mailman_conf_dir - require_in: - - service: mailman_service + - service: mailman_webui_service - watch_in: - - module: mailman_restart + - module: mailman_webui_restart {% set logfiles = ['uwsgi', 'uwsgi-cron', 'uwsgi-error', 'uwsgi-qcluster'] %} @@ -113,6 +122,7 @@ mailman_{{ logfile }}_file: file.managed: - name: /var/log/mailman/{{ logfile }}.log - user: mailman + - replace: False - require: - file: mailman_log_dir - require_in: @@ -129,6 +139,13 @@ mailman_hyperkitty_conf: - require: - file: mailman_conf_dir - require_in: - - service: mailman_service + - service: mailman_webui_service - watch_in: - - module: mailman_restart + - module: mailman_webui_restart + +/var/lib/mailman_webui/secret.txt: + file.managed: + - contents_pillar: profile:mailman3:secret_txt + - mode: 640 + - user: mailman + - group: mailman diff --git a/salt/profile/mailman3/files/mailman.service b/salt/profile/mailman3/files/mailman.service index eba4acf..4c0cfb6 100644 --- a/salt/profile/mailman3/files/mailman.service +++ b/salt/profile/mailman3/files/mailman.service @@ -8,8 +8,9 @@ RestartSec=3 User=mailman Group=mailman -WorkingDirectory=/var/lib/mailman_webui/ -ExecStart=/usr/sbin/uwsgi --ini /etc/mailman/uwsgi.ini +WorkingDirectory=/var/lib/mailman/ +ExecStart=/usr/bin/mailman start +ExecStop=/usr/bin/mailman stop [Install] WantedBy=multi-user.target diff --git a/salt/profile/mailman3/files/mailman_webui.service b/salt/profile/mailman3/files/mailman_webui.service new file mode 100644 index 0000000..eba4acf --- /dev/null +++ b/salt/profile/mailman3/files/mailman_webui.service @@ -0,0 +1,15 @@ +[Unit] +Description=GNU Mailman Service + +[Service] +Type=simple +Restart=on-failure +RestartSec=3 + +User=mailman +Group=mailman +WorkingDirectory=/var/lib/mailman_webui/ +ExecStart=/usr/sbin/uwsgi --ini /etc/mailman/uwsgi.ini + +[Install] +WantedBy=multi-user.target diff --git a/salt/profile/mailman3/files/uwsgi.ini b/salt/profile/mailman3/files/uwsgi.ini index 91c4dec..e00fb26 100644 --- a/salt/profile/mailman3/files/uwsgi.ini +++ b/salt/profile/mailman3/files/uwsgi.ini @@ -4,6 +4,8 @@ # Port on which uwsgi will be listening. uwsgi-socket = /var/lib/mailman/server.sock +plugins = logfile + # Move to the directory wher the django files are. chdir = /var/lib/mailman_webui diff --git a/salt/profile/mailman3/init.sls b/salt/profile/mailman3/init.sls index a3267ce..256aa0a 100644 --- a/salt/profile/mailman3/init.sls +++ b/salt/profile/mailman3/init.sls @@ -1,6 +1,7 @@ include: - profile.mailman3.mailman - profile.mailman3.config + - profile.mailman3.master mailman_service_file: file.managed: @@ -22,3 +23,24 @@ mailman_restart: - m_name: mailman - require: - service: mailman_service + +mailman_webui_service_file: + file.managed: + - name: /etc/systemd/system/mailman_webui.service + - source: salt://profile/mailman3/files/mailman_webui.service + - require_in: + - service: mailman_webui_service + - watch_in: + - module: mailman_webui_restart + +mailman_webui_service: + service.running: + - name: mailman_webui + - enable: True + +mailman_webui_restart: + module.wait: + - name: service.restart + - m_name: mailman_webui + - require: + - service: mailman_webui_service diff --git a/salt/profile/mailman3/mailman.sls b/salt/profile/mailman3/mailman.sls index d521162..a453663 100644 --- a/salt/profile/mailman3/mailman.sls +++ b/salt/profile/mailman3/mailman.sls @@ -24,56 +24,65 @@ mailman: - members: - mailman -/usr/bin/mailman digests --periodic: +mailman_digest: cron.present: + - name: /usr/bin/mailman digests --periodic - user: mailman - minute: 0 - hour: 0 -/path/to/mailman notify: +mailman_notify: cron.present: + - name: /usr/bin/mailman notify - user: mailman - minute: 0 - hour: 8 -django-admin runjobs hourly --pythonpath /var/lib/mailman --settings settings: +mailman_hourly: cron.present: + - name: django-admin runjobs hourly --pythonpath /var/lib/mailman --settings settings - user: mailman - minute: 0 -django-admin runjobs daily --pythonpath /var/lib/mailman --settings settings: +mailman_daily: cron.present: + - name: django-admin runjobs daily --pythonpath /var/lib/mailman --settings settings - user: mailman - minute: 0 - hour: 0 -django-admin runjobs weekly --pythonpath /var/lib/mailman --settings settings: +mailman_weekly: cron.present: + - name: django-admin runjobs weekly --pythonpath /var/lib/mailman --settings settings - user: mailman - minute: 0 - hour: 0 - dayweek: 0 -django-admin runjobs monthly --pythonpath /var/lib/mailman --settings settings: +mailman_monthly: cron.present: + - name: django-admin runjobs monthly --pythonpath /var/lib/mailman --settings settings - user: mailman - minute: 0 - hour: 0 - daymonth: 1 -django-admin runjobs yearly --pythonpath /var/lib/mailman --settings settings: +mailman_yearly: cron.present: + - name: django-admin runjobs yearly --pythonpath /var/lib/mailman --settings settings - user: mailman - minute: 0 - hour: 0 - daymonth: 1 - month: 1 -django-admin runjobs minutely --pythonpath /var/lib/mailman --settings settings: +mailman_minutely: cron.present: + - name: django-admin runjobs minutely --pythonpath /var/lib/mailman --settings settings - user: mailman -django-admin runjobs quarter_hourly --pythonpath /var/lib/mailman --settings settings: +mailman_quarter_hourly: cron.present: + - name: django-admin runjobs quarter_hourly --pythonpath /var/lib/mailman --settings settings - user: mailman - minute: '0,15,30,45' diff --git a/salt/profile/mailman3/master.sls b/salt/profile/mailman3/master.sls new file mode 100644 index 0000000..ac8432a --- /dev/null +++ b/salt/profile/mailman3/master.sls @@ -0,0 +1,18 @@ +https://github.com/openSUSE/lists-o-o.git: + git.latest: + - branch: master + - target: /var/lib/mailman/lists-o-o + - rev: master + - user: mailman + +/var/lib/mailman/templates: + file.symlink: + - target: /var/lib/mailman/lists-o-o/mailman-templates + +/var/lib/mailman_webui/templates: + file.symlink: + - target: /var/lib/mailman/lists-o-o/webui-templates + +/var/lib/mailman_webui/static-openSUSE: + file.symlink: + - target: /var/lib/mailman/lists-o-o/webui-assets diff --git a/salt/profile/postgresql/files/postgresql/pg_hba.conf b/salt/profile/postgresql/files/postgresql/pg_hba.conf index dba6d96..37ac8d3 100644 --- a/salt/profile/postgresql/files/postgresql/pg_hba.conf +++ b/salt/profile/postgresql/files/postgresql/pg_hba.conf @@ -157,4 +157,11 @@ host identification identification 192.168.47.102/32 md5 # tsp.infra.opensuse.org host tsp web_tsp 192.168.47.4/32 md5 host tsp web_tsp 192.168.47.101/32 md5 -host tsp web_tsp 192.168.47.102/32 md5 \ No newline at end of file +host tsp web_tsp 192.168.47.102/32 md5 +# mailman3.infra.opensuse.org +host mailman mailman 192.168.47.4/32 md5 +host mailman mailman 192.168.47.101/32 md5 +host mailman mailman 192.168.47.102/32 md5 +host mailman_frontend mailman 192.168.47.4/32 md5 +host mailman_frontend mailman 192.168.47.101/32 md5 +host mailman_frontend mailman 192.168.47.102/32 md5 diff --git a/salt/role/mailman3.sls b/salt/role/mailman3.sls index a2c0bd1..104f9f8 100644 --- a/salt/role/mailman3.sls +++ b/salt/role/mailman3.sls @@ -1,2 +1,3 @@ include: + - profile.web.server.nginx - profile.mailman3