Skip to content

Commit 910c7ff

Browse files
authored
Merge pull request #188 from open-zaak/feature/config-steps-disable
disable config steps by default
2 parents 734fcaf + b97b389 commit 910c7ff

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

docs/installation/configuration/opennotifs_config_cli.rst

+4-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Sites configuration
3535

3636
Configure the domain where Open Notificaties is hosted
3737

38-
* ``SITES_CONFIG_ENABLE``: enable Site configuration. Defaults to ``True``.
38+
* ``SITES_CONFIG_ENABLE``: enable Site configuration. Defaults to ``False``.
3939
* ``OPENNOTIFICATIES_DOMAIN``: a ``[host]:[port]`` or ``[host]`` value. Required.
4040
* ``OPENNOTIFICATIES_ORGANIZATION``: name of Open Notificaties organization. Required.
4141

@@ -47,7 +47,7 @@ of its consumers, therefore Open Notificaties should be able to request Open Zaa
4747
Make sure that the correct permissions are configured in Open Zaak Autorisaties API.
4848

4949
* ``AUTHORIZATION_CONFIG_ENABLE``: enable Authorization configuration. Defaults
50-
to ``True``.
50+
to ``False``.
5151
* ``AUTORISATIES_API_ROOT``: full URL to the Authorisaties API root, for example
5252
``https://open-zaak.gemeente.local/autorisaties/api/v1/``. Required.
5353
* ``NOTIF_OPENZAAK_CLIENT_ID``: a client id, which Open Notificaties uses to request
@@ -60,7 +60,7 @@ Open Zaak authentication configuration
6060
Open Zaak published notifications to the Open Notificaties, therefore it should have access.
6161
Make sure that the correct permissions are configured in Open Zaak Autorisaties API.
6262

63-
* ``OPENZAAK_NOTIF_CONFIG_ENABLE``: enable Open Zaak configuration. Defaults to ``True``.
63+
* ``OPENZAAK_NOTIF_CONFIG_ENABLE``: enable Open Zaak configuration. Defaults to ``False``.
6464
* ``OPENZAAK_NOTIF_CLIENT_ID``: a client id, which Open Zaak uses to request Open Notificaties,
6565
for example, ``open-zaak``. Required.
6666
* ``OPENZAAK_NOTIF_SECRET``: some random string. Required.
@@ -72,6 +72,7 @@ Open Notifications has a retry mechanism to guarantee notification delivery, thi
7272
is described in :ref:`delivery_guarantees`. The parameters for this behavior can be configured via the
7373
following environment variables.
7474

75+
* ``NOTIFICATION_RETRY_CONFIG_ENABLE``: enable Notification retry configuration. Defaults to ``False``.
7576
* ``NOTIFICATION_DELIVERY_MAX_RETRIES``: the maximum number of retries Celery will do if sending a notification failed.
7677
* ``NOTIFICATION_DELIVERY_RETRY_BACKOFF``: a boolean or a number. If this option is set to
7778
``True``, autoretries will be delayed following the rules of exponential backoff. If

src/nrc/conf/includes/base.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -160,29 +160,29 @@
160160

161161
# Settings for setup_configuration command
162162
# sites config
163-
SITES_CONFIG_ENABLE = config("SITES_CONFIG_ENABLE", default=True, add_to_docs=False)
163+
SITES_CONFIG_ENABLE = config("SITES_CONFIG_ENABLE", default=False, add_to_docs=False)
164164
OPENNOTIFICATIES_DOMAIN = config("OPENNOTIFICATIES_DOMAIN", "", add_to_docs=False)
165165
OPENNOTIFICATIES_ORGANIZATION = config(
166166
"OPENNOTIFICATIES_ORGANIZATION", "", add_to_docs=False
167167
)
168168
# notif -> OZ auth config
169169
AUTHORIZATION_CONFIG_ENABLE = config(
170-
"AUTHORIZATION_CONFIG_ENABLE", default=True, add_to_docs=False
170+
"AUTHORIZATION_CONFIG_ENABLE", default=False, add_to_docs=False
171171
)
172172
AUTORISATIES_API_ROOT = config("AUTORISATIES_API_ROOT", "", add_to_docs=False)
173173
NOTIF_OPENZAAK_CLIENT_ID = config("NOTIF_OPENZAAK_CLIENT_ID", "", add_to_docs=False)
174174
NOTIF_OPENZAAK_SECRET = config("NOTIF_OPENZAAK_SECRET", "", add_to_docs=False)
175175
# OZ -> notif config
176176
OPENZAAK_NOTIF_CONFIG_ENABLE = config(
177-
"OPENZAAK_NOTIF_CONFIG_ENABLE", default=True, add_to_docs=False
177+
"OPENZAAK_NOTIF_CONFIG_ENABLE", default=False, add_to_docs=False
178178
)
179179
OPENZAAK_NOTIF_CLIENT_ID = config("OPENZAAK_NOTIF_CLIENT_ID", "", add_to_docs=False)
180180
OPENZAAK_NOTIF_SECRET = config("OPENZAAK_NOTIF_SECRET", "", add_to_docs=False)
181181

182182
# setup configuration for Notification retry
183183
# Retry settings for delivering notifications to subscriptions
184184
NOTIFICATION_RETRY_CONFIG_ENABLE = config(
185-
"NOTIFICATION_RETRY_CONFIG_ENABLE", default=True, add_to_docs=False
185+
"NOTIFICATION_RETRY_CONFIG_ENABLE", default=False, add_to_docs=False
186186
)
187187
NOTIFICATION_DELIVERY_MAX_RETRIES = config(
188188
"NOTIFICATION_DELIVERY_MAX_RETRIES", None, add_to_docs=False

src/nrc/tests/commands/test_setup_configuration.py

+4
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,17 @@
2121

2222

2323
@override_settings(
24+
SITES_CONFIG_ENABLE=True,
2425
OPENNOTIFICATIES_DOMAIN="open-notificaties.example.com",
2526
OPENNOTIFICATIES_ORGANIZATION="ACME",
27+
AUTHORIZATION_CONFIG_ENABLE=True,
2628
AUTORISATIES_API_ROOT="https://oz.example.com/autorisaties/api/v1/",
2729
NOTIF_OPENZAAK_CLIENT_ID="notif-client-id",
2830
NOTIF_OPENZAAK_SECRET="notif-secret",
31+
OPENZAAK_NOTIF_CONFIG_ENABLE=True,
2932
OPENZAAK_NOTIF_CLIENT_ID="oz-client-id",
3033
OPENZAAK_NOTIF_SECRET="oz-secret",
34+
NOTIFICATION_RETRY_CONFIG_ENABLE=True,
3135
)
3236
class SetupConfigurationTests(TestCase):
3337
maxDiff = None

0 commit comments

Comments
 (0)