From 433867d9b799e54a0a2bf86bbe23b0dcb9e49dd7 Mon Sep 17 00:00:00 2001 From: Sonny Bakker Date: Wed, 11 Dec 2024 12:25:29 +0100 Subject: [PATCH] [#467] Prefix sites configuration namespace with project name --- docs/installation/config_cli.rst | 4 ++-- src/objects/setup_configuration/steps/sites.py | 4 ++-- .../setup_configuration/tests/files/sites_empty_database.yaml | 4 ++-- .../setup_configuration/tests/files/sites_existing_sites.yaml | 4 ++-- .../tests/files/sites_idempotent_step.yaml | 4 ++-- .../setup_configuration/tests/files/sites_invalid_domain.yaml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/installation/config_cli.rst b/docs/installation/config_cli.rst index 8cf749c1..a16e69b9 100644 --- a/docs/installation/config_cli.rst +++ b/docs/installation/config_cli.rst @@ -39,8 +39,8 @@ Create or update a (single) YAML configuration file with your settings: .. code-block:: yaml ... - sites_config_enable: true - sites_config: + objects_api_sites_config_enable: true + objects_api_sites_config: items: - domain: example.com name: Example site diff --git a/src/objects/setup_configuration/steps/sites.py b/src/objects/setup_configuration/steps/sites.py index e92c5627..1188226d 100644 --- a/src/objects/setup_configuration/steps/sites.py +++ b/src/objects/setup_configuration/steps/sites.py @@ -12,8 +12,8 @@ class SitesConfigurationStep(BaseConfigurationStep): config_model = SitesConfigurationModel verbose_name = "Sites configuration" - namespace = "sites_config" - enable_setting = "sites_config_enable" + namespace = "objects_api_sites_config" + enable_setting = "objects_api_config_enable" def execute(self, model: SitesConfigurationModel) -> None: for item in model.items: diff --git a/src/objects/setup_configuration/tests/files/sites_empty_database.yaml b/src/objects/setup_configuration/tests/files/sites_empty_database.yaml index 505a3be3..66a9b6c6 100644 --- a/src/objects/setup_configuration/tests/files/sites_empty_database.yaml +++ b/src/objects/setup_configuration/tests/files/sites_empty_database.yaml @@ -1,5 +1,5 @@ -sites_config_enable: true -sites_config: +objects_api_sites_config_enable: true +objects_api_sites_config: items: - domain: example.com name: Example site diff --git a/src/objects/setup_configuration/tests/files/sites_existing_sites.yaml b/src/objects/setup_configuration/tests/files/sites_existing_sites.yaml index 1a873760..605ea0d3 100644 --- a/src/objects/setup_configuration/tests/files/sites_existing_sites.yaml +++ b/src/objects/setup_configuration/tests/files/sites_existing_sites.yaml @@ -1,5 +1,5 @@ -sites_config_enable: true -sites_config: +objects_api_sites_config_enable: true +objects_api_sites_config: items: - domain: example.com name: Example site (revised) diff --git a/src/objects/setup_configuration/tests/files/sites_idempotent_step.yaml b/src/objects/setup_configuration/tests/files/sites_idempotent_step.yaml index 505a3be3..66a9b6c6 100644 --- a/src/objects/setup_configuration/tests/files/sites_idempotent_step.yaml +++ b/src/objects/setup_configuration/tests/files/sites_idempotent_step.yaml @@ -1,5 +1,5 @@ -sites_config_enable: true -sites_config: +objects_api_sites_config_enable: true +objects_api_sites_config: items: - domain: example.com name: Example site diff --git a/src/objects/setup_configuration/tests/files/sites_invalid_domain.yaml b/src/objects/setup_configuration/tests/files/sites_invalid_domain.yaml index ac8fa7ca..48db8bf7 100644 --- a/src/objects/setup_configuration/tests/files/sites_invalid_domain.yaml +++ b/src/objects/setup_configuration/tests/files/sites_invalid_domain.yaml @@ -1,5 +1,5 @@ -sites_config_enable: true -sites_config: +objects_api_sites_config_enable: true +objects_api_sites_config: items: - domain: example.com name: Example site