Skip to content
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

Updating to match Core CMS settings structure #77

Merged
merged 36 commits into from
Sep 21, 2021
Merged

Updating to match Core CMS settings structure #77

merged 36 commits into from
Sep 21, 2021

Conversation

xandroc
Copy link
Contributor

@xandroc xandroc commented Sep 15, 2021

Changing filenames from secrets.py to settings_custom.py so they can be loaded dynamically by core cms without explicit references.
import happens here,
https://github.com/TACC/Core-CMS/blob/task/FP-1194/taccsite_cms/settings.py#L419

@xandroc xandroc changed the title Updating to match Core Portal settings structure Updating to match Core CMS settings structure Sep 15, 2021
@wesleyboar
Copy link
Member

wesleyboar commented Sep 16, 2021

Great. I did notice two items:

  • changes were not made for a2cps-cms nor tup-cms — intentional?
  • the PORTAL setting was not renamed to INCLUDES_CORE_PORTAL — intentional?

I have created a PR (targeting your branch) for these changes: #74. Please let me know if I got anything wrong.

Copy link
Member

@wesleyboar wesleyboar left a comment

Choose a reason for hiding this comment

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

More changes were needed for all sites to work like before. Those changes—old secrets.py values migrated to settings_custom.py—have been done in #74. Please check whether that PR may be merged (to this branch).

Also, questions for new CEP_AUTH_VERIFICATION_ENDPOINT (see review).

('style_guide.html', 'Style Guide')
)

CEP_AUTH_VERIFICATION_ENDPOINT='https://dev.cep.tacc.utexas.edu'
Copy link
Member

@wesleyboar wesleyboar Sep 20, 2021

Choose a reason for hiding this comment

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

@xandroc @taoteg,

  1. Would this CEP_AUTH_VERIFICATION_ENDPOINT be different for each server environment?
  2. If so, then would it be for secrets.py (does differ per env), not settings_custom.py (does not differ per env), thus not need to be here?

If I have misunderstood, then please correct me.

Copy link
Collaborator

@taoteg taoteg Sep 20, 2021

Choose a reason for hiding this comment

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

Ahh! Great catch, Wes, yes. We should relocate that value into the secrets.py.

This value should reflect the same value as the first entry in ALLOWED_HOSTS for any given machine on the TACC network (dev|pprd|prod.project_domain.tacc.utexas.edu).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ideally we'll only have secrets in secrets.py, we'll use settings_custom.py to track custom settings across environments, so each env will have and commit its own settings_custom.py. Camino will load these in a similar way as to how different image tags are loaded on each environment

Copy link
Collaborator

@taoteg taoteg Sep 20, 2021

Choose a reason for hiding this comment

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

Yes, that is the long term plan once we have the CMS settings moved into the Deployments repo and mirroring portals.

That said, it will have to be done in a follow on task/ticket in a subsequent sprint. There are just too many portals currently being deployed (over the next two week) for me to be remotely comfortable with additional changes to the deployment setup at this time, having just gotten everything working cleanly as of Friday (and with there still being several portals we need to roll out these changes onto in order to complete aligning our live sites).

Copy link
Member

@wesleyboar wesleyboar Sep 20, 2021

Choose a reason for hiding this comment

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

Thank you, both. All makes sense.

Should not be secret value, but must be until we support per-env settings, which is not immediate.

Based on that understanding, I will remove the CEP_AUTH_VERIFICATION_ENDPOINT from sites updated in #74.

Copy link
Member

Choose a reason for hiding this comment

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

Ah, I never added it to the other sites. So, I don't need to remove it from them. 😅

Copy link
Collaborator

@taoteg taoteg Sep 20, 2021

Choose a reason for hiding this comment

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

Ha! Perfect. Okay, I am updating all the hosts to include the value in secrets.py.
we should be good to merge this after we pickup the UTRC stuff in #80 and the other portal settings in #74.
main <-- #77 <-- #74 && #80.
Make it so!
=)

wesleyboar and others added 2 commits September 20, 2021 13:38
For UTRC for main (as of this date) see:
- PR #79
- branch `task/FP-1213-utrc-setup`
We added the fix in the base of Core-CMS in PR: TACC/Core-CMS#344
(Assist) Updating to match Core CMS settings structure
@wesleyboar
Copy link
Member

wesleyboar commented Sep 21, 2021

P.S. Texascale, which needed blog (that was removed from Core), now has blog again (see #75), so this PR does not need more work to ensure Texascale works.

Just use `BRANDING` for variable.
@taoteg taoteg merged commit f52e865 into main Sep 21, 2021
@taoteg taoteg deleted the task/FP-1194 branch September 21, 2021 03:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants