diff --git a/defaults/main.yml b/defaults/main.yml index 25ce129..8160158 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -5,7 +5,7 @@ nginx_distribution: nginx nginx_conf_dir: /etc/nginx -nginx_repo: "ppa:nginx/stable" +nginx_repo: "deb http://nginx.org/packages/ubuntu {{ ansible_distribution_release }} nginx" nginx_binary_name: nginx nginx_service_name: "{{ nginx_distribution }}" diff --git a/spec/main_spec.rb b/spec/main_spec.rb index 70f41b3..dc23064 100644 --- a/spec/main_spec.rb +++ b/spec/main_spec.rb @@ -1,11 +1,6 @@ require 'spec_helper' describe "Nginx setup" do - describe ppa('nginx/stable') do - it { should exist } - it { should be_enabled } - end - describe package('nginx') do it { should be_installed } its(:version) { should > '1.8.0' } diff --git a/tasks/nginx-repo.yml b/tasks/nginx-repo.yml index cf2071d..4a0166a 100644 --- a/tasks/nginx-repo.yml +++ b/tasks/nginx-repo.yml @@ -5,7 +5,7 @@ when: nginx_repo is match("deb http://nginx.org/packages/.*") tags: [packages, nginx] -- name: Add given nginx repo +- name: Add given Nginx Repo ansible.builtin.apt_repository: repo: "{{ nginx_repo }}" state: present