diff --git a/config/homologa/config.yaml b/config/homologa/config.yaml index 1628d5e..f0a04a0 100644 --- a/config/homologa/config.yaml +++ b/config/homologa/config.yaml @@ -1,3 +1,4 @@ +rpm_repository: http://download.opensuse.org/repositories/isv:/spb:/stable/CentOS_7/ admins: - ["Nayanne Araújo", "nayanne.bonifacio@planejamento.gov.br"] - ["Marisa Souza dos Santos", "marisa.santos@planejamento.gov.br"] diff --git a/config/prod/config.yaml b/config/prod/config.yaml index 5eb2ee9..4cc4049 100644 --- a/config/prod/config.yaml +++ b/config/prod/config.yaml @@ -1,3 +1,4 @@ +rpm_repository: http://download.opensuse.org/repositories/isv:/spb:/stable/CentOS_7/ admins: - ["Nayanne Araújo", "nayanne.bonifacio@planejamento.gov.br"] - ["Marisa Souza dos Santos", "marisa.santos@planejamento.gov.br"] diff --git a/cookbooks/basics/files/default/softwarepublico.repo b/cookbooks/basics/files/default/softwarepublico.repo deleted file mode 100644 index aeb4001..0000000 --- a/cookbooks/basics/files/default/softwarepublico.repo +++ /dev/null @@ -1,7 +0,0 @@ -[isv_spb_spb] -name=Software Publico Brasileiro (CentOS_7) -type=rpm-md -baseurl=http://download.opensuse.org/repositories/isv:/spb:/v3/CentOS_7/ -gpgcheck=1 -gpgkey=file:///etc/yum.repos.d/softwarepublico.key -enabled=1 diff --git a/cookbooks/basics/recipes/default.rb b/cookbooks/basics/recipes/default.rb index c3f9232..de735ba 100644 --- a/cookbooks/basics/recipes/default.rb +++ b/cookbooks/basics/recipes/default.rb @@ -71,7 +71,7 @@ if node['platform'] == 'centos' owner 'root' mode 0644 end - cookbook_file '/etc/yum.repos.d/softwarepublico.repo' do + template '/etc/yum.repos.d/softwarepublico.repo' do owner 'root' mode 0644 end diff --git a/cookbooks/basics/templates/default/softwarepublico.repo.erb b/cookbooks/basics/templates/default/softwarepublico.repo.erb new file mode 100644 index 0000000..a87df1d --- /dev/null +++ b/cookbooks/basics/templates/default/softwarepublico.repo.erb @@ -0,0 +1,7 @@ +[isv_spb_spb] +name=Software Publico Brasileiro (CentOS_7) +type=rpm-md +baseurl=<%= node['config']['rpm_repository'] || 'http://download.opensuse.org/repositories/isv:/spb:/devel/CentOS_7/' %> +gpgcheck=1 +gpgkey=file:///etc/yum.repos.d/softwarepublico.key +enabled=1 -- libgit2 0.21.2