From d5a2d1171f2272d829d15c20a37ef6efac2e907a Mon Sep 17 00:00:00 2001
From: Antonio Terceiro <terceiro@softwarelivre.org>
Date: Mon, 22 Jun 2015 17:09:33 -0300
Subject: [PATCH] Point to v3 repository instead of individual sub-repositories

---
 cookbooks/basics/files/default/softwarepublico.repo  | 7 +++++++
 cookbooks/basics/recipes/default.rb                  | 6 +++++-
 cookbooks/colab/files/default/colab.repo             | 8 --------
 cookbooks/colab/recipes/default.rb                   | 3 +--
 cookbooks/gitlab/files/default/gitlab.repo           | 8 --------
 cookbooks/gitlab/recipes/default.rb                  | 3 +--
 cookbooks/mailman-api/files/default/mailman-api.repo | 8 --------
 cookbooks/mailman-api/recipes/default.rb             | 3 +--
 cookbooks/mailman/files/centos/mailman.repo          | 8 --------
 cookbooks/mailman/recipes/webui.rb                   | 3 +--
 cookbooks/noosfero/files/default/noosfero.repo       | 8 --------
 cookbooks/noosfero/recipes/default.rb                | 3 +--
 12 files changed, 17 insertions(+), 51 deletions(-)
 create mode 100644 cookbooks/basics/files/default/softwarepublico.repo
 delete mode 100644 cookbooks/colab/files/default/colab.repo
 delete mode 100644 cookbooks/gitlab/files/default/gitlab.repo
 delete mode 100644 cookbooks/mailman-api/files/default/mailman-api.repo
 delete mode 100644 cookbooks/mailman/files/centos/mailman.repo
 delete mode 100644 cookbooks/noosfero/files/default/noosfero.repo

