Skip to content

Commit

Permalink
Merge pull request #3 from mediafellows/fix_apt_repo
Browse files Browse the repository at this point in the history
Use official nginx apt repo, instead of outdated ppa
  • Loading branch information
stefanhorning authored Jun 26, 2023
2 parents dc1b987 + a99aaa8 commit 12d4b60
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 7 deletions.
2 changes: 1 addition & 1 deletion defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
5 changes: 0 additions & 5 deletions spec/main_spec.rb
Original file line number Diff line number Diff line change
@@ -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' }
Expand Down
2 changes: 1 addition & 1 deletion tasks/nginx-repo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 12d4b60

Please sign in to comment.