From 968397404b529f8b513715733137d3b8fc8f723e Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Thu, 26 Feb 2015 16:35:30 -0300 Subject: [PATCH] Using EPEL now --- cookbooks/basics/files/default/nginx.repo | 7 ------- cookbooks/basics/recipes/default.rb | 4 ++++ cookbooks/basics/recipes/nginx.rb | 6 ------ 3 files changed, 4 insertions(+), 13 deletions(-) delete mode 100644 cookbooks/basics/files/default/nginx.repo diff --git a/cookbooks/basics/files/default/nginx.repo b/cookbooks/basics/files/default/nginx.repo deleted file mode 100644 index 3c6aa13..0000000 --- a/cookbooks/basics/files/default/nginx.repo +++ /dev/null @@ -1,7 +0,0 @@ -# nginx.repo - -[nginx] -name=nginx repo -baseurl=http://nginx.org/packages/centos/7/$basearch/ -gpgcheck=0 -enabled=1 diff --git a/cookbooks/basics/recipes/default.rb b/cookbooks/basics/recipes/default.rb index 6a67b3c..4b7f5fe 100644 --- a/cookbooks/basics/recipes/default.rb +++ b/cookbooks/basics/recipes/default.rb @@ -3,6 +3,10 @@ package 'bash-completion' package 'rsyslog' package 'tmux' +# enable EPEL repository by default +package 'epel-release' + +# key for our custom repositories if node['platform'] == 'centos' cookbook_file '/etc/yum.repos.d/softwarepublico.key' do owner 'root' diff --git a/cookbooks/basics/recipes/nginx.rb b/cookbooks/basics/recipes/nginx.rb index 0268186..078d1d8 100644 --- a/cookbooks/basics/recipes/nginx.rb +++ b/cookbooks/basics/recipes/nginx.rb @@ -1,9 +1,3 @@ -cookbook_file '/etc/yum.repos.d/nginx.repo' do - owner 'root' - group 'root' - mode 0644 -end - package 'nginx' service 'nginx' do -- libgit2 0.21.2