Merge pull request #137 from jzelinskie/nginx
nginx: recompile with SSL module, move directives
This commit is contained in:
		
						commit
						98cfa44613
					
				
					 4 changed files with 11 additions and 11 deletions
				
			
		
										
											Binary file not shown.
										
									
								
							|  | @ -1,5 +1,12 @@ | |||
| # vim: ft=nginx | ||||
| 
 | ||||
| set_real_ip_from 0.0.0.0/0; | ||||
| real_ip_recursive on; | ||||
| log_format lb_pp '$remote_addr ($proxy_protocol_addr) ' | ||||
|                   '- $remote_user [$time_local] ' | ||||
|                   '"$request" $status $body_bytes_sent ' | ||||
|                   '"$http_referer" "$http_user_agent"' | ||||
| 
 | ||||
| types_hash_max_size 2048; | ||||
| include /usr/local/nginx/conf/mime.types.default; | ||||
| 
 | ||||
|  |  | |||
|  | @ -26,18 +26,19 @@ http { | |||
| 
 | ||||
|         # This header must be set only for HTTPS | ||||
|         add_header Strict-Transport-Security "max-age=63072000; preload"; | ||||
| 
 | ||||
|     } | ||||
| 
 | ||||
|     server { | ||||
|         include proxy-protocol.conf; | ||||
|         include server-base.conf; | ||||
| 
 | ||||
|         listen 8443 default proxy_protocol; | ||||
| 
 | ||||
|         ssl on; | ||||
| 
 | ||||
|         # This header must be set only for HTTPS | ||||
|         add_header Strict-Transport-Security "max-age=63072000; preload"; | ||||
| 
 | ||||
|         real_ip_header proxy_protocol; | ||||
| 
 | ||||
|         access_log /dev/stdout lb_pp; | ||||
|     } | ||||
| } | ||||
|  |  | |||
|  | @ -1,8 +0,0 @@ | |||
| # vim: ft=nginx | ||||
| 
 | ||||
| set_real_ip_from 0.0.0.0/0; | ||||
| real_ip_header proxy_protocol; | ||||
| log_format elb_pp '$proxy_protocol_addr - $remote_user [$time_local] ' | ||||
|                   '"$request" $status $body_bytes_sent ' | ||||
|                   '"$http_referer" "$http_user_agent"'; | ||||
| access_log /dev/stdout elb_pp; | ||||
		Reference in a new issue