diff --git a/arkindex/project/config.py b/arkindex/project/config.py index 3b080878e65518998e01e19cb91f06f8a45dea52..22f292473aef77f570983fde6b68a1aa4bbb2147 100644 --- a/arkindex/project/config.py +++ b/arkindex/project/config.py @@ -128,10 +128,6 @@ def get_settings_parser(base_dir): solr_parser = parser.add_subparser("solr", default={}) solr_parser.add_option("api_url", type=str, default="http://localhost:8983/solr/") - doorbell_parser = parser.add_subparser("doorbell", default={}) - doorbell_parser.add_option("id", type=str, default=None) - doorbell_parser.add_option("appkey", type=str, default=None) - redis_parser = parser.add_subparser("redis", default={}) redis_parser.add_option("host", type=str, default="localhost") redis_parser.add_option("port", type=int, default=6379) diff --git a/arkindex/project/settings.py b/arkindex/project/settings.py index 7bdbc407af14cd2597f793b29a33231b29dfd920..7193787da8d333fc904a44c3ff6ef45d282bf020 100644 --- a/arkindex/project/settings.py +++ b/arkindex/project/settings.py @@ -601,18 +601,11 @@ MIRADOR_URL = conf["static"]["mirador_url"] UNIVERSAL_VIEWER_URL = conf["static"]["universal_viewer_url"] # Feature flags -ARKINDEX_FEATURES = { - **conf["features"], - # Enable doorbell feature if credentials are defined - "doorbell": bool(conf["doorbell"].get("id") and conf["doorbell"].get("appkey")) -} +ARKINDEX_FEATURES = conf["features"] SENTRY_DSN = conf["sentry"]["dsn"] FRONTEND_SENTRY_DSN = conf["sentry"]["frontend_dsn"] -# https://doorbell.io settings -FRONTEND_DOORBELL = conf["doorbell"] - # Banner settings FRONTEND_BANNER = conf["banner"] diff --git a/arkindex/project/tests/config_samples/defaults.yaml b/arkindex/project/tests/config_samples/defaults.yaml index 53561756ef60eb888d018f4293a8557bb5d0df1b..572d3b6ed8f6ee9c976a1d1a3dc18f66fadd9c55 100644 --- a/arkindex/project/tests/config_samples/defaults.yaml +++ b/arkindex/project/tests/config_samples/defaults.yaml @@ -34,9 +34,6 @@ docker: ingest_image: registry.gitlab.teklia.com/arkindex/workers/import:latest init_elements_image: registry.gitlab.teklia.com/arkindex/workers/init-elements:latest tasks_image: registry.gitlab.teklia.com/arkindex/tasks -doorbell: - appkey: null - id: null email: null export: ttl: 21600 diff --git a/arkindex/project/tests/config_samples/override.yaml b/arkindex/project/tests/config_samples/override.yaml index 195040ab00df2ff890316b5f7b00fc393d9d3868..b067a43f4202206a9869e7fbe210dd450beb22a0 100644 --- a/arkindex/project/tests/config_samples/override.yaml +++ b/arkindex/project/tests/config_samples/override.yaml @@ -40,9 +40,6 @@ docker: ingest_image: yrtsiger.baltig.ailket.moc/xednikra/tropmi:tsetal init_elements_image: registry.gitlab.teklia.com/arkindex/entry_plug:latest tasks_image: registry.gitlab.teklia.com/arkindex/stonks -doorbell: - appkey: doorbellappkey - id: '123456' email: error_report_recipients: - noreply@nasa.gov diff --git a/arkindex/project/views.py b/arkindex/project/views.py index 5a7d7aa275d8cc3be0ed91b9faf6c29ee0b0bc30..6ed29a223e9cd26851e9eab1ace5edea861ffc42 100644 --- a/arkindex/project/views.py +++ b/arkindex/project/views.py @@ -28,7 +28,6 @@ class CdnHome(CachedViewMixin, TemplateView): ctx["version"] = settings.VERSION ctx["frontend_version"] = settings.FRONTEND_VERSION ctx["frontend_sentry_dsn"] = settings.FRONTEND_SENTRY_DSN - ctx["frontend_doorbell"] = settings.ARKINDEX_FEATURES["doorbell"] and settings.FRONTEND_DOORBELL ctx["frontend_banner"] = settings.FRONTEND_BANNER return ctx diff --git a/arkindex/templates/index.html b/arkindex/templates/index.html index 827c4310c7de1f20fd7006c52271d619712e6629..bd9d0f593c527fc98b18a73cef9c94b4e61274dd 100644 --- a/arkindex/templates/index.html +++ b/arkindex/templates/index.html @@ -11,10 +11,6 @@ {% if mirador_url %}<meta name="mirador_url" content="{{ mirador_url }}">{% endif %} {% if universal_viewer_url %}<meta name="universal_viewer_url" content="{{ universal_viewer_url }}">{% endif %} {% if frontend_sentry_dsn %}<meta name="sentry_dsn" content="{{ frontend_sentry_dsn }}">{% endif %} - {% if frontend_doorbell %} - <meta name="doorbell_id" content="{{ frontend_doorbell.id }}"> - <meta name="doorbell_appkey" content="{{ frontend_doorbell.appkey }}"> - {% endif %} {% if frontend_banner.message %} <meta name="banner_message" content="{{ frontend_banner.message }}"> <meta name="banner_style" content="{{ frontend_banner.style.value }}">