From 577acf666afcee41fd7b886a51754f1155d3da21 Mon Sep 17 00:00:00 2001 From: Sam Darwin Date: Thu, 2 Jan 2025 12:19:52 -0700 Subject: [PATCH] Set variable: mailman core db (#1571) --- config/settings.py | 13 ++---------- kube/boost/values-cppal-dev-gke.yaml | 29 ++------------------------- kube/boost/values-production-gke.yaml | 29 ++------------------------- kube/boost/values-stage-gke.yaml | 29 ++------------------------- kube/boost/values.yaml | 29 ++------------------------- 5 files changed, 10 insertions(+), 119 deletions(-) diff --git a/config/settings.py b/config/settings.py index 9d3d5b76..6e86d64d 100755 --- a/config/settings.py +++ b/config/settings.py @@ -300,25 +300,16 @@ else: HYPERKITTY_DATABASE_URL = "" -# Mailman API credentials -MAILMAN_REST_API_URL = env("MAILMAN_REST_API_URL", default="http://localhost:8001") -MAILMAN_REST_API_USER = env("MAILMAN_REST_API_USER", default="restadmin") -MAILMAN_REST_API_PASS = env("MAILMAN_REST_API_PASS", default="restpass") -MAILMAN_ARCHIVER_KEY = env("MAILMAN_ARCHIVER_KEY", default="password") -MAILMAN_ELASTIC_INDEX = env("MAILMAN_ELASTIC_INDEX", default="haystack") -MAILMAN_HAYSTACK_URL = env("MAILMAN_HAYSTACK_URL", default="http://127.0.0.1:9200/") +MAILMAN_CORE_DATABASE = env("MAILMAN_CORE_DATABASE", default="unknown") # Fastly API credentials FASTLY_SERVICE = env("FASTLY_SERVICE", default="empty") FASTLY_SERVICE2 = env("FASTLY_SERVICE2", default="empty") FASTLY_API_TOKEN = env("FASTLY_API_TOKEN", default="empty") -# Must still be configured: HAYSTACK_CONNECTIONS = { "default": { - "ENGINE": "haystack.backends.elasticsearch7_backend.Elasticsearch7SearchEngine", - "URL": MAILMAN_HAYSTACK_URL, - "INDEX_NAME": MAILMAN_ELASTIC_INDEX, + "ENGINE": "haystack.backends.simple_backend.SimpleEngine", }, } diff --git a/kube/boost/values-cppal-dev-gke.yaml b/kube/boost/values-cppal-dev-gke.yaml index 224f23ef..65488fd3 100644 --- a/kube/boost/values-cppal-dev-gke.yaml +++ b/kube/boost/values-cppal-dev-gke.yaml @@ -144,36 +144,11 @@ Env: key: key - name: MAILGUN_SENDER_DOMAIN value: cppal-dev.boost.cppalliance.org - - name: MAILMAN_REST_API_URL + - name: MAILMAN_CORE_DATABASE valueFrom: secretKeyRef: name: mailman - key: api_url - - name: MAILMAN_REST_API_USER - valueFrom: - secretKeyRef: - name: mailman - key: api_user - - name: MAILMAN_REST_API_PASS - valueFrom: - secretKeyRef: - name: mailman - key: api_pass - - name: MAILMAN_ARCHIVER_KEY - valueFrom: - secretKeyRef: - name: mailman - key: archiver_key - - name: MAILMAN_ELASTIC_INDEX - valueFrom: - secretKeyRef: - name: mailman - key: elastic_index - - name: MAILMAN_HAYSTACK_URL - valueFrom: - secretKeyRef: - name: mailman - key: haystack_url + key: core_database - name: CALENDAR_API_KEY valueFrom: secretKeyRef: diff --git a/kube/boost/values-production-gke.yaml b/kube/boost/values-production-gke.yaml index d980c98c..b0660b01 100644 --- a/kube/boost/values-production-gke.yaml +++ b/kube/boost/values-production-gke.yaml @@ -144,36 +144,11 @@ Env: key: key - name: MAILGUN_SENDER_DOMAIN value: boost.cppalliance.org - - name: MAILMAN_REST_API_URL + - name: MAILMAN_CORE_DATABASE valueFrom: secretKeyRef: name: mailman - key: api_url - - name: MAILMAN_REST_API_USER - valueFrom: - secretKeyRef: - name: mailman - key: api_user - - name: MAILMAN_REST_API_PASS - valueFrom: - secretKeyRef: - name: mailman - key: api_pass - - name: MAILMAN_ARCHIVER_KEY - valueFrom: - secretKeyRef: - name: mailman - key: archiver_key - - name: MAILMAN_ELASTIC_INDEX - valueFrom: - secretKeyRef: - name: mailman - key: elastic_index - - name: MAILMAN_HAYSTACK_URL - valueFrom: - secretKeyRef: - name: mailman - key: haystack_url + key: core_database - name: CALENDAR_API_KEY valueFrom: secretKeyRef: diff --git a/kube/boost/values-stage-gke.yaml b/kube/boost/values-stage-gke.yaml index b51dcd3f..d5cc901c 100644 --- a/kube/boost/values-stage-gke.yaml +++ b/kube/boost/values-stage-gke.yaml @@ -144,36 +144,11 @@ Env: key: key - name: MAILGUN_SENDER_DOMAIN value: stage.boost.cppalliance.org - - name: MAILMAN_REST_API_URL + - name: MAILMAN_CORE_DATABASE valueFrom: secretKeyRef: name: mailman - key: api_url - - name: MAILMAN_REST_API_USER - valueFrom: - secretKeyRef: - name: mailman - key: api_user - - name: MAILMAN_REST_API_PASS - valueFrom: - secretKeyRef: - name: mailman - key: api_pass - - name: MAILMAN_ARCHIVER_KEY - valueFrom: - secretKeyRef: - name: mailman - key: archiver_key - - name: MAILMAN_ELASTIC_INDEX - valueFrom: - secretKeyRef: - name: mailman - key: elastic_index - - name: MAILMAN_HAYSTACK_URL - valueFrom: - secretKeyRef: - name: mailman - key: haystack_url + key: core_database - name: CALENDAR_API_KEY valueFrom: secretKeyRef: diff --git a/kube/boost/values.yaml b/kube/boost/values.yaml index c28eab9e..23c8a172 100644 --- a/kube/boost/values.yaml +++ b/kube/boost/values.yaml @@ -139,36 +139,11 @@ Env: secretKeyRef: name: mailgun key: key - - name: MAILMAN_REST_API_URL + - name: MAILMAN_CORE_DATABASE valueFrom: secretKeyRef: name: mailman - key: api_url - - name: MAILMAN_REST_API_USER - valueFrom: - secretKeyRef: - name: mailman - key: api_user - - name: MAILMAN_REST_API_PASS - valueFrom: - secretKeyRef: - name: mailman - key: api_pass - - name: MAILMAN_ARCHIVER_KEY - valueFrom: - secretKeyRef: - name: mailman - key: archiver_key - - name: MAILMAN_ELASTIC_INDEX - valueFrom: - secretKeyRef: - name: mailman - key: elastic_index - - name: MAILMAN_HAYSTACK_URL - valueFrom: - secretKeyRef: - name: mailman - key: haystack_url + key: core_database - name: CALENDAR_API_KEY valueFrom: secretKeyRef: