Correciones

This commit is contained in:
mulonemartin 2015-07-08 10:29:26 -03:00
parent 3135c02dcc
commit f812fa45ed
2 changed files with 13 additions and 2 deletions

View file

@ -1,6 +1,17 @@
FROM nginx:1.9.0
MAINTAINER Jason Wilder jwilder@litl.com
# Set timezone
# The city selections might seem arbitrary, but they incorporate daylight savings
# time automatically based on time zone and are better then manually picking
# using the 'Etc/GMT+0' files.
ENV DEBIAN_FRONTEND noninteractive
ENV TIMEZONE America/Argentina/Buenos_Aires
RUN echo $TIMEZONE > /etc/timezone &&\
cp /usr/share/zoneinfo/${TIMEZONE} /etc/localtime &&\
dpkg-reconfigure tzdata
RUN env --unset=DEBIAN_FRONTEND
# Install wget and install/updates certificates
RUN apt-get update \
&& apt-get install -y -q --no-install-recommends \

View file

@ -113,8 +113,8 @@ server {
{{ end }}
location / {
proxy_pass {{ $proto }}://{{ $host }};
proxy_redirect {{ $proto }}://{{ $host }}/ /;
proxy_pass http://{{ $host }};
proxy_redirect http://{{ $host }}/ /;
proxy_read_timeout 60s;
{{ if (exists (printf "/etc/nginx/htpasswd/%s" $host)) }}