-
Notifications
You must be signed in to change notification settings - Fork 57
Conversation
@@ -31,7 +31,7 @@ | |||
|
|||
# Disable Rails's static asset server | |||
# In production, Apache or nginx will already do this | |||
config.serve_static_assets = false | |||
config.serve_static_assets = true |
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 just realized that we might not want to do this directly, since in many deployment situations you won't want this to be true
. We could define an environment variable for this (e.g. RES_HEROKU
) and use that to determine the setting.
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.
On second thought, I'm going to do something like this and update app.json
(and the documentation).
Please also look over the changes to the custom buildpack (i.e. my commits) as well, thanks! |
this all looks excellent - I just deployed a test instance to heroku in about 5 minutes which is pretty solid. However, I think we need to add a little more in terms of setup/seed scripting:
IMO we should just require the user to run |
In terms of the login credentials, I noted them in the wiki page but you're right, if you're just coming from the repo it won't be clear (even though you'll likely have to visit the wiki page to deal with the configuration stuff). I'm fine to default to no seeding / requiring |
Note to self, once #1115 is merged in, update the |
@squidgetx: are you good with leaving Let me know how this all looks (now that I addressed my comment) and if I should squash commits. Thanks! |
Sounds good to me; squash + merge! |
old_blackouts.each do |b| | ||
Rails.logger.info "Deleting old blackout:\n #{b.inspect}" | ||
b.destroy | ||
if AppConfig.blank? || AppConfig.first.blackout_exp_time.blank? |
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.
not sure why this was changed... I must have screwed up my merge. I'll go back to the cleaner form.
On second thought, I want to test both CAS and LDAP, here we go! |
Ok, CAS works perfectly :-D |
|
LDAP isn't working right now :-(. Not sure if it's Heroku or just |
BTW, merged in the #1116 changes and it looks really nice 😄 |
Yale LDAP lookup isn't working, and I don't know of another service I can use to test it. Anyone have any ideas? |
You mean LDAP isn't working on heroku-deployed instances? Seems to make sense right, since LDAP just doesn't work anyway when not on a Yale server |
So that's not quite true. You can't do NetID-based lookups from outside Yale, but you should be able to do e-mail based lookup (according to @dgoerger). I'm switching off CAS and seeing if that helps. EDIT Woot! It works 😆 |
Ok, I think this is all good. Can someone please do a quick final review and merge? Thanks! |
Yup, you can look up by email like this from a linux terminal:
Changing the |
We're (probably I'm) going to try and make CAS and non-CAS auth live happily together (see #1106), hopefully in v5.2.0. We could just switch all LDAP lookups to e-mail (since I believe we enforce uniqueness on e-mail in both cases), I'll add a note there. |
5bb8617
to
d1c7e7e
Compare
Ok, resolved a merge commit due to #1110, ready for final review / merge. |
Did you mean to commit the |
Yup, see here |
Okay. I left one super minor inline comment, otherwise this is ready for merge |
Thanks! Issue resolved, just re-squashing and then I'll merge 😄 |
added pg gem to Gemfile made log level server configurable fixed bin/rails error updated production environment to fix broken assets (hopefully) trying a different fix for broken assets more production.rb tweaks added rails_12factor gem for Heroku trying to fix EISDIR error made party_foul conditional on config updated Gemfile.lock rubocop fixes (not being checked anyway) undoing conditional now party foul should hopefully not screw up? fix issues with non-existant app configs moved ffaker out of development removed redundant conditional moved progressbar out of development check for git directory before calling git commands setting up scheduler for cron jobs fixing rake typo fixed broken rake task? trying to fix broken dates issue another date fix added unicorn / Procfile (as suggested by Heroku) initial app.json for Heroku button added Heroku button to README moved rack timeout initializer to example removed extra space updated app.json with better instructions fixed app.json optional env params reset cart.rb whoops forgot postgresql reworked how we handle e-mail authentication configs updated app.json description shortened description removed staging environment, cleaned up Gemfile fixed link to correct file added missed reservations email task to scheduler.rake fixed incorrect merge made static assets serving configurable via ENV updated .env.example to include USE_LDAP updated .env.example with required parameters ignored .env file improved SERVE_STATIC logic
cool |
Resolves #275 (and #1104)
, needs to be squashed but appears to be fully functional :-).Things I have not yet tested:LDAPCAS