Commit 09eff162 authored by William Tucker's avatar William Tucker
Browse files

Config and doc changes

parent 0a421f9c

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/templates/ssl.proxy.conf.j2

+1 −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;

    listen 8080 default_server;

    server_name _;



    return 301 https://$host$request_uri;

docs/deploy-ansible.md

+0 −2
Original line number Diff line number Diff line
@@ -336,12 +336,10 @@ And the following should return a JSON response: 
## Enabling SSL



To use SSL, you will need to swap the Nginx template used to configure the proxy container.

For an SSL enabled server, it's recommended to specify "443" as the `published_port`.

In your host_vars file for your server, add the following:



```yaml

nginx_config_template: ssl.proxy.conf.j2

published_port: 443

```



This proxy configuration will not work by itself, since it requires an SSL certificate and key.