From 15164873ef04529579ca2d26261c1b7ee580b568 Mon Sep 17 00:00:00 2001 From: staticsafe Date: Wed, 7 May 2014 19:16:09 +0000 Subject: [PATCH] Change nginx repo to upstream one. Also consolidate install and enable task. --- debian/roles/webservers-nginx/tasks/main.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/debian/roles/webservers-nginx/tasks/main.yml b/debian/roles/webservers-nginx/tasks/main.yml index 0715238..74a018f 100644 --- a/debian/roles/webservers-nginx/tasks/main.yml +++ b/debian/roles/webservers-nginx/tasks/main.yml @@ -1,12 +1,10 @@ --- -- name: Add Dotdeb signing key - apt_key: url=http://www.dotdeb.org/dotdeb.gpg state=present +- name: Add nginx upstream repo key + apt_key: url=http://nginx.org/keys/nginx_signing.key state=present - name: Add Dotdeb repository - apt_repository: repo='deb http://packages.dotdeb.org wheezy all' state=present update_cache=yes -- name: Install nginx package - apt: pkg=nginx-full state=present -- name: Ensure nginx starts on boot - service: name=nginx enabled=yes + apt_repository: repo='deb http://nginx.org/packages/debian/ wheezy nginx' state=present update_cache=yes +- name: Install nginx package and ensure it starts on boot + apt: pkg=nginx state=present enabled=yes - name: Stop nginx for now service: name=nginx state=stopped - name: Make nginx related dirs