From ee7a0aa054d7110c0971c27b39f7c32e6e096c39 Mon Sep 17 00:00:00 2001 From: Giancarlo Razzolini <grazzolini@archlinux.org> Date: Tue, 24 Sep 2019 23:03:49 -0300 Subject: [PATCH] roles/archwiki: Plug in the maintenance role --- roles/archwiki/defaults/main.yml | 1 + roles/archwiki/tasks/main.yml | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/roles/archwiki/defaults/main.yml b/roles/archwiki/defaults/main.yml index 64ce712e2..c9ea62a91 100644 --- a/roles/archwiki/defaults/main.yml +++ b/roles/archwiki/defaults/main.yml @@ -1,6 +1,7 @@ --- archwiki_dir: '/srv/http/archwiki' archwiki_domain: 'wiki.archlinux.org' +archwiki_nginx_conf: '/etc/nginx/nginx.d/archwiki.conf' archwiki_user: 'archwiki' archwiki_repository: 'https://github.com/archlinux/archwiki.git' archwiki_version: 'b8e35046ae4bb5e7a7bddf7f0f0f2f79f327f162' diff --git a/roles/archwiki/tasks/main.yml b/roles/archwiki/tasks/main.yml index c5fe82715..1f510e1b4 100644 --- a/roles/archwiki/tasks/main.yml +++ b/roles/archwiki/tasks/main.yml @@ -1,4 +1,13 @@ --- +- name: run maintenance mode + include_role: + name: maintenance + vars: + service_name: "wiki" + service_domain: "{{ archwiki_domain }}" + service_alternate_domains: [] + service_nginx_conf: "{{ archwiki_nginx_conf }}" + when: maintenance is defined - name: create ssl cert command: certbot certonly --email webmaster@archlinux.org --agree-tos --rsa-key-size 4096 --renew-by-default --webroot -w {{ letsencrypt_validation_dir }} -d '{{ archwiki_domain }}' creates='/etc/letsencrypt/live/{{ archwiki_domain }}/fullchain.pem' @@ -15,9 +24,10 @@ file: state=directory owner="{{ archwiki_user }}" group="{{ archwiki_user }}" path="{{ archwiki_dir }}" - name: set up nginx - template: src=nginx.d.conf.j2 dest=/etc/nginx/nginx.d/archwiki.conf owner=root group=root mode=644 + template: src=nginx.d.conf.j2 dest="{{ archwiki_nginx_conf }}" owner=root group=root mode=644 notify: - reload nginx + when: maintenance is not defined tags: ['nginx'] - name: configure robots.txt -- GitLab