Unverified Commit f6291bce authored by watucker's avatar watucker Committed by GitHub
Browse files

Merge pull request #213 from ESGF/ansible-ssl-redirect 

Ansible ssl redirect
parents ae86f6bc 9ba5c52f

deploy/ansible/host_vars/esgf.data.example.org

+0 −2
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ 


#nginx_config_template: ssl.proxy.conf.j2



#published_port: 443



#ssl_certificate: |

#  -----BEGIN CERTIFICATE-----

#  ...

deploy/ansible/host_vars/esgf.index.example.org

+0 −2
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ 


#nginx_config_template: ssl.proxy.conf.j2



#published_port: 443



#ssl_certificate: |

#  -----BEGIN CERTIFICATE-----

#  ...

deploy/ansible/roles/proxy/defaults/main.yml

+2 −1
Original line number Diff line number Diff line
@@ -28,7 +28,8 @@ image_pull: true 


# Default Nginx config using only HTTP

nginx_config_template: proxy.conf.j2

published_port: 80

published_port_http: 80

published_port_https: 443



# Generates a Diffie-Helmet file for the server if enabled

generate_dhparam: false

deploy/ansible/roles/proxy/tasks/main.yml

+3 −1
Original line number Diff line number Diff line
@@ -64,8 +64,10 @@ 
    restart_policy: unless-stopped

    exposed_ports:

      - "8080"

      - "8443"

    published_ports:

      - "{{ published_port }}:8080"

      - "{{ published_port_http }}:8080"

      - "{{ published_port_https }}:8443"

    networks:

      - name: esgf

    networks_cli_compatible: yes

deploy/ansible/roles/proxy/templates/ssl.proxy.conf.j2

+7 −1
Original line number Diff line number Diff line 
# HTTP and HTTPS server blocks that proxy to the other containers running on this host

server {

    listen 8080 default_server;

    server_name _;



    return 301 https://$host$request_uri;

}



server {

    listen 8080 ssl http2 default_server;

    listen 8443 ssl http2 default_server;

    server_name  _;



    # Use the Docker embedded DNS server to allow us to resolve container names