-
Notifications
You must be signed in to change notification settings - Fork 7
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Migrate oauth to GitHub app #155
Merged
Merged
Changes from 62 commits
Commits
Show all changes
63 commits
Select commit
Hold shift + click to select a range
c62dc97
New env vars and private files for GitHub apps.
jimallman c14ccf8
Populate the installation IDs for GitHub apps
jimallman e7e490d
comment out failing steps
snacktavish 77b01f9
lots of interactive steps too
snacktavish 9b13491
big web2py jump
snacktavish d29c635
Fix number of expected args
jimallman c49a19c
TMP change to user
snacktavish 2c0776a
web2py updates
snacktavish 7e40aaa
or exit everywhere
mtholder 10debd6
noweb2py in apache config
snacktavish 590f573
no web2py common, change echo to log
snacktavish 5404378
some controller updates
mtholder a74348e
No push
snacktavish 1abdbe6
Merge branch 'phylesystemapi' of github.com:OpenTreeOfLife/germinator…
snacktavish a7c181b
forwarding hack for machine running otcetera
snacktavish a14def4
Merge branch 'phylesystemapi' into otcetera-conf
snacktavish 90b2feb
unify changes
snacktavish 494d974
no java
snacktavish 3398452
current on ot54
snacktavish 4436074
new certs, web2pyversion
snacktavish 61596ba
devtree
snacktavish cf8cd65
hardcoded user change to opentree
snacktavish 9759397
fix caching
snacktavish 6d77bd0
Add a minimal parametric router w/ default app
jimallman 1572412
Merge branch 'easter-fix' of github.com:OpenTreeOfLife/germinator int…
jimallman 975cf24
Add minimal router for phylesystem-api
jimallman ea8521e
Adding diagnostic pwd for web2py install scripts.
jimallman 541b71e
Fix pwd output in install scripts
jimallman 6f7b985
Don't extract the synth tree each time.
bredelings b542d60
update apache conf
snacktavish 990ffa7
don't rewrite confs
snacktavish eca0536
no caching for now
snacktavish 84ca86c
Merge branch 'easter-fix' of github.com:OpenTreeOfLife/germinator int…
snacktavish 7d72ef2
fix restart apache typo
snacktavish 906a35e
Add switches for web2py and apache config
jimallman 6ac47b4
Revert "don't rewrite confs"
jimallman 51ef19d
Replace hard-coded ot51 with PHYLAPI_BASE_URL
jimallman 92f5353
Back up existing config files at start of push
jimallman c57264e
Add do-nothing builtin for valid bash script
jimallman c9272a9
Fix bash errors in restart-apache.sh
jimallman 8136aab
Replace shortcut '~' with /home/admin
jimallman 84e2d53
Restore test of local path to private key files
jimallman fcdc828
Merge branch 'master' into easter-fix
jimallman 1b52641
Restore wget commands to files.opentreeoflife.org
jimallman 600a7f6
Removing unused apache config (shared forwards)
jimallman 3467b8b
Revert "No push"
jimallman 2dad12b
Restore URLs for cached content (fingers crossed!)
jimallman 238b973
Merge pull request #154 from OpenTreeOfLife/easter-fix
jimallman 0d05429
Fix bad error message
jimallman d41940d
Move web2py patches into germinator repo
jimallman 65ce583
Commit vanilla version from web2py 2.19.1
jimallman ab3b29d
Revive old hot fix to always add CORS headers
jimallman 57dc7bb
Update source path of web2py patch(es)
jimallman 0931f2f
Patch existing web2py as well as new installations
jimallman 1f40554
Add confirmation message for web2py patches
jimallman 9363857
Add unchanged source file from web2py v2.19.1
jimallman 1d80ff6
Revive old hot fix to handle OAuth when proxied
jimallman 0afbddb
Correct commit-history URL (still in original repo)
jimallman a5c2446
Revive another web2py patch
jimallman 9484a1a
Remove third legacy patch (FIXED in recent web2py)
jimallman 62fbf3e
Customize phylesystem-api config for read-only
jimallman b49eb7e
pip install redis as well
snacktavish d08aab9
Merge branch 'master' into migrate-oauth-to-github-app
jimallman File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm a bit confused about what should be happening here. I should have the OPENTREE_OAUTH_TOKEN saved in .ssh/opentree/ on my local machine (https://github.com/OpenTreeOfLife/germinator/pull/155/files#diff-028ee22cd145bc1227616bfad2602bdeR90), and then it gets copied over? Is this how it should still work?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah - following conversation with Mark I believe we are using a keypair generated directly on phylsystemapi/devphylesystemapi for the pushes to phylesystem. So I think we don't need this bit.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm it looks like it also tries to grab the opentree key here https://github.com/OpenTreeOfLife/germinator/pull/155/files#diff-028ee22cd145bc1227616bfad2602bdeR410