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.

Sign up for GitHub

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
+678 −547
Merged

Updating to match Core CMS settings structure #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
5a6f0ec
updating to match settings structure
xandroc Sep 10, 2021
95d223d
FP-1194: Assist: Remove rogue _ in texascale
wesleyboar Sep 14, 2021
e4ec59c
FP-1194: Assist: Remove _'s in a2cps & tup
wesleyboar Sep 14, 2021
a544a72
FP-1194: Assist: PORTAL → INCLUDES_CORE_PORTAL
wesleyboar Sep 14, 2021
c69dec9
add core-cms settings_custom
rstijerina Sep 15, 2021
6b4075e
adding verification endpoint
xandroc Sep 16, 2021
2fdbd87
FP-1194: Assist: ProTX to latest secrets, drop redundancy
wesleyboar Sep 16, 2021
93ac57e
Added the a2cps/settings_custom.py file for use across all a2cps CMS …
taoteg Sep 16, 2021
6ce45d3
FP-1194: Export settings in protx-cms
wesleyboar Sep 16, 2021
78bee62
Moved LDAP check into custom fo A2CPS.
taoteg Sep 16, 2021
8195f60
Removed all extraneous commenst from a2cps settings_custom.
taoteg Sep 16, 2021
c574f81
TWeaked a2cps to include defaults for GA. Fixed a type in protx setti…
taoteg Sep 16, 2021
9c306e6
Removed portal links and features from a2cps custom_settings.
taoteg Sep 16, 2021
e751b84
Up[dated heading in ProTx custom settings.
taoteg Sep 16, 2021
3c0919c
Removed extraneous comment in a2cps settings.
taoteg Sep 16, 2021
30b3bef
Resolved concerns about Branding secrets and redundancy. settings.py …
taoteg Sep 17, 2021
5231deb
Further removal of redundant defaults from custom settings in a2cps a…
taoteg Sep 17, 2021
95e1d32
Aligning settings_custom with settings.py in Core-CMS.
taoteg Sep 17, 2021
3de2a71
Removing unused settings from examples.
taoteg Sep 17, 2021
9c5a6e9
Aligning the custom settings across projects.
taoteg Sep 17, 2021
4044081
Updated tup custom settings.
taoteg Sep 17, 2021
920f25c
Updated tup custom settings.
taoteg Sep 17, 2021
12c6d24
Updated the tup.dev cms image tag.
taoteg Sep 17, 2021
a7d471b
Addiniig some detailsinto tup settings custom.
taoteg Sep 17, 2021
7089634
FP-1194: TAPIS, LCCF, Example, ProTX: Fix settings
wesleyboar Sep 17, 2021
fd2c1af
FP-1194: FP, 3Dem, SciVis, Texascale: Fix settings
wesleyboar Sep 17, 2021
591d6fa
Update settings_custom.py
taoteg Sep 17, 2021
c192e55
Quick: Formatting consistency tweak
wesleyboar Sep 17, 2021
4dbc525
Merge branch 'task/FP-1194--assist' of github.com:TACC/Core-CMS-Resou…
wesleyboar Sep 17, 2021
81d42be
Merge branch 'task/FP-1194' into task/FP-1194--assist
wesleyboar Sep 17, 2021
b04a774
FP-1213: Add UTRC (with FP-1194 setup)
wesleyboar Sep 20, 2021
32f234a
Update settings_custom.py
taoteg Sep 20, 2021
4a410ac
Merge pull request #80 from TACC/task/FP-1194--FP-1213-utrc-setup
taoteg Sep 20, 2021
4671005
Merge pull request #74 from TACC/task/FP-1194--assist
taoteg Sep 20, 2021
002487f
Update settings_custom.py
taoteg Sep 21, 2021
ca0cf94
Tweaking some formatting and layout inconsistencies and fixing a few …
taoteg Sep 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 0 additions & 60 deletions a2cps-cms/secrets.py
View file
Open in desktop

This file was deleted.

32 changes: 32 additions & 0 deletions a2cps-cms/settings_custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# CUSTOM SETTINGS VALUES.
# TACC WMA CMS SITE:
# *.A2CPS.TACC.UTEXAS.EDU

########################
# DJANGO CMS SETTINGS
########################

CMS_TEMPLATES = (
('a2cps-cms/templates/standard.html', 'Standard'),
('a2cps-cms/templates/fullwidth.html', 'Full Width'),
('guide.html', 'Guide'),
('guides/getting_started.html', 'Guide: Getting Started'),
('guides/data_transfer.html', 'Guide: Data Transfer'),
('guides/data_transfer.globus.html', 'Guide: Globus Data Transfer'),
('guides/portal_technology.html', 'Guide: Portal Technology Stack')
)

########################
# LOGOS
########################

LOGO = [
"a2cps",
"a2cps-cms/img/org_logos/a2cps.png",
"",
"/",
"_self",
"A2CPS: Acute to Chronic Pain Signatures",
"anonymous",
"True"
]
7 changes: 7 additions & 0 deletions core-cms/settings_custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# CUSTOM SETTINGS VALUES.
# TACC WMA CMS SITE:
# *.CEP.TACC.UTEXAS.EDU

# SHOULD USE ALMOST ALL DEFAULT VALUES.

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

@wesleyboar wesleyboar Sep 20, 2021 •
edited
Loading

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 •
edited
Loading

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 •
edited
Loading

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 •
edited
Loading

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 •
edited
Loading

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!
=)

