Skip to content

Commit

Permalink
Fix text and test
Browse files Browse the repository at this point in the history
  • Loading branch information
Tim Bruijnzeels committed Oct 31, 2023
1 parent 3f549c2 commit ff2369b
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 31 deletions.
10 changes: 4 additions & 6 deletions defaults/krill-pubd.conf
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,10 @@
#
# Currently, Krill supports disk based storage only.
#
# You MUST ensure that only one Krill node using this storage is
# active at any given moment. Under the hood, lockfiles are used
# to prevent concurrency issues, and if you should use a shared
# disk then it may not be guaranteed that lockfiles are seen
# by all nodes in time. You can however, use a shared filesystem
# and have one standby node.
# You can use a shared disk and a standby Krill node for redundancy.
# However, data corruption issues can occur if you run multiple active
# Krill nodes using a shared disk. Therefore, you MUST ensure that only
# one Krill node is active at any given time.
#
# Example configurations:
# storage_uri = "/var/lib/krill/data/"
Expand Down
10 changes: 4 additions & 6 deletions defaults/krill-testbed.conf
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,10 @@
#
# Currently, Krill supports disk based storage only.
#
# You MUST ensure that only one Krill node using this storage is
# active at any given moment. Under the hood, lockfiles are used
# to prevent concurrency issues, and if you should use a shared
# disk then it may not be guaranteed that lockfiles are seen
# by all nodes in time. You can however, use a shared filesystem
# and have one standby node.
# You can use a shared disk and a standby Krill node for redundancy.
# However, data corruption issues can occur if you run multiple active
# Krill nodes using a shared disk. Therefore, you MUST ensure that only
# one Krill node is active at any given time.
#
# Example configurations:
# storage_uri = "/var/lib/krill/data/"
Expand Down
10 changes: 4 additions & 6 deletions defaults/krill.conf
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,10 @@
#
# Currently, Krill supports disk based storage only.
#
# You MUST ensure that only one Krill node using this storage is
# active at any given moment. Under the hood, lockfiles are used
# to prevent concurrency issues, and if you should use a shared
# disk then it may not be guaranteed that lockfiles are seen
# by all nodes in time. You can however, use a shared filesystem
# and have one standby node.
# You can use a shared disk and a standby Krill node for redundancy.
# However, data corruption issues can occur if you run multiple active
# Krill nodes using a shared disk. Therefore, you MUST ensure that only
# one Krill node is active at any given time.
#
# Example configurations:
# storage_uri = "/var/lib/krill/data/"
Expand Down
13 changes: 6 additions & 7 deletions test-resources/krill-init-multi-user.conf
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,10 @@
#
# Currently, Krill supports disk based storage only.
#
# You MUST ensure that only one Krill node using this storage is
# active at any given moment. Under the hood, lockfiles are used
# to prevent concurrency issues, and if you should use a shared
# disk then it may not be guaranteed that lockfiles are seen
# by all nodes in time. You can however, use a shared filesystem
# and have one standby node.
# You can use a shared disk and a standby Krill node for redundancy.
# However, data corruption issues can occur if you run multiple active
# Krill nodes using a shared disk. Therefore, you MUST ensure that only
# one Krill node is active at any given time.
#
# Example configurations:
# storage_uri = "/var/lib/krill/data/"
Expand Down Expand Up @@ -464,6 +462,7 @@ service_uri = "https://localhost:3001/"
# timing_roa_reissue_weeks_before = 4



######################################################################################
# #
# ----==== WEB UI MULTI-USER LOGIN CONFIGURATION ====---- #
Expand Down Expand Up @@ -1019,4 +1018,4 @@ service_uri = "https://localhost:3001/"
# Also note that, while not visible in the configuration above, the GCP OpenID
# Connect provider advertizes an RFC 7009 OAuth 2.0 Token Revocation compatible
# `revocation_endpoint` which Krill will use to revoke the Google login token
# when the user logs out of Krill.
# when the user logs out of Krill.
10 changes: 4 additions & 6 deletions test-resources/krill-init.conf
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,10 @@
#
# Currently, Krill supports disk based storage only.
#
# You MUST ensure that only one Krill node using this storage is
# active at any given moment. Under the hood, lockfiles are used
# to prevent concurrency issues, and if you should use a shared
# disk then it may not be guaranteed that lockfiles are seen
# by all nodes in time. You can however, use a shared filesystem
# and have one standby node.
# You can use a shared disk and a standby Krill node for redundancy.
# However, data corruption issues can occur if you run multiple active
# Krill nodes using a shared disk. Therefore, you MUST ensure that only
# one Krill node is active at any given time.
#
# Example configurations:
# storage_uri = "/var/lib/krill/data/"
Expand Down

0 comments on commit ff2369b

Please sign in to comment.