Commit a4dd174c authored Jul 06, 2017 by Frank Greguska

chanded the proxy rule so /slcs now forwards to the certificate server and...

chanded the proxy rule so /slcs now forwards to the certificate server and /slcs-static forwards to the static content hosted on nginx

parent a3b09811

esgf_config/httpd/conf/esgf-httpd.conf

+4 −4

Original line number	Diff line number	Diff line
		@@ -92,10 +92,10 @@ WSGISocketPrefix run/wsgi
		# ProxyPassReverse /las ajp://localhost:8009/las

		# proxy requests for slcs resources
		ProxyPass /slcs-admin http://slcs-server:5000 timeout=600
		ProxyPassReverse /slcs-admin http://slcs-server:5000 timeout=600
		ProxyPass /slcs http://slcs-nginx timeout=600
		ProxyPassReverse /slcs http://slcs-nginx timeout=600
		ProxyPass /slcs http://slcs-server:5000 timeout=600
		ProxyPassReverse /slcs http://slcs-server:5000 timeout=600
		ProxyPass /slcs-static http://slcs-nginx timeout=600
		ProxyPassReverse /slcs-static http://slcs-nginx timeout=600

		# note: WSGIPythonEggs must match location created by Dockerfile
		WSGIDaemonProcess cog-site python-path=/usr/local/cog/venv/lib/python2.7/site-packages:/usr/local/cog/cog-install python-eggs=/var/www/.python-eggs user=apache group=apache threads=25

slcs-server/docker-compose.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@ networks:

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