diff --git a/matcssi_cms/src/taccsite_custom/matcssi_cms/static/matcssi_cms/img/org_logos/matcssi.png b/matcssi_assets/matcssi_logo.png similarity index 100% rename from matcssi_cms/src/taccsite_custom/matcssi_cms/static/matcssi_cms/img/org_logos/matcssi.png rename to matcssi_assets/matcssi_logo.png diff --git a/matcssi_cms/.dockerignore b/matcssi_cms/.dockerignore deleted file mode 100644 index a64885d2..00000000 --- a/matcssi_cms/.dockerignore +++ /dev/null @@ -1,4 +0,0 @@ -.git -.cache -**/secrets.py -**/settings_local.py diff --git a/matcssi_cms/Dockerfile b/matcssi_cms/Dockerfile deleted file mode 100644 index a2053321..00000000 --- a/matcssi_cms/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM taccwma/core-cms:v4.12.0 - -WORKDIR /code - -COPY /src/taccsite_custom /code/taccsite_custom -COPY /src/taccsite_cms /code/taccsite_cms diff --git a/matcssi_cms/Makefile b/matcssi_cms/Makefile deleted file mode 100644 index b4b1daaa..00000000 --- a/matcssi_cms/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -DOCKERHUB_REPO := $(shell cat ./docker_repo.var) -DOCKER_TAG ?= $(shell git rev-parse --short HEAD) -DOCKER_IMAGE := $(DOCKERHUB_REPO):$(DOCKER_TAG) -DOCKER_IMAGE_LATEST := $(DOCKERHUB_REPO):latest - -# `DOCKER_IMAGE_BRANCH` tag is the git tag for the commit if it exists, else the branch on which the commit exists -DOCKER_IMAGE_BRANCH := $(DOCKERHUB_REPO):$(shell git describe --exact-match --tags 2> /dev/null || git symbolic-ref --short HEAD) - -#.PHONY: build -build: - docker-compose -f docker-compose.dev.yml build - -.PHONY: build-full -build-full: - docker build -t $(DOCKER_IMAGE) --target production -f Dockerfile . - docker tag $(DOCKER_IMAGE) $(DOCKER_IMAGE_BRANCH) # Note: Currently broken for branches with slashes - -.PHONY: publish -publish: - docker push $(DOCKER_IMAGE) - docker push $(DOCKER_IMAGE_BRANCH) - -.PHONY: publish-latest -publish-latest: - docker tag $(DOCKER_IMAGE) $(DOCKER_IMAGE_LATEST) - docker push $(DOCKER_IMAGE_LATEST) - -.PHONY: start -start: - docker-compose -f docker-compose.dev.yml up - -.PHONY: stop -stop: - docker-compose -f docker-compose.dev.yml down - -.PHONY: stop-full -stop-v: - docker-compose -f docker-compose.dev.yml down -v diff --git a/matcssi_cms/README.md b/matcssi_cms/README.md deleted file mode 100644 index d3118cd4..00000000 --- a/matcssi_cms/README.md +++ /dev/null @@ -1,9 +0,0 @@ -# MatCSSI - -https://matcssi.tacc.utexas.edu/ - -An extension of the [Core CMS](https://github.com/TACC/Core-CMS) project - -## Basics - -See [Core-CMS-Custom](../README.md). diff --git a/matcssi_cms/docker-compose.dev.yml b/matcssi_cms/docker-compose.dev.yml deleted file mode 100644 index 2aeb7843..00000000 --- a/matcssi_cms/docker-compose.dev.yml +++ /dev/null @@ -1,56 +0,0 @@ -version: "3" -services: - cms: - build: . - ports: - - 127.0.0.1:8000:8000 - command: ["python3", "manage.py", "runserver", "0.0.0.0:8000"] - container_name: core_cms - hostname: core_cms - volumes: - - ./src/apps:/code/apps - - ./src/taccsite_custom:/code/taccsite_custom - - ./src/taccsite_cms/custom_app_settings.py:/code/taccsite_cms/custom_app_settings.py - - ./src/taccsite_cms/urls_custom.py:/code/taccsite_cms/urls_custom.py - - ./src/taccsite_cms/settings_custom.py:/code/taccsite_cms/settings_custom.py - - ./src/taccsite_cms/settings_local.py:/code/taccsite_cms/settings_local.py - - ./src/taccsite_cms/secrets.py:/code/taccsite_cms/secrets.py - networks: - - core_cms_net - - postgres: - image: postgres:11.5 - environment: - - POSTGRES_PASSWORD=taccforever - - POSTGRES_USER=postgresadmin - - POSTGRES_DB=taccsite - - PGDATA=/var/lib/postgresql/data/taccsite - volumes: - - core_cms_postgres_data:/var/lib/postgresql/data - hostname: core_cms_postgres - container_name: core_cms_postgres - networks: - - core_cms_net - - elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:7.17.0 - ulimits: - memlock: -1 - environment: - - ES_HEAP_SIZE:1g - - discovery.type=single-node - volumes: - - ./elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml - - core_cms_es_data:/usr/share/elasticsearch/data - container_name: core_cms_elasticsearch - ports: - - 127.0.0.1:9201:9200 - networks: - - core_cms_net - -volumes: - core_cms_postgres_data: - core_cms_es_data: - -networks: - core_cms_net: diff --git a/matcssi_cms/elasticsearch.yml b/matcssi_cms/elasticsearch.yml deleted file mode 100644 index 55847499..00000000 --- a/matcssi_cms/elasticsearch.yml +++ /dev/null @@ -1,14 +0,0 @@ -#Use this to configure elasticsearch -#More info: https://www.elastic.co/guide/en/elasticsearch/reference/current/settings.html -# -cluster.name: es-dev -network.host: 0.0.0.0 -#network.publish_host: hostname -node.name: es01 -#minimum_master_nodes need to be explicitly set when bound on a public IP -# set to 1 to allow single node clusters -# Details: https://github.com/elastic/elasticsearch/pull/17288 -discovery.zen.minimum_master_nodes: 1 -#More info about memory_lock: https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-configuration-memory.html -bootstrap.memory_lock: true -xpack.security.enabled: false \ No newline at end of file diff --git a/matcssi_cms/src/taccsite_cms/README.md b/matcssi_cms/src/taccsite_cms/README.md deleted file mode 100644 index efec6909..00000000 --- a/matcssi_cms/src/taccsite_cms/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# `taccsite_cms/` - -Add files to overwrite those in this directory within [Core-CMS](https://github.com/TACC/Core-CMS). diff --git a/matcssi_cms/src/taccsite_custom/matcssi_cms/__init__.py b/matcssi_cms/src/taccsite_custom/matcssi_cms/__init__.py deleted file mode 100755 index e69de29b..00000000 diff --git a/matcssi_cms/src/taccsite_custom/matcssi_cms/static/matcssi_cms/img/favicons/favicon.ico b/matcssi_cms/src/taccsite_custom/matcssi_cms/static/matcssi_cms/img/favicons/favicon.ico deleted file mode 100644 index 533966ed..00000000 Binary files a/matcssi_cms/src/taccsite_custom/matcssi_cms/static/matcssi_cms/img/favicons/favicon.ico and /dev/null differ diff --git a/netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/favicons/netsage_cyber_icon.ico b/netsage_assets/netsage_cyber_icon.ico similarity index 100% rename from netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/favicons/netsage_cyber_icon.ico rename to netsage_assets/netsage_cyber_icon.ico diff --git a/netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/favicons/netsage_cyber_icon.ico:Zone.Identifier b/netsage_assets/netsage_cyber_icon.ico:Zone.Identifier similarity index 100% rename from netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/favicons/netsage_cyber_icon.ico:Zone.Identifier rename to netsage_assets/netsage_cyber_icon.ico:Zone.Identifier diff --git a/netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/org_logos/netsage_cyber_logo_color.png b/netsage_assets/netsage_cyber_logo_color.png similarity index 100% rename from netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/org_logos/netsage_cyber_logo_color.png rename to netsage_assets/netsage_cyber_logo_color.png diff --git a/netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/org_logos/netsage_cyber_logo_color.png:Zone.Identifier b/netsage_assets/netsage_cyber_logo_color.png:Zone.Identifier similarity index 100% rename from netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/org_logos/netsage_cyber_logo_color.png:Zone.Identifier rename to netsage_assets/netsage_cyber_logo_color.png:Zone.Identifier diff --git a/netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/favicons/netsage_icon.ico b/netsage_assets/netsage_icon.ico similarity index 100% rename from netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/favicons/netsage_icon.ico rename to netsage_assets/netsage_icon.ico diff --git a/netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/favicons/netsage_icon.ico:Zone.Identifier b/netsage_assets/netsage_icon.ico:Zone.Identifier similarity index 100% rename from netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/favicons/netsage_icon.ico:Zone.Identifier rename to netsage_assets/netsage_icon.ico:Zone.Identifier diff --git a/netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/org_logos/netsage_logo_color.png b/netsage_assets/netsage_logo_color.png similarity index 100% rename from netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/org_logos/netsage_logo_color.png rename to netsage_assets/netsage_logo_color.png diff --git a/netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/org_logos/netsage_logo_color.png:Zone.Identifier b/netsage_assets/netsage_logo_color.png:Zone.Identifier similarity index 100% rename from netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/org_logos/netsage_logo_color.png:Zone.Identifier rename to netsage_assets/netsage_logo_color.png:Zone.Identifier diff --git a/netsage_cms/.dockerignore b/netsage_cms/.dockerignore deleted file mode 100644 index a64885d2..00000000 --- a/netsage_cms/.dockerignore +++ /dev/null @@ -1,4 +0,0 @@ -.git -.cache -**/secrets.py -**/settings_local.py diff --git a/netsage_cms/Dockerfile b/netsage_cms/Dockerfile deleted file mode 100644 index 2d1d6b33..00000000 --- a/netsage_cms/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM taccwma/core-cms:v4.12.0 - -WORKDIR /code - -COPY /src/apps /code/apps -COPY /src/taccsite_custom /code/taccsite_custom -COPY /src/taccsite_cms /code/taccsite_cms diff --git a/netsage_cms/Makefile b/netsage_cms/Makefile deleted file mode 100644 index b4b1daaa..00000000 --- a/netsage_cms/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -DOCKERHUB_REPO := $(shell cat ./docker_repo.var) -DOCKER_TAG ?= $(shell git rev-parse --short HEAD) -DOCKER_IMAGE := $(DOCKERHUB_REPO):$(DOCKER_TAG) -DOCKER_IMAGE_LATEST := $(DOCKERHUB_REPO):latest - -# `DOCKER_IMAGE_BRANCH` tag is the git tag for the commit if it exists, else the branch on which the commit exists -DOCKER_IMAGE_BRANCH := $(DOCKERHUB_REPO):$(shell git describe --exact-match --tags 2> /dev/null || git symbolic-ref --short HEAD) - -#.PHONY: build -build: - docker-compose -f docker-compose.dev.yml build - -.PHONY: build-full -build-full: - docker build -t $(DOCKER_IMAGE) --target production -f Dockerfile . - docker tag $(DOCKER_IMAGE) $(DOCKER_IMAGE_BRANCH) # Note: Currently broken for branches with slashes - -.PHONY: publish -publish: - docker push $(DOCKER_IMAGE) - docker push $(DOCKER_IMAGE_BRANCH) - -.PHONY: publish-latest -publish-latest: - docker tag $(DOCKER_IMAGE) $(DOCKER_IMAGE_LATEST) - docker push $(DOCKER_IMAGE_LATEST) - -.PHONY: start -start: - docker-compose -f docker-compose.dev.yml up - -.PHONY: stop -stop: - docker-compose -f docker-compose.dev.yml down - -.PHONY: stop-full -stop-v: - docker-compose -f docker-compose.dev.yml down -v diff --git a/netsage_cms/README.md b/netsage_cms/README.md deleted file mode 100644 index 59a51232..00000000 --- a/netsage_cms/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# Example - -An extension of the [Core CMS](https://github.com/TACC/Core-CMS) project - -## Basics - -See [Core-CMS-Custom](../README.md). diff --git a/netsage_cms/docker-compose.dev.yml b/netsage_cms/docker-compose.dev.yml deleted file mode 100644 index 2aeb7843..00000000 --- a/netsage_cms/docker-compose.dev.yml +++ /dev/null @@ -1,56 +0,0 @@ -version: "3" -services: - cms: - build: . - ports: - - 127.0.0.1:8000:8000 - command: ["python3", "manage.py", "runserver", "0.0.0.0:8000"] - container_name: core_cms - hostname: core_cms - volumes: - - ./src/apps:/code/apps - - ./src/taccsite_custom:/code/taccsite_custom - - ./src/taccsite_cms/custom_app_settings.py:/code/taccsite_cms/custom_app_settings.py - - ./src/taccsite_cms/urls_custom.py:/code/taccsite_cms/urls_custom.py - - ./src/taccsite_cms/settings_custom.py:/code/taccsite_cms/settings_custom.py - - ./src/taccsite_cms/settings_local.py:/code/taccsite_cms/settings_local.py - - ./src/taccsite_cms/secrets.py:/code/taccsite_cms/secrets.py - networks: - - core_cms_net - - postgres: - image: postgres:11.5 - environment: - - POSTGRES_PASSWORD=taccforever - - POSTGRES_USER=postgresadmin - - POSTGRES_DB=taccsite - - PGDATA=/var/lib/postgresql/data/taccsite - volumes: - - core_cms_postgres_data:/var/lib/postgresql/data - hostname: core_cms_postgres - container_name: core_cms_postgres - networks: - - core_cms_net - - elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:7.17.0 - ulimits: - memlock: -1 - environment: - - ES_HEAP_SIZE:1g - - discovery.type=single-node - volumes: - - ./elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml - - core_cms_es_data:/usr/share/elasticsearch/data - container_name: core_cms_elasticsearch - ports: - - 127.0.0.1:9201:9200 - networks: - - core_cms_net - -volumes: - core_cms_postgres_data: - core_cms_es_data: - -networks: - core_cms_net: diff --git a/netsage_cms/elasticsearch.yml b/netsage_cms/elasticsearch.yml deleted file mode 100644 index 55847499..00000000 --- a/netsage_cms/elasticsearch.yml +++ /dev/null @@ -1,14 +0,0 @@ -#Use this to configure elasticsearch -#More info: https://www.elastic.co/guide/en/elasticsearch/reference/current/settings.html -# -cluster.name: es-dev -network.host: 0.0.0.0 -#network.publish_host: hostname -node.name: es01 -#minimum_master_nodes need to be explicitly set when bound on a public IP -# set to 1 to allow single node clusters -# Details: https://github.com/elastic/elasticsearch/pull/17288 -discovery.zen.minimum_master_nodes: 1 -#More info about memory_lock: https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-configuration-memory.html -bootstrap.memory_lock: true -xpack.security.enabled: false \ No newline at end of file diff --git a/netsage_cms/src/apps/custom_example/__init__.py b/netsage_cms/src/apps/custom_example/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/netsage_cms/src/apps/custom_example/apps.py b/netsage_cms/src/apps/custom_example/apps.py deleted file mode 100644 index 672181cf..00000000 --- a/netsage_cms/src/apps/custom_example/apps.py +++ /dev/null @@ -1,5 +0,0 @@ -from django.apps import AppConfig - - -class CustomExampleConfig(AppConfig): - name = 'custom_example' diff --git a/netsage_cms/src/apps/custom_example/templates/custom_example/custom_example.html b/netsage_cms/src/apps/custom_example/templates/custom_example/custom_example.html deleted file mode 100644 index 93902fc3..00000000 --- a/netsage_cms/src/apps/custom_example/templates/custom_example/custom_example.html +++ /dev/null @@ -1,4 +0,0 @@ -{% extends "base.html" %} -{% block content %} -This page will contain custom content. -{%endblock %} diff --git a/netsage_cms/src/apps/custom_example/urls.py b/netsage_cms/src/apps/custom_example/urls.py deleted file mode 100644 index d38dbd09..00000000 --- a/netsage_cms/src/apps/custom_example/urls.py +++ /dev/null @@ -1,7 +0,0 @@ -from django.urls import re_path -from .views import AddedView - -app_name = 'custom_example' -urlpatterns = [ - re_path('', AddedView, name='index'), -] diff --git a/netsage_cms/src/apps/custom_example/views.py b/netsage_cms/src/apps/custom_example/views.py deleted file mode 100644 index 985d9732..00000000 --- a/netsage_cms/src/apps/custom_example/views.py +++ /dev/null @@ -1,9 +0,0 @@ -from curses.ascii import HT -from django.http import HttpResponse -from django.conf import settings -from django.template import loader - - -def AddedView(request): - template = loader.get_template('custom_example/custom_example.html') - return HttpResponse(template.render({}, request)) diff --git a/netsage_cms/src/taccsite_cms/README.md b/netsage_cms/src/taccsite_cms/README.md deleted file mode 100644 index efec6909..00000000 --- a/netsage_cms/src/taccsite_cms/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# `taccsite_cms/` - -Add files to overwrite those in this directory within [Core-CMS](https://github.com/TACC/Core-CMS). diff --git a/netsage_cms/src/taccsite_custom/netsage_cms/__init__.py b/netsage_cms/src/taccsite_custom/netsage_cms/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/favicons/favicon.ico b/netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/favicons/favicon.ico deleted file mode 100644 index 533966ed..00000000 Binary files a/netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/favicons/favicon.ico and /dev/null differ diff --git a/netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/org_logos/portal.png b/netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/org_logos/portal.png deleted file mode 100644 index 3ec46382..00000000 Binary files a/netsage_cms/src/taccsite_custom/netsage_cms/static/netsage_cms/img/org_logos/portal.png and /dev/null differ diff --git a/tapisproject_cms/src/taccsite_custom/tapisproject_cms/static/tapisproject_cms/img/org_logos/hawaii-header-trimmed.png b/tapisproject_assets/hawaii-header-trimmed.png similarity index 100% rename from tapisproject_cms/src/taccsite_custom/tapisproject_cms/static/tapisproject_cms/img/org_logos/hawaii-header-trimmed.png rename to tapisproject_assets/hawaii-header-trimmed.png diff --git a/tapisproject_cms/src/taccsite_custom/tapisproject_cms/static/tapisproject_cms/css/migrate.to-v3.css b/tapisproject_assets/migrate.to-core-cms-v3.css similarity index 94% rename from tapisproject_cms/src/taccsite_custom/tapisproject_cms/static/tapisproject_cms/css/migrate.to-v3.css rename to tapisproject_assets/migrate.to-core-cms-v3.css index b486ace3..07054aff 100644 --- a/tapisproject_cms/src/taccsite_custom/tapisproject_cms/static/tapisproject_cms/css/migrate.to-v3.css +++ b/tapisproject_assets/migrate.to-core-cms-v3.css @@ -34,7 +34,7 @@ table { :is(td,th) { color: usnet; /* Bootstrap: none (inherit) | TACC: var(--global-color-primary--dark) */ } -/* FAQ: Did not restore, because it makes table easier to scan *//* +/* FAQ: Did not restore, because table is easier to scan as is *//* tr:nth-child(2n) :is(th,td) { background: unset; /* Bootstrap: none (inherit) | TACC: var(--global-color-primary--x-light) *\/ } diff --git a/tapisproject_cms/src/taccsite_custom/tapisproject_cms/static/tapisproject_cms/img/org_logos/tapis-logo-navbar.png b/tapisproject_assets/tapis-logo-navbar.png similarity index 100% rename from tapisproject_cms/src/taccsite_custom/tapisproject_cms/static/tapisproject_cms/img/org_logos/tapis-logo-navbar.png rename to tapisproject_assets/tapis-logo-navbar.png diff --git a/tapisproject_cms/.dockerignore b/tapisproject_cms/.dockerignore deleted file mode 100644 index a64885d2..00000000 --- a/tapisproject_cms/.dockerignore +++ /dev/null @@ -1,4 +0,0 @@ -.git -.cache -**/secrets.py -**/settings_local.py diff --git a/tapisproject_cms/Dockerfile b/tapisproject_cms/Dockerfile deleted file mode 100644 index a2053321..00000000 --- a/tapisproject_cms/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM taccwma/core-cms:v4.12.0 - -WORKDIR /code - -COPY /src/taccsite_custom /code/taccsite_custom -COPY /src/taccsite_cms /code/taccsite_cms diff --git a/tapisproject_cms/Makefile b/tapisproject_cms/Makefile deleted file mode 100644 index b4b1daaa..00000000 --- a/tapisproject_cms/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -DOCKERHUB_REPO := $(shell cat ./docker_repo.var) -DOCKER_TAG ?= $(shell git rev-parse --short HEAD) -DOCKER_IMAGE := $(DOCKERHUB_REPO):$(DOCKER_TAG) -DOCKER_IMAGE_LATEST := $(DOCKERHUB_REPO):latest - -# `DOCKER_IMAGE_BRANCH` tag is the git tag for the commit if it exists, else the branch on which the commit exists -DOCKER_IMAGE_BRANCH := $(DOCKERHUB_REPO):$(shell git describe --exact-match --tags 2> /dev/null || git symbolic-ref --short HEAD) - -#.PHONY: build -build: - docker-compose -f docker-compose.dev.yml build - -.PHONY: build-full -build-full: - docker build -t $(DOCKER_IMAGE) --target production -f Dockerfile . - docker tag $(DOCKER_IMAGE) $(DOCKER_IMAGE_BRANCH) # Note: Currently broken for branches with slashes - -.PHONY: publish -publish: - docker push $(DOCKER_IMAGE) - docker push $(DOCKER_IMAGE_BRANCH) - -.PHONY: publish-latest -publish-latest: - docker tag $(DOCKER_IMAGE) $(DOCKER_IMAGE_LATEST) - docker push $(DOCKER_IMAGE_LATEST) - -.PHONY: start -start: - docker-compose -f docker-compose.dev.yml up - -.PHONY: stop -stop: - docker-compose -f docker-compose.dev.yml down - -.PHONY: stop-full -stop-v: - docker-compose -f docker-compose.dev.yml down -v diff --git a/tapisproject_cms/README.md b/tapisproject_cms/README.md deleted file mode 100644 index 59a51232..00000000 --- a/tapisproject_cms/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# Example - -An extension of the [Core CMS](https://github.com/TACC/Core-CMS) project - -## Basics - -See [Core-CMS-Custom](../README.md). diff --git a/tapisproject_cms/docker-compose.dev.yml b/tapisproject_cms/docker-compose.dev.yml deleted file mode 100644 index 2aeb7843..00000000 --- a/tapisproject_cms/docker-compose.dev.yml +++ /dev/null @@ -1,56 +0,0 @@ -version: "3" -services: - cms: - build: . - ports: - - 127.0.0.1:8000:8000 - command: ["python3", "manage.py", "runserver", "0.0.0.0:8000"] - container_name: core_cms - hostname: core_cms - volumes: - - ./src/apps:/code/apps - - ./src/taccsite_custom:/code/taccsite_custom - - ./src/taccsite_cms/custom_app_settings.py:/code/taccsite_cms/custom_app_settings.py - - ./src/taccsite_cms/urls_custom.py:/code/taccsite_cms/urls_custom.py - - ./src/taccsite_cms/settings_custom.py:/code/taccsite_cms/settings_custom.py - - ./src/taccsite_cms/settings_local.py:/code/taccsite_cms/settings_local.py - - ./src/taccsite_cms/secrets.py:/code/taccsite_cms/secrets.py - networks: - - core_cms_net - - postgres: - image: postgres:11.5 - environment: - - POSTGRES_PASSWORD=taccforever - - POSTGRES_USER=postgresadmin - - POSTGRES_DB=taccsite - - PGDATA=/var/lib/postgresql/data/taccsite - volumes: - - core_cms_postgres_data:/var/lib/postgresql/data - hostname: core_cms_postgres - container_name: core_cms_postgres - networks: - - core_cms_net - - elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:7.17.0 - ulimits: - memlock: -1 - environment: - - ES_HEAP_SIZE:1g - - discovery.type=single-node - volumes: - - ./elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml - - core_cms_es_data:/usr/share/elasticsearch/data - container_name: core_cms_elasticsearch - ports: - - 127.0.0.1:9201:9200 - networks: - - core_cms_net - -volumes: - core_cms_postgres_data: - core_cms_es_data: - -networks: - core_cms_net: diff --git a/tapisproject_cms/elasticsearch.yml b/tapisproject_cms/elasticsearch.yml deleted file mode 100644 index 55847499..00000000 --- a/tapisproject_cms/elasticsearch.yml +++ /dev/null @@ -1,14 +0,0 @@ -#Use this to configure elasticsearch -#More info: https://www.elastic.co/guide/en/elasticsearch/reference/current/settings.html -# -cluster.name: es-dev -network.host: 0.0.0.0 -#network.publish_host: hostname -node.name: es01 -#minimum_master_nodes need to be explicitly set when bound on a public IP -# set to 1 to allow single node clusters -# Details: https://github.com/elastic/elasticsearch/pull/17288 -discovery.zen.minimum_master_nodes: 1 -#More info about memory_lock: https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-configuration-memory.html -bootstrap.memory_lock: true -xpack.security.enabled: false \ No newline at end of file diff --git a/tapisproject_cms/src/__init__.py b/tapisproject_cms/src/__init__.py deleted file mode 100755 index e69de29b..00000000 diff --git a/tapisproject_cms/src/taccsite_cms/templates/assets_custom.html b/tapisproject_cms/src/taccsite_cms/templates/assets_custom.html deleted file mode 100644 index ee27c0b4..00000000 --- a/tapisproject_cms/src/taccsite_cms/templates/assets_custom.html +++ /dev/null @@ -1,22 +0,0 @@ -{# This template overwrites the original from TACC/Core-CMS #} -{# NOTE: This should extend taccsite_cms via taccsite_custom, not overwrite #} -{# FAQ: To extend, via app template inheritance, see TACC/Core-CMS#492 #} - - - -{# COPIED FROM CORE #} -{# https://github.com/TACC/Core-CMS/blob/c8844e1/taccsite_cms/templates/assets_custom.html #} - -{% load static %} - - -{% with settings.PORTAL_FAVICON as favicon %} - -{% endwith %} - - - -{# NEW CODE #} - - - diff --git a/tapisproject_cms/src/taccsite_custom/tapisproject_cms/__init__.py b/tapisproject_cms/src/taccsite_custom/tapisproject_cms/__init__.py deleted file mode 100755 index e69de29b..00000000