Download as
Browse Code »

Commit 673ee9d9df91e602b5dfdaa4fa1224a174b837a4

Authored by Macartur Sousa
1 parent 32cc1fa1
Exists in master and in 90 other branches 3.x, add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup, 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

Removing nginx_gitlab_upstream to fixed master

Showing 2 changed files with 0 additions and 27 deletions   Show diff stats
cookbooks/gitlab/files/nginx.te
View file @32cc1fa
... ... @@ -1,12 +0,0 @@
1   -
2   -module nginx 1.0;
3   -
4   -require {
5   - type httpd_t;
6   - type unreserved_port_t;
7   - class tcp_socket name_connect;
8   -}
9   -
10   -#============= httpd_t ==============
11   -allow httpd_t unreserved_port_t:tcp_socket name_connect;
12   -allow httpd_t http_cache_port_t:tcp_socket name_connect;
cookbooks/gitlab/recipes/default.rb
  Diff comments   View file @673ee9d
... ... @@ -83,7 +83,6 @@ end
83 83 ####################################################
84 84 # SELinux: allow gitlab to use '/tmp'
85 85 ####################################################
86   -
87 86 cookbook_file '/etc/selinux/local/gitlab.te' do
88 87 notifies :run, 'execute[selinux-gitlab]'
89 88 end
... ... @@ -91,17 +90,3 @@ execute 'selinux-gitlab' do
91 90 command 'selinux-install-module /etc/selinux/local/gitlab.te'
92 91 action :nothing
93 92 end
94   -
95   -
96   -####################################################
97   -# SELinux: allow nginx to use gitlab upstream
98   -####################################################
99   -
100   -cookbook_file '/etc/selinux/local/nginx.te' do
101   - notifies :run, 'execute[selinux-nginx]'
102   -end
103   -execute 'selinux-nginx' do
104   - command 'selinux-install-module /etc/selinux/local/nginx.te'
105   - action :nothing
106   -end
107   -
... ...