Commit e2e2833c authored by Luca Cinquini's avatar Luca Cinquini
Browse files

Exposing the SLCS server at /esgf-slcs/

parent f13f03e0

docker-compose.yml

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ services: 
     dbnetwork: {}



  esgf-slcs:

    command: ["-sn", "$ESGF_HOSTNAME", "-ds", "rootAdmin", "-sdn", "slcs", "-sdh", "slcs-postgres", "-sdu", "dbsuper", "-udn", "esgcet", "-udh", "esgf-postgres", "-udu", "dbsuper", "--static-url", "https://$ESGF_HOSTNAME/slcs-static/", "--url-prefix", "slcs", "--use-x-forwarded-host"]

    command: ["-sn", "$ESGF_HOSTNAME", "-ds", "rootAdmin", "-sdn", "slcs", "-sdh", "slcs-postgres", "-sdu", "dbsuper", "-udn", "esgcet", "-udh", "esgf-postgres", "-udu", "dbsuper", "--static-url", "https://$ESGF_HOSTNAME/slcs-static/", "--url-prefix", "esgf-slcs", "--use-x-forwarded-host"]

    container_name: esgf-slcs

    depends_on:

      - slcs-postgres

docker-stack.yml

+1 −1
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ services: 
        constraints: [node.labels.esgf_front_node == true]



  esgf-slcs:

    command: ["-sn", "$ESGF_HOSTNAME", "-ds", "rootAdmin", "-sdn", "slcs", "-sdh", "slcs-postgres", "-sdu", "dbsuper", "-udn", "esgcet", "-udh", "esgf-postgres", "-udu", "dbsuper", "--static-url", "https://$ESGF_HOSTNAME/slcs-static/", "--url-prefix", "slcs", "--use-x-forwarded-host"]

    command: ["-sn", "$ESGF_HOSTNAME", "-ds", "rootAdmin", "-sdn", "slcs", "-sdh", "slcs-postgres", "-sdu", "dbsuper", "-udn", "esgcet", "-udh", "esgf-postgres", "-udu", "dbsuper", "--static-url", "https://$ESGF_HOSTNAME/slcs-static/", "--url-prefix", "esgf-slcs", "--use-x-forwarded-host"]

    depends_on:

      - slcs-postgres

      - slcs-nginx

esgf_config/httpd/conf/esgf-httpd.conf

+2 −2
Original line number Diff line number Diff line
@@ -100,8 +100,8 @@ WSGISocketPrefix run/wsgi 
  # ProxyPassReverse /las   ajp://localhost:8009/las

  

  # proxy requests for slcs resources

  ProxyPass /slcs http://esgf-slcs:5000 timeout=600

  ProxyPassReverse /slcs http://esgf-slcs:5000 timeout=600

  ProxyPass /esgf-slcs http://esgf-slcs:5000 timeout=600

  ProxyPassReverse /esgf-slcs http://esgf-slcs:5000 timeout=600

  ProxyPass /slcs-static http://slcs-nginx timeout=600

  ProxyPassReverse /slcs-static http://slcs-nginx timeout=600

slcs/docker-entrypoint.py

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ def replace_in_file(file_path, replacements): 


def wait_for_db(db_host, db_port):

    attempts = 20

    sleep = 0.25

    sleep = 1.0

    s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)

    while True:

        try: