Using EPEL now

Antonio Terceiro
1 parent f753f25d
Showing 3 changed files with 4 additions and 13 deletions Show diff stats
cookbooks/basics/files/default/nginx.repo
cookbooks/basics/recipes/default.rb
cookbooks/basics/recipes/nginx.rb
@@ -1,7 +0,0 @@
-# nginx.repo
-
-[nginx]
-name=nginx repo
-baseurl=http://nginx.org/packages/centos/7/$basearch/
-gpgcheck=0
-enabled=1
@@ -3,6 +3,10 @@ package &#39;bash-completion&#39;
 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'
-cookbook_file '/etc/yum.repos.d/nginx.repo' do
-  owner 'root'
-  group 'root'
-  mode  0644
-end
-
 package 'nginx'
  
 service 'nginx' do
...	...	@@ -1,7 +0,0 @@
1		-# nginx.repo
2		-
3		-[nginx]
4		-name=nginx repo
5		-baseurl=http://nginx.org/packages/centos/7/$basearch/
6		-gpgcheck=0
7		-enabled=1
...	...	@@ -3,6 +3,10 @@ package 'bash-completion'
3	3	package 'rsyslog'
4	4	package 'tmux'
5	5
	6	+# enable EPEL repository by default
	7	+package 'epel-release'
	8	+
	9	+# key for our custom repositories
6	10	if node['platform'] == 'centos'
7	11	cookbook_file '/etc/yum.repos.d/softwarepublico.key' do
8	12	owner 'root'
...	...
1		-cookbook_file '/etc/yum.repos.d/nginx.repo' do
2		- owner 'root'
3		- group 'root'
4		- mode 0644
5		-end
6		-
7	1	package 'nginx'
8	2
9	3	service 'nginx' do
...	...