Merge branch 'develop' of bitbucket.org:jsadvance20201/nginx into develop
This commit is contained in:
		
						commit
						af5bc1b818
					
				
							
								
								
									
										4
									
								
								80.conf
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								80.conf
									
									
									
									
									
								
							| @ -32,7 +32,7 @@ server { | |||||||
|     listen 80; |     listen 80; | ||||||
|     server_name b1.inno-ijl.ru; |     server_name b1.inno-ijl.ru; | ||||||
| 
 | 
 | ||||||
|     include "parts/api-multystub.conf" |     include "parts/api-multystub.conf"; | ||||||
| 
 | 
 | ||||||
|     location / { |     location / { | ||||||
|         add_header 'Access-Control-Allow-Origin' '*'; |         add_header 'Access-Control-Allow-Origin' '*'; | ||||||
| @ -92,4 +92,4 @@ server { | |||||||
| #     index index.html; | #     index index.html; | ||||||
| #     server_name alinakhaff.inno-ijl.ru; | #     server_name alinakhaff.inno-ijl.ru; | ||||||
| #     root /home/ijl/ijl/apps/alinakhaff; | #     root /home/ijl/ijl/apps/alinakhaff; | ||||||
| # } | # } | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user