From 9800718059174ef1ede72bc8110461a732d50ad9 Mon Sep 17 00:00:00 2001 From: Jelle van der Waa <jelle@vdwaa.nl> Date: Tue, 26 Mar 2019 21:09:18 +0100 Subject: [PATCH] archweb: deploy retro pages --- roles/archweb/defaults/main.yml | 3 +++ roles/archweb/tasks/main.yml | 12 ++++++++++++ roles/archweb/templates/nginx.d.conf.j2 | 4 ++++ 3 files changed, 19 insertions(+) diff --git a/roles/archweb/defaults/main.yml b/roles/archweb/defaults/main.yml index c5d6fc832..bcdd4c585 100644 --- a/roles/archweb/defaults/main.yml +++ b/roles/archweb/defaults/main.yml @@ -36,3 +36,6 @@ archweb_db_dbscripts_table_objs: 'mirrors_mirror,mirrors_mirrorrsync' archweb_db_backup_user: 'archweb_backup' archweb_db_backup_table_objs: 'ALL_IN_SCHEMA' archweb_db_backup_sequence_objs: 'ALL_IN_SCHEMA' + +archweb_retro_repository: 'https://git.archlinux.org/archweb-retro.git' +archweb_retro_dir: '/srv/http/archweb-retro' diff --git a/roles/archweb/tasks/main.yml b/roles/archweb/tasks/main.yml index 9dc248269..8b9228c7d 100644 --- a/roles/archweb/tasks/main.yml +++ b/roles/archweb/tasks/main.yml @@ -268,3 +268,15 @@ - name: start and enable archweb dump donor timer service: name="archweb-dump_donor_mail.timer" enabled=yes state=started when: archweb_donor_import + +- name: create retro dir + file: state=directory owner=archweb group=archweb path="{{ archweb_retro_dir }}" + when: archweb_site + +- name: clone archweb-retro repo + git: > + repo={{ archweb_retro_repository }} + dest="{{ archweb_retro_dir }}" + become: true + become_user: archweb + when: archweb_site diff --git a/roles/archweb/templates/nginx.d.conf.j2 b/roles/archweb/templates/nginx.d.conf.j2 index 357913ecc..b971038f2 100644 --- a/roles/archweb/templates/nginx.d.conf.j2 +++ b/roles/archweb/templates/nginx.d.conf.j2 @@ -139,6 +139,10 @@ server { alias {{ archweb_dir }}/media/img; } + location /retro { + alias {{ archweb_retro_dir }}; + } + location / { access_log /var/log/nginx/{{ archweb_domain }}/access.log main; include uwsgi_params; -- GitLab