69 changes: 0 additions & 69 deletions example-cms/secrets.py
View file
Open in desktop

This file was deleted.

68 changes: 68 additions & 0 deletions example-cms/settings_custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
# CUSTOM SETTINGS VALUES.
# TACC WMA CMS SITE:
# *.PROJECT-DOMAIN.TACC.UTEXAS.EDU

# FAQ: Some _VARIABLES are duplicated from settings.py (but prefixed with "_")
# because current infrastructure lacks ability to reference default values

########################
# DJANGO CMS SETTINGS
########################

CMS_TEMPLATES = (
('example-cms/templates/fullwidth.html', 'Fullwidth'),
# Support standard template for demo purposes
('fullwidth.html', 'Standard Fullwidth'),
# Support Portal pages for demo purposes
('home_portal.html', 'Standard Portal Homepage'),
('guide.html', 'Guide'),
('guides/getting_started.html', 'Guide: Getting Started'),
('guides/data_transfer.html', 'Guide: Data Transfer'),
('guides/data_transfer.globus.html', 'Guide: Globus Data Transfer'),
('guides/portal_technology.html', 'Guide: Portal Technology Stack')
)

########################
# BRANDING
########################

_NSF_BRANDING = [
"nsf",
"site_cms/img/org_logos/nsf-white.png",
"branding-nsf",
"https://www.nsf.gov/",
"_blank",
"NSF Logo",
"anonymous",
"True"
]

_TACC_BRANDING = [
"tacc",
"site_cms/img/org_logos/tacc-white.png",
"branding-tacc",
"https://www.tacc.utexas.edu/",
"_blank",
"TACC Logo",
"anonymous",
"True"
]

_UTEXAS_BRANDING = [
"utexas",
"site_cms/img/org_logos/utaustin-white.png",
"branding-utaustin",
"https://www.utexas.edu/",
"_blank",
"University of Texas at Austin Logo",
"anonymous",
"True"
]

BRANDING = [ _NSF_BRANDING, _TACC_BRANDING, _UTEXAS_BRANDING ]

########################
# PORTAL
########################

INCLUDES_CORE_PORTAL = False
81 changes: 0 additions & 81 deletions frontera-cms/secrets.py
View file
Open in desktop

This file was deleted.

75 changes: 75 additions & 0 deletions frontera-cms/settings_custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
# CUSTOM SETTINGS VALUES.
# TACC WMA CMS SITE:
# *.FRONTERA-PORTAL.TACC.UTEXAS.EDU

# FAQ: Some _VARIABLES are duplicated from settings.py (but prefixed with "_")
# because current infrastructure lacks ability to reference default values

########################
# DJANGO CMS SETTINGS
########################

CMS_TEMPLATES = (
('frontera-cms/templates/fullwidth.html', 'Fullwidth'),
('fullwidth.html', 'DEPRECATED Fullwidth'),
('frontera-cms/templates/home.html', 'Homepage'),
('guide.html', 'Guide'),
('guides/getting_started.html', 'Guide: Getting Started'),
('guides/data_transfer.html', 'Guide: Data Transfer'),
('guides/data_transfer.globus.html', 'Guide: Globus Data Transfer'),
('guides/portal_technology.html', 'Guide: Portal Technology Stack')
)

########################
# BRANDING
########################

_NSF_BRANDING = [
"nsf",
"site_cms/img/org_logos/nsf-white.png",
"branding-nsf",
"https://www.nsf.gov/",
"_blank",
"NSF Logo",
"anonymous",
"True"
]

_FRONTERA_TACC_BRANDING = [
"tacc",
"frontera-cms/img/org_logos/tacc-white.png", # TACC/Core-CMS#283 & #284
"branding-tacc",
"https://www.tacc.utexas.edu/",
"_blank",
"TACC Logo",
"anonymous",
"True"
]

_UTEXAS_BRANDING = [
"utexas",
"site_cms/img/org_logos/utaustin-white.png",
"branding-utaustin",
"https://www.utexas.edu/",
"_blank",
"University of Texas at Austin Logo",
"anonymous",
"True"
]

BRANDING = [ _NSF_BRANDING, _FRONTERA_TACC_BRANDING, _UTEXAS_BRANDING ]

########################
# LOGOS
########################

LOGO = [
"frontera",
"frontera-cms/img/org_logos/frontera-white-solo.png",
"",
"/",
"_self",
"Frontera Logo",
"anonymous",
"True"
]
Loading