vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

nginx: use upstream ubuntu package (#1546)

Browse source 
Ubuntu 16.04 LTS has a newer version than what we compile.
This commit is contained in:
Jimmy Zelinskie 2016-06-16 13:51:04 -04:00 • committed by GitHub
parent a33a70a419
commit d599406140
4 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
conf/http-base.conf
View file

@ -9,7 +9,7 @@ log_format lb_pp '$remote_addr ($proxy_protocol_addr) '
'($request_time $request_length $upstream_response_time)';
types_hash_max_size 2048;
include /usr/local/nginx/conf/mime.types.default;
include /etc/nginx/mime.types;
default_type application/octet-stream;
access_log /dev/stdout;

6
conf/init/service/nginx/run
View file

@ -5,10 +5,10 @@ echo 'Starting nginx'
if [ -f /conf/stack/ssl.key ]
then
echo "Using HTTPS"
/usr/local/nginx/sbin/nginx -c /conf/nginx.conf
/usr/sbin/nginx -c /conf/nginx.conf
else
echo "No SSL key provided, using HTTP"
/usr/local/nginx/sbin/nginx -c /conf/nginx-nossl.conf
/usr/sbin/nginx -c /conf/nginx-nossl.conf
fi
echo 'Nginx exited'
echo 'Nginx exited'