From 673ee9d9df91e602b5dfdaa4fa1224a174b837a4 Mon Sep 17 00:00:00 2001 From: Macartur Sousa Date: Thu, 16 Apr 2015 20:32:55 -0300 Subject: [PATCH] Removing nginx_gitlab_upstream to fixed master --- cookbooks/gitlab/files/nginx.te | 12 ------------ cookbooks/gitlab/recipes/default.rb | 15 --------------- 2 files changed, 0 insertions(+), 27 deletions(-) delete mode 100644 cookbooks/gitlab/files/nginx.te diff --git a/cookbooks/gitlab/files/nginx.te b/cookbooks/gitlab/files/nginx.te deleted file mode 100644 index d17e1af..0000000 --- a/cookbooks/gitlab/files/nginx.te +++ /dev/null @@ -1,12 +0,0 @@ - -module nginx 1.0; - -require { - type httpd_t; - type unreserved_port_t; - class tcp_socket name_connect; -} - -#============= httpd_t ============== -allow httpd_t unreserved_port_t:tcp_socket name_connect; -allow httpd_t http_cache_port_t:tcp_socket name_connect; diff --git a/cookbooks/gitlab/recipes/default.rb b/cookbooks/gitlab/recipes/default.rb index 065124b..bc0cc4a 100644 --- a/cookbooks/gitlab/recipes/default.rb +++ b/cookbooks/gitlab/recipes/default.rb @@ -83,7 +83,6 @@ end #################################################### # SELinux: allow gitlab to use '/tmp' #################################################### - cookbook_file '/etc/selinux/local/gitlab.te' do notifies :run, 'execute[selinux-gitlab]' end @@ -91,17 +90,3 @@ execute 'selinux-gitlab' do command 'selinux-install-module /etc/selinux/local/gitlab.te' action :nothing end - - -#################################################### -# SELinux: allow nginx to use gitlab upstream -#################################################### - -cookbook_file '/etc/selinux/local/nginx.te' do - notifies :run, 'execute[selinux-nginx]' -end -execute 'selinux-nginx' do - command 'selinux-install-module /etc/selinux/local/nginx.te' - action :nothing -end - -- libgit2 0.21.2