This repository has been archived by the owner on Feb 16, 2018. It is now read-only.
Add TENT_SUBDIR option to run under a subdirectory #33
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| auth_url += '/admin/oauth/confirm' | ||
| auth_url += "?#{env['QUERY_STRING']}" | ||
| [301, { "Location" => auth_url }, []] } | ||
| end | ||
|
|
||
| map '/admin' do | ||
| map ((ENV['TENT_SUBDIR'] || '') + '/admin') do |
There was a problem hiding this comment.
You shouldn't need the outer parens on these statements.
|
OK, took out the debugging statements and the unneeded parens... looking good? |
|
👍 Can you squash these commits? |
With this environment variable set (example: TENT_SUBDIR=/tent), all of TentD, TentD-Admin, OAuth, etc. will use a path under that subdirectory (in the example above, the profile will be at /tent/profile, the admin interface will be at /tent/admin, and so on). I have tested this and the admin interface, OAuth login, and regular Tent use all work without issues.
|
Squashed. |
titanous
added a commit
that referenced
this pull request
Jan 1, 2013
Add TENT_SUBDIR option to run under a subdirectory
Closes #31
|
Merged, thanks! |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
With this environment variable set (example: TENT_SUBDIR=/tent), all of TentD, TentD-Admin, OAuth, etc. will use a path under that subdirectory (in the example above, the profile will be at /tent/profile, the admin interface will be at /tent/admin, and so on).
I have tested this and the admin interface, OAuth login, and regular Tent use all work without issues.
If accepted, this should resolve issue tent/tentd-admin#31.
This also removes the TENT_SERVER environment variable, which did not work for me.