From bc31d42f2288eb050746e28eafb6cfddb730866a Mon Sep 17 00:00:00 2001 From: James Hodgkinson Date: Sun, 22 Aug 2021 16:05:28 +1000 Subject: [PATCH] fixes #571 (#572) --- examples/server.toml | 27 ++++++++++++------------- kanidm_book/src/server_configuration.md | 26 ++++++++++++------------ 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/examples/server.toml b/examples/server.toml index 894bf793d..5c798a551 100644 --- a/examples/server.toml +++ b/examples/server.toml @@ -36,19 +36,6 @@ db_path = "/var/lib/kanidm/kanidm.db" # origin = "https://idm.example.com" origin = "https://idm.example.com:8443" # -# -# [online_backup] -# The path to the output folder for online backups -# path = "/var/lib/kanidm/backups/" -# The schedule to run online backups - see https://crontab.guru/ -# every day at 22:00 UTC (default) -# schedule = "00 22 * * *" -# four times a day at 3 minutes past the hour, every 6th hours -# schedule = "03 */6 * * *" -# Number of backups to keep (default 7) -# versions = 7 -# -# # The role of this server. This affects features available and how replication may interact. # Valid roles are: # - WriteReplica @@ -60,4 +47,16 @@ origin = "https://idm.example.com:8443" # This server will not writes initiated by clients. It supports authentication and reads, # and must have a replication agreement as a source of it's data. # Defaults to "WriteReplica". -# role = "WriteReplica" \ No newline at end of file +# role = "WriteReplica" +# +# [online_backup] +# The path to the output folder for online backups +# path = "/var/lib/kanidm/backups/" +# The schedule to run online backups - see https://crontab.guru/ +# every day at 22:00 UTC (default) +# schedule = "00 22 * * *" +# four times a day at 3 minutes past the hour, every 6th hours +# schedule = "03 */6 * * *" +# Number of backups to keep (default 7) +# versions = 7 +# \ No newline at end of file diff --git a/kanidm_book/src/server_configuration.md b/kanidm_book/src/server_configuration.md index 13ea6750d..a1de2000b 100644 --- a/kanidm_book/src/server_configuration.md +++ b/kanidm_book/src/server_configuration.md @@ -40,19 +40,6 @@ You will also need a config file in the volume named `server.toml` (Within the c # origin = "https://idm.example.com" origin = "https://idm.example.com:8443" # - # - # [online_backup] - # The path to the output folder for online backups - # path = "/var/lib/kanidm/backups/" - # The schedule to run online backups - see https://crontab.guru/ - # every day at 22:00 UTC (default) - # schedule = "00 22 * * *" - # four times a day at 3 minutes past the hour, every 6th hours - # schedule = "03 */6 * * *" - # Number of backups to keep (default 7) - # versions = 7 - # - # # The role of this server. This affects features available and how replication may interact. # Valid roles are: # - WriteReplica @@ -65,6 +52,19 @@ You will also need a config file in the volume named `server.toml` (Within the c # and must have a replication agreement as a source of it's data. # Defaults to "WriteReplica". # role = "WriteReplica" + # + # [online_backup] + # The path to the output folder for online backups + # path = "/var/lib/kanidm/backups/" + # The schedule to run online backups - see https://crontab.guru/ + # every day at 22:00 UTC (default) + # schedule = "00 22 * * *" + # four times a day at 3 minutes past the hour, every 6th hours + # schedule = "03 */6 * * *" + # Number of backups to keep (default 7) + # versions = 7 + # + An example is located in [examples/server.toml](../../examples/server.toml).