From fdd4e50a15e1cb53b53bd71bd844cc8262e72c01 Mon Sep 17 00:00:00 2001 From: ybrun Date: Thu, 13 Apr 2017 16:59:29 +0200 Subject: [PATCH] Add possibility to use nginx repo for Debian --- defaults/main.yml | 5 +++++ tasks/setup-Debian.yml | 24 ++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/defaults/main.yml b/defaults/main.yml index cd139d9..9391cac 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -9,6 +9,11 @@ nginx_yum_repo_enabled: true nginx_ppa_use: false nginx_ppa_version: stable +# Use the official Nginx repo for Debian, and the version to use +# Leave field empty for stable. Explicit the name for others, i.e: mainline +nginx_repo_use: false +nginx_repo_version: "" + # The name of the nginx apt/yum package to install. nginx_package_name: "nginx" diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml index 2638ce0..2c463c3 100644 --- a/tasks/setup-Debian.yml +++ b/tasks/setup-Debian.yml @@ -3,6 +3,30 @@ apt: update_cache=yes cache_valid_time=86400 changed_when: false +- name: Ensure apt key is present for nginx repository + apt_key: + url: http://nginx.org/keys/nginx_signing.key + state: present + become: yes + when: nginx_repo_use + +- name: Ensure nginx apt repository is present + apt_repository: + repo: "deb http://nginx.org/packages/{{ nginx_repo_version }}/debian/ \ + {{ ansible_distribution_release }} nginx" + state: present + filename: nginx + update_cache: yes + become: yes + register: nginx_repo_added + when: nginx_repo_use + +- name: Ensure nginx will reinstall if the repo was just added. + apt: + name: nginx + state: absent + when: nginx_repo_added.changed + - name: Ensure nginx is installed. apt: name: "{{ nginx_package_name }}"