From 3d54465fabf715a9a66aefa2bec59554224f17af Mon Sep 17 00:00:00 2001 From: Giancarlo Razzolini <grazzolini@archlinux.org> Date: Fri, 2 Mar 2018 20:11:37 -0300 Subject: [PATCH] Added the repository and version as variables Make the role fully idempotent by pinning the version and also use a variable for setting the repository. --- roles/archwiki/defaults/main.yml | 3 +++ roles/archwiki/tasks/main.yml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/roles/archwiki/defaults/main.yml b/roles/archwiki/defaults/main.yml index ca9d7f100..eb8df0334 100644 --- a/roles/archwiki/defaults/main.yml +++ b/roles/archwiki/defaults/main.yml @@ -2,6 +2,9 @@ archwiki_dir: '/srv/http/archwiki' archwiki_domain: 'wiki.archlinux.org' archwiki_user: 'archwiki' +archwiki_repository: 'https://git.archlinux.org/vhosts/wiki.archlinux.org.git' +archwiki_version: 157cc33b0b4459e02b0a573277e092b79bc849b1 + archwiki_socket: '/run/php-fpm/archwiki.socket' archwiki_db: 'archwiki' diff --git a/roles/archwiki/tasks/main.yml b/roles/archwiki/tasks/main.yml index d3339ee9b..86c08fce8 100644 --- a/roles/archwiki/tasks/main.yml +++ b/roles/archwiki/tasks/main.yml @@ -24,7 +24,7 @@ file: path=/var/log/nginx/{{ archwiki_domain }} state=directory owner=root group=root mode=0755 - name: clone archwiki repo - git: repo=https://git.archlinux.org/vhosts/{{ archwiki_domain }}.git dest="{{ archwiki_dir }}/public" + git: repo={{ archwiki_repository }} dest="{{ archwiki_dir }}/public" version={{ archwiki_version }} become: true become_user: "{{ archwiki_user }}" register: release -- GitLab