diff --git a/cookbooks/basics/files/default/softwarepublico.repo b/cookbooks/basics/files/default/softwarepublico.repo
new file mode 100644
index 0000000..aeb4001
--- /dev/null
+++ b/cookbooks/basics/files/default/softwarepublico.repo
@@ -0,0 +1,7 @@
+[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 fea0d1b..ddefaf3 100644
--- a/cookbooks/basics/recipes/default.rb
+++ b/cookbooks/basics/recipes/default.rb
@@ -65,12 +65,16 @@ end
 # FIXME on Debian it's postgresql-client
 package 'postgresql'
 
-# key for our custom repositories
+# our custom repositories
 if node['platform'] == 'centos'
   cookbook_file '/etc/yum.repos.d/softwarepublico.key' do
     owner 'root'
     mode 0644
   end
+  cookbook_file '/etc/yum.repos.d/softwarepublico.repo' do
+    owner 'root'
+    mode 0644
+  end
 end
 
 # reload node[:fqdn] to make sure it reflects the contents of /etc/hosts
diff --git a/cookbooks/colab/files/default/colab.repo b/cookbooks/colab/files/default/colab.repo
deleted file mode 100644
index 41cb536..0000000
--- a/cookbooks/colab/files/default/colab.repo
+++ /dev/null
@@ -1,8 +0,0 @@
-[isv_spb_colab]
-name=Colab (CentOS_7)
-type=rpm-md
-#baseurl=http://download.opensuse.org/repositories/isv:/spb:/colab/CentOS_7/
-mirrorlist=https://gitlab.com/softwarepublico/softwarepublico/raw/master/rpm_mirrors/colab
-gpgcheck=1
-gpgkey=file:///etc/yum.repos.d/softwarepublico.key
-enabled=1
diff --git a/cookbooks/colab/recipes/default.rb b/cookbooks/colab/recipes/default.rb
index 4ef5394..b776572 100644
--- a/cookbooks/colab/recipes/default.rb
+++ b/cookbooks/colab/recipes/default.rb
@@ -7,8 +7,7 @@ end
 
 if node['platform'] == 'centos'
   cookbook_file '/etc/yum.repos.d/colab.repo' do
-    owner 'root'
-    mode 0644
+    action :delete
   end
 end
 
diff --git a/cookbooks/gitlab/files/default/gitlab.repo b/cookbooks/gitlab/files/default/gitlab.repo
deleted file mode 100644
index b4ffb15..0000000
--- a/cookbooks/gitlab/files/default/gitlab.repo
+++ /dev/null
@@ -1,8 +0,0 @@
-[isv_spb_gitlab]
-name=Gitlab (CentOS_7)
-type=rpm-md
-#baseurl=http://download.opensuse.org/repositories/isv:/spb:/gitlab/CentOS_7/
-mirrorlist=https://gitlab.com/softwarepublico/softwarepublico/raw/master/rpm_mirrors/gitlab
-gpgcheck=1
-gpgkey=file:///etc/yum.repos.d/softwarepublico.key
-enabled=1
diff --git a/cookbooks/gitlab/recipes/default.rb b/cookbooks/gitlab/recipes/default.rb
index 7a82237..16a157d 100644
--- a/cookbooks/gitlab/recipes/default.rb
+++ b/cookbooks/gitlab/recipes/default.rb
@@ -1,7 +1,6 @@
 if node['platform'] == 'centos'
   cookbook_file '/etc/yum.repos.d/gitlab.repo' do
-    owner 'root'
-    mode 0644
+    action :delete
   end
 end
 
diff --git a/cookbooks/mailman-api/files/default/mailman-api.repo b/cookbooks/mailman-api/files/default/mailman-api.repo
deleted file mode 100644
index 390b325..0000000
--- a/cookbooks/mailman-api/files/default/mailman-api.repo
+++ /dev/null
@@ -1,8 +0,0 @@
-[isv_spb_mailman-api]
-name=mailman-api (CentOS_7)
-type=rpm-md
-#baseurl=http://download.opensuse.org/repositories/isv:/spb:/mailman-api/CentOS_7/
-mirrorlist=https://gitlab.com/softwarepublico/softwarepublico/raw/master/rpm_mirrors/mailman-api
-gpgcheck=1
-gpgkey=file:///etc/yum.repos.d/softwarepublico.key
-enabled=1
diff --git a/cookbooks/mailman-api/recipes/default.rb b/cookbooks/mailman-api/recipes/default.rb
index 74261b9..3393b2f 100644
--- a/cookbooks/mailman-api/recipes/default.rb
+++ b/cookbooks/mailman-api/recipes/default.rb
@@ -1,7 +1,6 @@
 if node['platform'] == 'centos'
   cookbook_file '/etc/yum.repos.d/mailman-api.repo' do
-    owner 'root'
-    mode 0644
+    action :delete
   end
 end
 
diff --git a/cookbooks/mailman/files/centos/mailman.repo b/cookbooks/mailman/files/centos/mailman.repo
deleted file mode 100644
index 2cd8c58..0000000
--- a/cookbooks/mailman/files/centos/mailman.repo
+++ /dev/null
@@ -1,8 +0,0 @@
-[isv_spb_mailman]
-name=mailman (CentOS_7)
-type=rpm-md
-#baseurl=http://download.opensuse.org/repositories/isv:/spb:/mailman/CentOS_7/
-mirrorlist=https://gitlab.com/softwarepublico/softwarepublico/raw/master/rpm_mirrors/mailman
-gpgcheck=1
-gpgkey=file:///etc/yum.repos.d/softwarepublico.key
-enabled=1
diff --git a/cookbooks/mailman/recipes/webui.rb b/cookbooks/mailman/recipes/webui.rb
index 9609fc4..46c044b 100644
--- a/cookbooks/mailman/recipes/webui.rb
+++ b/cookbooks/mailman/recipes/webui.rb
@@ -1,7 +1,6 @@
 if node['platform'] == 'centos'
   cookbook_file '/etc/yum.repos.d/mailman.repo' do
-    owner 'root'
-    mode 0644
+    action :delete
   end
 end
 
diff --git a/cookbooks/noosfero/files/default/noosfero.repo b/cookbooks/noosfero/files/default/noosfero.repo
deleted file mode 100644
index bcf8a78..0000000
--- a/cookbooks/noosfero/files/default/noosfero.repo
+++ /dev/null
@@ -1,8 +0,0 @@
-[isv_spb_noosfero]
-name=Noosfero (CentOS_7)
-type=rpm-md
-#baseurl=http://download.opensuse.org/repositories/isv:/spb:/noosfero/CentOS_7/
-mirrorlist=https://gitlab.com/softwarepublico/softwarepublico/raw/master/rpm_mirrors/noosfero
-gpgcheck=1
-gpgkey=file:///etc/yum.repos.d/softwarepublico.key
-enabled=1
diff --git a/cookbooks/noosfero/recipes/default.rb b/cookbooks/noosfero/recipes/default.rb
index 94a1716..d5fbfda 100644
--- a/cookbooks/noosfero/recipes/default.rb
+++ b/cookbooks/noosfero/recipes/default.rb
@@ -1,7 +1,6 @@
 if node['platform'] == 'centos'
   cookbook_file '/etc/yum.repos.d/noosfero.repo' do
-    owner 'root'
-    mode 0644
+    action :delete
   end
 end
 
--
libgit2 0.21.2