Skip to content
This repository has been archived by the owner on Nov 12, 2024. It is now read-only.

Configurable nginx proxy prefix #50

Merged
merged 6 commits into from
Feb 4, 2016

Conversation

mvdbeek
Copy link
Member

@mvdbeek mvdbeek commented Feb 3, 2016

No description provided.

@@ -78,6 +78,8 @@ startup_chown_on_directory: ""
nginx_conf_path: /etc/nginx/nginx.conf
nginx_conf_directory: /etc/nginx/conf.d
nginx_upload_store_path: "/tmp/nginx_upload_store"
# Set nginx_proxy_prefix to "/galaxy", if galaxy should be served at subdirectory (e.g. example.com/galaxy)
nginx_proxy_prefix: ""
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we take a finer pass at this - I'm thinking the default options file should look like:

nginx_prefix_location: ""
nginx_galaxy_location: "{{ nginx_prefix_location }}"
nginx_reports_location: "{{ nginx_prefix_location }}/reports"
nginx_planemo_web_location: "{{ nginx_prefix_location }}/planemo"
nginx_ide_location: "{{ nginx_prefix_location }}/ide"

And the rest of the PR should be updated accordingly. Then if you wanted to serve Galaxy on a prefix you'd probably just set:

nginx_galaxy_location: /galaxy

No reason to further prefix all the other apps. Reports etc... would still be "prefixed" at /reports, /ide, and /planemo.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good idea. sure, will do.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome, thanks so much. This was on my TODO list (galaxyproject/planemo-machine#53) so I'm looking forward to this - thanks for doing my job for me 😄.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great minds think alike 😆
You'll still have to let the apps know that they run under a prefix though ;).

@mvdbeek mvdbeek changed the title Configurable nginx proxy prefix WIP: Configurable nginx proxy prefix Feb 3, 2016
@mvdbeek mvdbeek changed the title WIP: Configurable nginx proxy prefix Configurable nginx proxy prefix Feb 4, 2016
@mvdbeek
Copy link
Member Author

mvdbeek commented Feb 4, 2016

Okay, I tested this also with @bgruening's image, if you run the playbook with --extra-vars "nginx_galaxy_location=/galaxy" and you change the galaxy.ini accordingly you get galaxy served at /galaxy. If you don't, nothing has changed.

@bgruening
Copy link
Member

Awesome! Thanks!

bgruening added a commit that referenced this pull request Feb 4, 2016
Configurable nginx proxy prefix
@bgruening bgruening merged commit 7730cdb into galaxyproject:master Feb 4, 2016
@mvdbeek
Copy link
Member Author

mvdbeek commented Feb 4, 2016

Thanks for merging @bgruening.

@mvdbeek mvdbeek deleted the nginx-proxy-prefix branch March 1, 2016 15:31
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants