1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/4dff4b08ca02/ Changeset: 4dff4b08ca02 User: jmchilton Date: 2014-10-24 19:16:01+00:00 Summary: Merged in erasche2/galaxy-central (pull request #541) Enable configuration of dynamic external proxy Affected #: 3 files diff -r 8915d81958a3778fe538dd8cedd69dd209948189 -r 4dff4b08ca0280f1f049b13ab1694ae959385f79 config/galaxy.ini.sample --- a/config/galaxy.ini.sample +++ b/config/galaxy.ini.sample @@ -548,6 +548,9 @@ # Enable verbose debugging of Galaxy-managed dynamic proxy. #dynamic_proxy_debug=False +# The dynamic proxy is proxied by an external proxy (e.g. apache frontend to nodejs to wrap connections in SSL) +#dynamic_proxy_external_proxy=False + # -- Logging and Debugging # Verbosity of console log messages. Acceptable values can be found here: diff -r 8915d81958a3778fe538dd8cedd69dd209948189 -r 4dff4b08ca0280f1f049b13ab1694ae959385f79 lib/galaxy/config.py --- a/lib/galaxy/config.py +++ b/lib/galaxy/config.py @@ -388,6 +388,7 @@ self.dynamic_proxy_debug = string_as_bool( kwargs.get( "dynamic_proxy_debug", "False" ) ) self.dynamic_proxy_bind_port = int( kwargs.get( "dynamic_proxy_bind_port", "8800" ) ) self.dynamic_proxy_bind_ip = kwargs.get( "dynamic_proxy_bind_ip", "0.0.0.0" ) + self.dynamic_proxy_external_proxy = string_as_bool( kwargs.get( "dynamic_proxy_external_proxy", "False" ) ) # Default chunk size for chunkable datatypes -- 64k self.display_chunk_size = int( kwargs.get( 'display_chunk_size', 65536) ) diff -r 8915d81958a3778fe538dd8cedd69dd209948189 -r 4dff4b08ca0280f1f049b13ab1694ae959385f79 lib/galaxy/web/proxy/__init__.py --- a/lib/galaxy/web/proxy/__init__.py +++ b/lib/galaxy/web/proxy/__init__.py @@ -17,7 +17,7 @@ class ProxyManager(object): def __init__( self, config ): - for option in [ "manage_dynamic_proxy", "dynamic_proxy_bind_port", "dynamic_proxy_bind_ip", "dynamic_proxy_debug" ]: + for option in [ "manage_dynamic_proxy", "dynamic_proxy_bind_port", "dynamic_proxy_bind_ip", "dynamic_proxy_debug", "dynamic_proxy_external_proxy" ]: setattr( self, option, getattr( config, option ) ) self.launch_by = "node" # TODO: Support docker if self.manage_dynamic_proxy: @@ -43,7 +43,10 @@ if ':' in host: host = host[0:host.index(':')] scheme = trans.request.scheme - proxy_url = '%s://%s:%d' % (scheme, host, self.dynamic_proxy_bind_port) + if not self.dynamic_proxy_external_proxy: + proxy_url = '%s://%s:%d' % (scheme, host, self.dynamic_proxy_bind_port) + else: + proxy_url = '%s://%s' % (scheme, host) return { 'proxy_url': proxy_url, 'proxied_port': proxy_requests.port, Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.