Download as
Browse Code »

Commit d5a2d1171f2272d829d15c20a37ef6efac2e907a

Authored by Antonio Terceiro
1 parent 18d71e71
Exists in master and in 89 other branches 3.x, add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup_not_prod, cdtc_configuration, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev-lappis, dev_env_minimal, disable_email_dev, docs, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, performance, prezento, r3, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_backup_emails, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, stable-devel, support_docs, syslog, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

Point to v3 repository instead of individual sub-repositories 

Closes #39
Showing 12 changed files with 17 additions and 51 deletions   Show diff stats
cookbooks/basics/files/default/softwarepublico.repo 0 → 100644
  Diff comments   View file @d5a2d11
... ... @@ -0,0 +1,7 @@
  1 +[isv_spb_spb]
  2 +name=Software Publico Brasileiro (CentOS_7)
  3 +type=rpm-md
  4 +baseurl=http://download.opensuse.org/repositories/isv:/spb:/v3/CentOS_7/
  5 +gpgcheck=1
  6 +gpgkey=file:///etc/yum.repos.d/softwarepublico.key
  7 +enabled=1
... ...
cookbooks/basics/recipes/default.rb
  Diff comments   View file @d5a2d11
... ... @@ -65,12 +65,16 @@ end
65 65 # FIXME on Debian it's postgresql-client
66 66 package 'postgresql'
67 67  
68   -# key for our custom repositories
  68 +# our custom repositories
69 69 if node['platform'] == 'centos'
70 70 cookbook_file '/etc/yum.repos.d/softwarepublico.key' do
71 71 owner 'root'
72 72 mode 0644
73 73 end
  74 + cookbook_file '/etc/yum.repos.d/softwarepublico.repo' do
  75 + owner 'root'
  76 + mode 0644
  77 + end
74 78 end
75 79  
76 80 # reload node[:fqdn] to make sure it reflects the contents of /etc/hosts
... ...
cookbooks/colab/files/default/colab.repo
View file @18d71e7
... ... @@ -1,8 +0,0 @@
1   -[isv_spb_colab]
2   -name=Colab (CentOS_7)
3   -type=rpm-md
4   -#baseurl=http://download.opensuse.org/repositories/isv:/spb:/colab/CentOS_7/
5   -mirrorlist=https://gitlab.com/softwarepublico/softwarepublico/raw/master/rpm_mirrors/colab
6   -gpgcheck=1
7   -gpgkey=file:///etc/yum.repos.d/softwarepublico.key
8   -enabled=1
cookbooks/colab/recipes/default.rb
  Diff comments   View file @d5a2d11
... ... @@ -7,8 +7,7 @@ end
7 7  
8 8 if node['platform'] == 'centos'
9 9 cookbook_file '/etc/yum.repos.d/colab.repo' do
10   - owner 'root'
11   - mode 0644
  10 + action :delete
12 11 end
13 12 end
14 13  
... ...
cookbooks/gitlab/files/default/gitlab.repo
View file @18d71e7
... ... @@ -1,8 +0,0 @@
1   -[isv_spb_gitlab]
2   -name=Gitlab (CentOS_7)
3   -type=rpm-md
4   -#baseurl=http://download.opensuse.org/repositories/isv:/spb:/gitlab/CentOS_7/
5   -mirrorlist=https://gitlab.com/softwarepublico/softwarepublico/raw/master/rpm_mirrors/gitlab
6   -gpgcheck=1
7   -gpgkey=file:///etc/yum.repos.d/softwarepublico.key
8   -enabled=1
cookbooks/gitlab/recipes/default.rb
  Diff comments   View file @d5a2d11
1 1 if node['platform'] == 'centos'
2 2 cookbook_file '/etc/yum.repos.d/gitlab.repo' do
3   - owner 'root'
4   - mode 0644
  3 + action :delete
5 4 end
6 5 end
7 6  
... ...
cookbooks/mailman-api/files/default/mailman-api.repo
View file @18d71e7
... ... @@ -1,8 +0,0 @@
1   -[isv_spb_mailman-api]
2   -name=mailman-api (CentOS_7)
3   -type=rpm-md
4   -#baseurl=http://download.opensuse.org/repositories/isv:/spb:/mailman-api/CentOS_7/
5   -mirrorlist=https://gitlab.com/softwarepublico/softwarepublico/raw/master/rpm_mirrors/mailman-api
6   -gpgcheck=1
7   -gpgkey=file:///etc/yum.repos.d/softwarepublico.key
8   -enabled=1
cookbooks/mailman-api/recipes/default.rb
  Diff comments   View file @d5a2d11
1 1 if node['platform'] == 'centos'
2 2 cookbook_file '/etc/yum.repos.d/mailman-api.repo' do
3   - owner 'root'
4   - mode 0644
  3 + action :delete
5 4 end
6 5 end
7 6  
... ...
cookbooks/mailman/files/centos/mailman.repo
View file @18d71e7
... ... @@ -1,8 +0,0 @@
1   -[isv_spb_mailman]
2   -name=mailman (CentOS_7)
3   -type=rpm-md
4   -#baseurl=http://download.opensuse.org/repositories/isv:/spb:/mailman/CentOS_7/
5   -mirrorlist=https://gitlab.com/softwarepublico/softwarepublico/raw/master/rpm_mirrors/mailman
6   -gpgcheck=1
7   -gpgkey=file:///etc/yum.repos.d/softwarepublico.key
8   -enabled=1
cookbooks/mailman/recipes/webui.rb
  Diff comments   View file @d5a2d11
1 1 if node['platform'] == 'centos'
2 2 cookbook_file '/etc/yum.repos.d/mailman.repo' do
3   - owner 'root'
4   - mode 0644
  3 + action :delete
5 4 end
6 5 end
7 6  
... ...
cookbooks/noosfero/files/default/noosfero.repo
View file @18d71e7
... ... @@ -1,8 +0,0 @@
1   -[isv_spb_noosfero]
2   -name=Noosfero (CentOS_7)
3   -type=rpm-md
4   -#baseurl=http://download.opensuse.org/repositories/isv:/spb:/noosfero/CentOS_7/
5   -mirrorlist=https://gitlab.com/softwarepublico/softwarepublico/raw/master/rpm_mirrors/noosfero
6   -gpgcheck=1
7   -gpgkey=file:///etc/yum.repos.d/softwarepublico.key
8   -enabled=1
cookbooks/noosfero/recipes/default.rb
  Diff comments   View file @d5a2d11
1 1 if node['platform'] == 'centos'
2 2 cookbook_file '/etc/yum.repos.d/noosfero.repo' do
3   - owner 'root'
4   - mode 0644
  3 + action :delete
5 4 end
6 5 end
7 6  
... ...