diff --git a/playbooks/mail.yml b/playbooks/mail.yml index a8ea0b4..c86b7ed 100644 --- a/playbooks/mail.yml +++ b/playbooks/mail.yml @@ -10,4 +10,3 @@ - opendmarc - postgrey - spamassassin - - mailman diff --git a/production.yml b/production.yml index 5370041..87c1b75 100644 --- a/production.yml +++ b/production.yml @@ -162,8 +162,6 @@ webservers: web_hostname: - imap.libertus.eu - smtp.libertus.eu - - mm.pipoworld.fr - - mm.nintendojo.fr munin.dmz.mateu.be: web_hostname: - munin.mateu.be diff --git a/roles/mailman/files/mailman.cfg b/roles/mailman/files/mailman.cfg deleted file mode 100644 index 0de4846..0000000 --- a/roles/mailman/files/mailman.cfg +++ /dev/null @@ -1,70 +0,0 @@ -[mailman] -site_owner: root@mateu.be -noreply_address: noreply -default_language: fr -sender_headers: from from_ reply-to sender -email_commands_max_lines: 10 -pending_request_life: 3d -cache_life: 7d -pre_hook: -post_hook: -layout: debian -filtered_messages_are_preservable: no -html_to_plain_text_command: /usr/bin/lynx -dump $filename -listname_chars: [-_.0-9a-z] - -[shell] -prompt: >>> -banner: Welcome to the GNU Mailman shell -use_ipython: no -history_file: - -[paths.debian] -var_dir: /var/lib/mailman3 -queue_dir: $var_dir/queue -bin_dir: /usr/lib/mailman3/bin -list_data_dir: $var_dir/lists -log_dir: /var/log/mailman3 -lock_dir: $var_dir/locks -data_dir: $var_dir/data -cache_dir: $var_dir/cache -etc_dir: /etc/mailman3 -ext_dir: $var_dir/ext -messages_dir: $var_dir/messages -archive_dir: $var_dir/archives -template_dir: $var_dir/templates -pid_file: /run/mailman3/master.pid -lock_file: $lock_dir/master.lck - -[database] -class: mailman.database.sqlite.SQLiteDatabase -url: sqlite:///$DATA_DIR/mailman.db -debug: no - -[logging.debian] -format: %(asctime)s (%(process)d) %(message)s -datefmt: %b %d %H:%M:%S %Y -propagate: no -level: info -path: mailman.log - -[webservice] -hostname: localhost -port: 8001 -use_https: no -show_tracebacks: yes -api_version: 3.1 -admin_user: restadmin -admin_pass: 2BeMu4kyHzMA8K95IvoevuU1G1dO9ovZn2TLvu5045PGiVUe - -[mta] -incoming: mailman.mta.postfix.LMTP -outgoing: mailman.mta.deliver.deliver -remove_dkim_headers: yes -smtp_host: localhost -smtp_port: 25 -smtp_user: -smtp_pass: -lmtp_host: 127.0.0.1 -lmtp_port: 8024 -configuration: python:mailman.config.postfix diff --git a/roles/mailman/handlers/main.yml b/roles/mailman/handlers/main.yml deleted file mode 100644 index 5f972bf..0000000 --- a/roles/mailman/handlers/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -- name: Restart mailman3 - ansible.builtin.service: - name: mailman3 - state: restarted diff --git a/roles/mailman/tasks/main.yml b/roles/mailman/tasks/main.yml deleted file mode 100644 index d7fba25..0000000 --- a/roles/mailman/tasks/main.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- - -- name: Install mailman3 and dependencies - ansible.builtin.package: - name: "{{ item }}" - state: present - loop: - - mailman3-full - - sqlite3 - -- name: Put mailman3 config file - ansible.builtin.copy: - src: ./files/mailman.cfg - dest: /etc/mailman3/mailman.cfg - mode: "0o640" - notify: Restart mailman3 - -- name: Start mailman3 service - ansible.builtin.service: - name: mailman3 - state: started - enabled: true diff --git a/roles/nginx/templates/vhosts/mm.nintendojo.fr.conf.j2 b/roles/nginx/templates/vhosts/mm.nintendojo.fr.conf.j2 deleted file mode 100644 index e69de29..0000000 diff --git a/roles/nginx/templates/vhosts/mm.pipoworld.fr.conf.j2 b/roles/nginx/templates/vhosts/mm.pipoworld.fr.conf.j2 deleted file mode 100644 index c3cfe54..0000000 --- a/roles/nginx/templates/vhosts/mm.pipoworld.fr.conf.j2 +++ /dev/null @@ -1,25 +0,0 @@ -server { - listen *:443 ssl http2; - listen [::]:443 ssl http2; - ssl_certificate /etc/x509/mm.pipoworld.fr/fullchain.cer; - ssl_certificate_key /etc/x509/mm.pipoworld.fr/mm.pipoworld.fr.key; - server_name mm.pipoworld.fr mm.nintendojo.fr; - access_log /var/log/nginx/mm.pipoworld.fr.access.log combined; - access_log syslog:server=unix:/dev/log combined; - error_log /var/log/nginx/mm.pipoworld.fr.error.log; - error_log syslog:server=unix:/dev/log; - - location / { - uwsgi_pass unix:/run/mailman3-web/uwsgi.sock; - include /etc/nginx/uwsgi_params; - } - - location /mailman3/static { - alias /var/lib/mailman3/web/static; - } - - location /mailman3/static/favicon.ico { - alias /var/lib/mailman3/web/static/postorius/img/favicon.ico; - } -} - diff --git a/roles/postfix/files/main.cf b/roles/postfix/files/main.cf index 99bc656..3979cb3 100644 --- a/roles/postfix/files/main.cf +++ b/roles/postfix/files/main.cf @@ -1,4 +1,5 @@ ## Configuration de postfix +## 01/07/2024 mortal Suppression des paramètres pour mailman3 ## 29/06/2024 mortal Suppression de pipoworld.fr ## 22/02/2024 mortal Ajout de postgrey ## 26/02/2023 mortal Ajout des futures adresses IPv4/v6 pour Free @@ -25,8 +26,8 @@ inet_protocols = all inet_interfaces = all mynetworks = 127.0.0.1, [::1]/128, 10.233.212.64/27, 10.233.212.0/26, 82.66.135.228, [2a01:e0a:9bd:2810::]/60 relayhost = 37.187.5.75 -transport_maps = hash:/etc/postfix/transport hash:/var/lib/mailman3/data/postfix_lmtp -local_recipient_maps = proxy:unix:passwd.byname $alias_maps hash:/var/lib/mailman3/data/postfix_lmtp +transport_maps = hash:/etc/postfix/transport +local_recipient_maps = proxy:unix:passwd.byname $alias_maps myhostname = mail.dmz.mateu.be myorigin = mateu.be mydestination = $myhostname,localhost.$mydomain,localhost,mateu.be,libertus.eu,p.libertus.eu,nintendojo.fr