From 207bee2aac552d1b30e08f707e4448396b1ce43c Mon Sep 17 00:00:00 2001 From: Jelle van der Waa <jelle@archlinux.org> Date: Mon, 12 Apr 2021 20:33:24 +0200 Subject: [PATCH] remove unused mailman role The redirects are now done by the `redirects` role. --- roles/mailman/tasks/main.yml | 14 ---------- roles/mailman/templates/nginx.d.conf.j2 | 35 ------------------------- 2 files changed, 49 deletions(-) delete mode 100644 roles/mailman/tasks/main.yml delete mode 100644 roles/mailman/templates/nginx.d.conf.j2 diff --git a/roles/mailman/tasks/main.yml b/roles/mailman/tasks/main.yml deleted file mode 100644 index e03002d49..000000000 --- a/roles/mailman/tasks/main.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- - -- name: set up nginx - template: src=nginx.d.conf.j2 dest=/etc/nginx/nginx.d/mailman.conf owner=root group=root mode=644 - notify: - - reload nginx - tags: - - nginx - -- name: make nginx log dir - file: path=/var/log/nginx/{{ mailman_domain }} state=directory owner=root group=root mode=0755 - when: archweb_site - tags: - - nginx diff --git a/roles/mailman/templates/nginx.d.conf.j2 b/roles/mailman/templates/nginx.d.conf.j2 deleted file mode 100644 index 55b901a59..000000000 --- a/roles/mailman/templates/nginx.d.conf.j2 +++ /dev/null @@ -1,35 +0,0 @@ -server { - listen 80; - listen [::]:80; - server_name mailman.archlinux.org; - - access_log /var/log/nginx/{{ mailman_domain }}/access.log reduced; - access_log /var/log/nginx/{{ mailman_domain }}/access.log.json json_reduced; - error_log /var/log/nginx/{{ mailman_domain }}/error.log; - - include snippets/letsencrypt.conf; - - location / { - access_log off; - return 301 https://{{ mailman_domain }}$request_uri; - } -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name mailman.archlinux.org; - - access_log /var/log/nginx/{{ mailman_domain }}/access.log reduced; - access_log /var/log/nginx/{{ mailman_domain }}/access.log.json json_reduced; - error_log /var/log/nginx/{{ mailman_domain }}/error.log; - - ssl_certificate /etc/letsencrypt/live/mailman.archlinux.org/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/mailman.archlinux.org/privkey.pem; - ssl_trusted_certificate /etc/letsencrypt/live/mailman.archlinux.org/chain.pem; - - location / { - access_log off; - return 301 https://{{ mailman_domain }}$request_uri; - } -} -- GitLab