nginx: use upstream ubuntu package (#1546)
Ubuntu 16.04 LTS has a newer version than what we compile.
This commit is contained in:
parent
a33a70a419
commit
d599406140
4 changed files with 6 additions and 9 deletions
|
@ -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;
|
||||
|
|
|
@ -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'
|
||||
|
|
Reference in a new issue