Removing nginx_gitlab_upstream to fixed master

Macartur Sousa
1 parent 32cc1fa1
Showing 2 changed files with 0 additions and 27 deletions Show diff stats
cookbooks/gitlab/files/nginx.te
cookbooks/gitlab/recipes/default.rb
@@ -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;
@@ -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 &#39;selinux-gitlab&#39; 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
-
	@@ -1,12 +0,0 @@	@@ -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;
	@@ -83,7 +83,6 @@ end		@@ -83,7 +83,6 @@ end
83	####################################################	83	####################################################
84	# SELinux: allow gitlab to use '/tmp'	84	# SELinux: allow gitlab to use '/tmp'
85	####################################################	85	####################################################
86	-
87	cookbook_file '/etc/selinux/local/gitlab.te' do	86	cookbook_file '/etc/selinux/local/gitlab.te' do
88	notifies :run, 'execute[selinux-gitlab]'	87	notifies :run, 'execute[selinux-gitlab]'
89	end	88	end
	@@ -91,17 +90,3 @@ execute 'selinux-gitlab' do		@@ -91,17 +90,3 @@ execute 'selinux-gitlab' do
91	command 'selinux-install-module /etc/selinux/local/gitlab.te'	90	command 'selinux-install-module /etc/selinux/local/gitlab.te'
92	action :nothing	91	action :nothing
93	end	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	-