fix(demdata-cms): rename, update, fix

demdata-cms/Dockerfile → demdata_cms/Dockerfile

@@ -1,7 +1,7 @@
-FROM taccwma/core-cms:977ecc0
+# TACC/Core-CMS#v3.12.0-alpha.5
+FROM taccwma/core-cms:511792b
 
 WORKDIR /code
 
-COPY /src/apps /code/apps
 COPY /src/taccsite_custom /code/taccsite_custom
 COPY /src/taccsite_cms /code/taccsite_cms

demdata-cms/docker-compose.dev.yml → demdata_cms/docker-compose.dev.yml

@@ -5,8 +5,8 @@ services:
     ports:
       - 8000:8000
     command: ["python3", "manage.py", "runserver", "0.0.0.0:8000"]
-    container_name: demdata_cms
-    hostname: demdata_cms
+    container_name: core_cms
+    hostname: core_cms
     volumes:
       - ./src/apps:/code/apps
       - ./src/taccsite_custom:/code/taccsite_custom
@@ -16,7 +16,7 @@ services:
       - ./src/taccsite_cms/settings_local.py:/code/taccsite_cms/settings_local.py
       - ./src/taccsite_cms/secrets.py:/code/taccsite_cms/secrets.py
     networks:
-      - demdata_cms_net
+      - core_cms_net
 
   postgres:
     image: postgres:11.5
@@ -26,11 +26,11 @@ services:
       - POSTGRES_DB=taccsite
       - PGDATA=/var/lib/postgresql/data/taccsite
     volumes:
-      - demdata_cms_postgres_data:/var/lib/postgresql/data
-    hostname: demdata_cms_postgres
-    container_name: demdata_cms_postgres
+      - core_cms_postgres_data:/var/lib/postgresql/data
+    hostname: core_cms_postgres
+    container_name: core_cms_postgres
     networks:
-      - demdata_cms_net
+      - core_cms_net
 
   elasticsearch:
     image: docker.elastic.co/elasticsearch/elasticsearch:7.17.0
@@ -41,16 +41,16 @@ services:
       - discovery.type=single-node
     volumes:
       - ./elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml
-      - demdata_cms_es_data:/usr/share/elasticsearch/data
-    container_name: demdata_cms_elasticsearch
+      - core_cms_es_data:/usr/share/elasticsearch/data
+    container_name: core_cms_elasticsearch
     ports:
       - 9201:9200
     networks:
-      - demdata_cms_net
+      - core_cms_net
 
 volumes:
-  demdata_cms_postgres_data:
-  demdata_cms_es_data:
+  core_cms_postgres_data:
+  core_cms_es_data:
 
 networks:
-  demdata_cms_net:
+  core_cms_net:

demdata_cms/src/taccsite_cms/secrets.default.py

@@ -0,0 +1,19 @@
+# SECRET SETTINGS VALUES.
+# (LOCAL TEST INSTANCE)
+
+########################
+# DATABASE SETTINGS
+########################
+
+from taccsite_cms.settings import DATABASES
+
+DATABASES = {
+    'default': {
+        'ENGINE': DATABASES['default']['ENGINE'],
+        'PORT': DATABASES['default']['PORT'],
+        'NAME': DATABASES['default']['NAME'],
+        'USER': DATABASES['default']['USER'],
+        'PASSWORD': DATABASES['default']['PASSWORD'],
+        'HOST': DATABASES['default']['HOST'],
+    }
+}

demdata_cms/src/taccsite_cms/settings_custom.py

@@ -0,0 +1,100 @@
+# CUSTOM SETTINGS VALUES.
+# TACC WMA CMS SITE:
+# *.DEMOCTRATIZING-SITE.TACC.UTEXAS.EDU
+# https://democratizingdata.ai/
+
+########################
+# TACC: PORTAL
+########################
+
+# Does this CMS site have a portal (default value: True)?
+INCLUDES_CORE_PORTAL = False
+INCLUDES_PORTAL_NAV = False
+INCLUDES_SEARCH_BAR = False
+
+########################
+# DJANGO CMS SETTINGS
+########################
+
+CMS_TEMPLATES = (
+    ('standard.html', 'Standard'),
+    ('fullwidth.html', 'Full Width'),
+    ('demdata_cms/templates/standard.html', 'Standard (with CSS from TUP)'),
+    ('demdata_cms/templates/fullwidth.html', 'Full Width (with CSS from TUP)'),
+    ('demdata-cms/templates/standard.html', 'DEPRECATED Standard (with CSS from TUP)'),
+    ('demdata-cms/templates/fullwidth.html', 'DEPRECATED Full Width (with CSS from TUP)'),
+)
+# CMS_TEMPLATES_DIR: {
+#     1: 'demdata_cms/templates/',
+#     2: 'demdata-cms/templates/',
+# }
+
+########################
+# TACC: BRANDING
+########################
+
+# LOOK INTO THIS SOLUTION.
+# from taccsite_cms.settings import TACC_BRANDING, UTEXAS_BRANDING, NSF_BRANDING
+
+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"
+]
+
+# NSF_BRANDING = [
+#     "nsf",
+#     "site_cms/img/org_logos/nsf-white.png",
+#     "branding-nsf",
+#     "https://www.nsf.gov/",
+#     "_blank",
+#     "NSF Logo",
+#     "anonymous",
+#     "True"
+# ]
+
+# BRANDING = [ TACC_BRANDING, UTEXAS_BRANDING, NSF_BRANDING ]
+BRANDING = [ TACC_BRANDING, UTEXAS_BRANDING ] # this matches prod 2022
+# BRANDING = [] # prod 2022 hides bar via snippet CSS but should also do this
+
+########################
+# TACC: LOGOS
+########################
+
+LOGO = [
+    "demdata",
+    "demdata_cms/img/org_logos/demdata.svg",
+    "",
+    "/",
+    "_self",
+    "Democratizing Data Logo",
+    "anonymous",
+    "True"
+]
+
+FAVICON = {
+    "img_file_src": "demdata_cms/img/favicons/Favicon_64x64.svg"
+}
+
+########################
+# TACC: CORE STYLES
+########################
+
+# Only use integer numbers (not "v1", not "0.11.0")
+TACC_CORE_STYLES_VERSION = 2

demdata_cms/src/taccsite_custom/demdata-cms/templates/fullwidth.html

@@ -0,0 +1 @@
+{% extends "demdata_cms/templates/fullwidth.html" %}

demdata_cms/src/taccsite_custom/demdata-cms/templates/standard.html

@@ -0,0 +1 @@
+{% extends "demdata_cms/templates/standard.html" %}