Skip to content

Commit

Permalink
fixup: envvar drkey epoch ref between router/control, default
Browse files Browse the repository at this point in the history
  • Loading branch information
matzf committed Oct 12, 2023
1 parent d0af2c6 commit 662ec49
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 4 deletions.
6 changes: 5 additions & 1 deletion doc/manuals/control.rst
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ Options
Run :option:`control help completion [shell] <control help>` for usage information on the
autocomplete script for a particular shell.

.. _control-envvars:

Environment variables
---------------------
Expand All @@ -76,7 +77,10 @@ Environment variables
This can only work correctly if the same value is set for all connected control services in the
test network.

The format is a :ref:`duration <control-conf-duration>` with unit suffix (e.g. ``10s``).
Also applies to the :ref:`router <router-envvars>`.

:Type: :ref:`duration <control-conf-duration>`
:Default: ``24h``

Configuration
=============
Expand Down
10 changes: 7 additions & 3 deletions doc/manuals/router.rst
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ Options
Run :option:`router help completion [shell] <router help>` for usage information on the
autocomplete script for a particular shell.

.. _router-envvars:

Environment Variables
---------------------

Expand Down Expand Up @@ -95,9 +97,11 @@ Environment Variables
This option relates :option:`features.experimental_scmp_authentication <router-conf-toml features.experimental_scmp_authentication>`.

Override the global duration for :doc:`/cryptography/drkey` epochs.
This environment variable also applies to :program:`control`, see :envvar:`SCION_TESTING_DRKEY_EPOCH_DURATION`.

:Type: :ref:`duration <control-conf-duration>`
Also applies to the :ref:`control service <control-envvars>`.

:Type: :ref:`duration <common-conf-duration>`
:Default: ``24h``

.. envvar:: SCION_TESTING_ACCEPTANCE_WINDOW

Expand All @@ -108,7 +112,7 @@ Environment Variables
are accepted. See :ref:`SPAO specification <spao-absTime>`.

:Type: :ref:`duration <control-conf-duration>`
:Default: 5m
:Default: ``5m``


Configuration
Expand Down

0 comments on commit 662ec49

Please sign in to comment.