From 2c42464fc864a513c09ac4de372b5534791c9e5f Mon Sep 17 00:00:00 2001 From: James Elliott Date: Tue, 8 Jun 2021 23:15:43 +1000 Subject: [PATCH] refactor(configuration): use key log instead of logging (#2072) * refactor: logging config key to log This refactors the recent pre-release change adding log options to their own configuration section in favor of a log section (from logging). * docs: add step to getting started to get the latest tagged commit This is so we avoid issues with changes on master having differences that don't work on the latest docker tag. * test: adjust tests * docs: adjust doc strings --- config.template.yml | 5 +++-- docs/configuration/logging.md | 10 +++++----- docs/getting-started.md | 1 + examples/compose/lite/authelia/configuration.yml | 2 +- .../compose/local/authelia/configuration.yml | 2 +- internal/configuration/config.template.yml | 5 +++-- internal/configuration/reader_test.go | 4 ++-- internal/configuration/schema/configuration.go | 2 +- internal/configuration/schema/logging.go | 6 +++--- internal/configuration/test_resources/config.yml | 3 ++- .../configuration/test_resources/config_alt.yml | 3 ++- .../test_resources/config_bad_keys.yml | 1 + .../test_resources/config_bad_quoting.yml | 3 ++- .../test_resources/config_with_secret.yml | 3 ++- internal/configuration/validator/const.go | 14 +++++++------- internal/configuration/validator/keys_test.go | 4 ++-- internal/configuration/validator/logging.go | 6 +++--- internal/configuration/validator/logging_test.go | 16 ++++++++-------- .../suites/ActiveDirectory/configuration.yml | 2 +- internal/suites/BypassAll/configuration.yml | 2 +- internal/suites/CLI/configuration.yml | 2 +- internal/suites/Docker/configuration.yml | 2 +- internal/suites/DuoPush/configuration.yml | 2 +- internal/suites/HAProxy/configuration.yml | 2 +- .../suites/HighAvailability/configuration.yml | 2 +- internal/suites/LDAP/configuration.yml | 2 +- internal/suites/Mariadb/configuration.yml | 2 +- internal/suites/MySQL/configuration.yml | 2 +- internal/suites/NetworkACL/configuration.yml | 2 +- internal/suites/OIDC/configuration.yml | 2 +- internal/suites/OIDCTraefik/configuration.yml | 2 +- internal/suites/OneFactorOnly/configuration.yml | 2 +- internal/suites/PathPrefix/configuration.yml | 2 +- internal/suites/Postgres/configuration.yml | 2 +- internal/suites/ShortTimeouts/configuration.yml | 2 +- internal/suites/Standalone/configuration.yml | 2 +- internal/suites/Traefik/configuration.yml | 2 +- internal/suites/Traefik2/configuration.yml | 2 +- .../kube/authelia/configs/configuration.yml | 2 +- 39 files changed, 70 insertions(+), 62 deletions(-) diff --git a/config.template.yml b/config.template.yml index 72f077b2..74ae25dc 100644 --- a/config.template.yml +++ b/config.template.yml @@ -30,6 +30,7 @@ server: ## Write buffer size does the same for outgoing responses. read_buffer_size: 4096 write_buffer_size: 4096 + ## Set the single level path Authelia listens on. ## Must be alphanumeric chars and should not contain any slashes. path: "" @@ -40,8 +41,8 @@ server: ## Enables the expvars endpoint. enable_expvars: false -## Level of verbosity for logs: info, debug, trace. -logging: +log: + ## Level of verbosity for logs: info, debug, trace. level: debug ## Format the logs are written as: json, text. diff --git a/docs/configuration/logging.md b/docs/configuration/logging.md index 3407e563..dc074788 100644 --- a/docs/configuration/logging.md +++ b/docs/configuration/logging.md @@ -12,7 +12,7 @@ The logging section tunes the logging settings. ## Configuration ```yaml -logging: +log: level: info format: text file_path: "" @@ -36,7 +36,7 @@ setting level to `trace`, you will generate a large amount of log entries and ex `/debug/pprof/` endpoints which should not be enabled in production. ```yaml -logging: +log: level: debug ``` @@ -53,7 +53,7 @@ required: no Defines the format of the logs written by Authelia. This format can be set to `json` or `text`. ```yaml -logging: +log: format: json ``` @@ -83,7 +83,7 @@ level to `debug` or `trace` this will generate large amount of log entries. Admi they rotate and/or truncate the logs over time to prevent significant long-term disk usage. ```yaml -logging: +log: file_path: /config/authelia.log ``` @@ -101,6 +101,6 @@ Overrides the behaviour to redirect logging only to the `file_path`. If set to ` standard output, and the defined logging location. ```yaml -logging: +log: keep_stdout: true ``` \ No newline at end of file diff --git a/docs/getting-started.md b/docs/getting-started.md index 0bb0a89d..690379c4 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -14,6 +14,7 @@ These commands are intended to be run sequentially: - `git clone https://github.com/authelia/authelia.git` - `cd authelia/examples/compose/local` +- ``git checkout $(git describe --tags `git rev-list --tags --max-count=1`)`` - `sudo ./setup.sh` *sudo is required to modify the `/etc/hosts` file* You can now visit the following locations; replace example.com with the domain you specified in the setup script: diff --git a/examples/compose/lite/authelia/configuration.yml b/examples/compose/lite/authelia/configuration.yml index fe4a3c4c..39aa9fc2 100644 --- a/examples/compose/lite/authelia/configuration.yml +++ b/examples/compose/lite/authelia/configuration.yml @@ -5,7 +5,7 @@ host: 0.0.0.0 port: 9091 -logging: +log: level: debug # This secret can also be set using the env variables AUTHELIA_JWT_SECRET_FILE jwt_secret: a_very_important_secret diff --git a/examples/compose/local/authelia/configuration.yml b/examples/compose/local/authelia/configuration.yml index 8f89c2bf..3d408620 100644 --- a/examples/compose/local/authelia/configuration.yml +++ b/examples/compose/local/authelia/configuration.yml @@ -5,7 +5,7 @@ host: 0.0.0.0 port: 9091 -logging: +log: level: debug jwt_secret: a_very_important_secret default_redirection_url: https://public.example.com diff --git a/internal/configuration/config.template.yml b/internal/configuration/config.template.yml index 72f077b2..74ae25dc 100644 --- a/internal/configuration/config.template.yml +++ b/internal/configuration/config.template.yml @@ -30,6 +30,7 @@ server: ## Write buffer size does the same for outgoing responses. read_buffer_size: 4096 write_buffer_size: 4096 + ## Set the single level path Authelia listens on. ## Must be alphanumeric chars and should not contain any slashes. path: "" @@ -40,8 +41,8 @@ server: ## Enables the expvars endpoint. enable_expvars: false -## Level of verbosity for logs: info, debug, trace. -logging: +log: + ## Level of verbosity for logs: info, debug, trace. level: debug ## Format the logs are written as: json, text. diff --git a/internal/configuration/reader_test.go b/internal/configuration/reader_test.go index cd08c7fc..aa2e5ecd 100644 --- a/internal/configuration/reader_test.go +++ b/internal/configuration/reader_test.go @@ -164,7 +164,7 @@ func TestShouldErrorParseBadConfigFile(t *testing.T) { require.Len(t, errors, 1) - require.EqualError(t, errors[0], "Error malformed yaml: line 25: did not find expected alphabetic or numeric character") + require.EqualError(t, errors[0], "Error malformed yaml: line 26: did not find expected alphabetic or numeric character") } func TestShouldParseConfigFile(t *testing.T) { @@ -253,7 +253,7 @@ func TestShouldNotParseConfigFileWithOldOrUnexpectedKeys(t *testing.T) { return errors[i].Error() < errors[j].Error() }) assert.EqualError(t, errors[0], "config key not expected: loggy_file") - assert.EqualError(t, errors[1], "invalid configuration key 'logs_level' was replaced by 'logging.level'") + assert.EqualError(t, errors[1], "invalid configuration key 'logs_level' was replaced by 'log.level'") } func TestShouldValidateConfigurationTemplate(t *testing.T) { diff --git a/internal/configuration/schema/configuration.go b/internal/configuration/schema/configuration.go index e65c37ca..5c423bc8 100644 --- a/internal/configuration/schema/configuration.go +++ b/internal/configuration/schema/configuration.go @@ -17,7 +17,7 @@ type Configuration struct { LogFilePath string `mapstructure:"log_file_path"` // TODO: DEPRECATED END. Remove in 4.33.0. - Logging LoggingConfiguration `mapstructure:"logging"` + Logging LogConfiguration `mapstructure:"log"` IdentityProviders IdentityProvidersConfiguration `mapstructure:"identity_providers"` AuthenticationBackend AuthenticationBackendConfiguration `mapstructure:"authentication_backend"` Session SessionConfiguration `mapstructure:"session"` diff --git a/internal/configuration/schema/logging.go b/internal/configuration/schema/logging.go index a6f6b0fb..81e38c2a 100644 --- a/internal/configuration/schema/logging.go +++ b/internal/configuration/schema/logging.go @@ -1,7 +1,7 @@ package schema -// LoggingConfiguration represents the logging configuration. -type LoggingConfiguration struct { +// LogConfiguration represents the logging configuration. +type LogConfiguration struct { Level string `mapstructure:"level"` Format string `mapstructure:"format"` FilePath string `mapstructure:"file_path"` @@ -9,7 +9,7 @@ type LoggingConfiguration struct { } // DefaultLoggingConfiguration is the default logging configuration. -var DefaultLoggingConfiguration = LoggingConfiguration{ +var DefaultLoggingConfiguration = LogConfiguration{ Level: "info", Format: "text", } diff --git a/internal/configuration/test_resources/config.yml b/internal/configuration/test_resources/config.yml index 647d8829..854a9dcb 100644 --- a/internal/configuration/test_resources/config.yml +++ b/internal/configuration/test_resources/config.yml @@ -2,8 +2,9 @@ host: 127.0.0.1 port: 9091 -logging: +log: level: debug + default_redirection_url: https://home.example.com:8080/ totp: diff --git a/internal/configuration/test_resources/config_alt.yml b/internal/configuration/test_resources/config_alt.yml index 3218b354..b128922a 100644 --- a/internal/configuration/test_resources/config_alt.yml +++ b/internal/configuration/test_resources/config_alt.yml @@ -2,8 +2,9 @@ host: 127.0.0.1 port: 9091 -logging: +log: level: debug + default_redirection_url: https://home.example.com:8080/ totp: diff --git a/internal/configuration/test_resources/config_bad_keys.yml b/internal/configuration/test_resources/config_bad_keys.yml index ea559510..a7822b99 100644 --- a/internal/configuration/test_resources/config_bad_keys.yml +++ b/internal/configuration/test_resources/config_bad_keys.yml @@ -4,6 +4,7 @@ port: 9091 loggy_file: /config/svc.log logs_level: debug + default_redirection_url: https://home.example.com:8080/ totp: diff --git a/internal/configuration/test_resources/config_bad_quoting.yml b/internal/configuration/test_resources/config_bad_quoting.yml index 79adaccc..0a6f88a3 100644 --- a/internal/configuration/test_resources/config_bad_quoting.yml +++ b/internal/configuration/test_resources/config_bad_quoting.yml @@ -1,7 +1,8 @@ --- host: 0.0.0.0 port: 9091 -logging: + +log: level: debug jwt_secret: RUtG9TnbXrOl1XLLmDgySw1DGgx9QcrtepIf1uDDBlBVKFZxkVBruYKBi32PvaU diff --git a/internal/configuration/test_resources/config_with_secret.yml b/internal/configuration/test_resources/config_with_secret.yml index 8256a95f..df096e4b 100644 --- a/internal/configuration/test_resources/config_with_secret.yml +++ b/internal/configuration/test_resources/config_with_secret.yml @@ -3,8 +3,9 @@ host: 127.0.0.1 port: 9091 jwt_secret: secret_from_config -logging: +log: level: debug + default_redirection_url: https://home.example.com:8080/ totp: diff --git a/internal/configuration/validator/const.go b/internal/configuration/validator/const.go index 7085ef65..ba1cabe0 100644 --- a/internal/configuration/validator/const.go +++ b/internal/configuration/validator/const.go @@ -78,11 +78,11 @@ var validKeys = []string{ "tls_cert", "certificates_directory", - // Logging keys. - "logging.level", - "logging.format", - "logging.file_path", - "logging.keep_stdout", + // Log keys. + "log.level", + "log.format", + "log.file_path", + "log.keep_stdout", // TODO: DEPRECATED START. Remove in 4.33.0. "log_level", @@ -217,8 +217,8 @@ var replacedKeys = map[string]string{ "authentication_backend.ldap.skip_verify": "authentication_backend.ldap.tls.skip_verify", "authentication_backend.ldap.minimum_tls_version": "authentication_backend.ldap.tls.minimum_version", "notifier.smtp.disable_verify_cert": "notifier.smtp.tls.skip_verify", - "logs_file_path": "logging.file_path", - "logs_level": "logging.level", + "logs_file_path": "log.file_path", + "logs_level": "log.level", } var specificErrorKeys = map[string]string{ diff --git a/internal/configuration/validator/keys_test.go b/internal/configuration/validator/keys_test.go index 348a0399..c34812c1 100644 --- a/internal/configuration/validator/keys_test.go +++ b/internal/configuration/validator/keys_test.go @@ -106,8 +106,8 @@ func TestReplacedErrors(t *testing.T) { assert.EqualError(t, errs[0], fmt.Sprintf(errFmtReplacedConfigurationKey, "authentication_backend.ldap.skip_verify", "authentication_backend.ldap.tls.skip_verify")) assert.EqualError(t, errs[1], fmt.Sprintf(errFmtReplacedConfigurationKey, "authentication_backend.ldap.minimum_tls_version", "authentication_backend.ldap.tls.minimum_version")) assert.EqualError(t, errs[2], fmt.Sprintf(errFmtReplacedConfigurationKey, "notifier.smtp.disable_verify_cert", "notifier.smtp.tls.skip_verify")) - assert.EqualError(t, errs[3], fmt.Sprintf(errFmtReplacedConfigurationKey, "logs_file_path", "logging.file_path")) - assert.EqualError(t, errs[4], fmt.Sprintf(errFmtReplacedConfigurationKey, "logs_level", "logging.level")) + assert.EqualError(t, errs[3], fmt.Sprintf(errFmtReplacedConfigurationKey, "logs_file_path", "log.file_path")) + assert.EqualError(t, errs[4], fmt.Sprintf(errFmtReplacedConfigurationKey, "logs_level", "log.level")) } func TestSecretKeysDontRaiseErrors(t *testing.T) { diff --git a/internal/configuration/validator/logging.go b/internal/configuration/validator/logging.go index d41c6edc..e1a2704d 100644 --- a/internal/configuration/validator/logging.go +++ b/internal/configuration/validator/logging.go @@ -28,7 +28,7 @@ func ValidateLogging(configuration *schema.Configuration, validator *schema.Stru // TODO: DEPRECATED FUNCTION. Remove in 4.33.0. func applyDeprecatedLoggingConfiguration(configuration *schema.Configuration, validator *schema.StructValidator) { if configuration.LogLevel != "" { - validator.PushWarning(fmt.Errorf(errFmtDeprecatedConfigurationKey, "log_level", "4.33.0", "logging.level")) + validator.PushWarning(fmt.Errorf(errFmtDeprecatedConfigurationKey, "log_level", "4.33.0", "log.level")) if configuration.Logging.Level == "" { configuration.Logging.Level = configuration.LogLevel @@ -36,7 +36,7 @@ func applyDeprecatedLoggingConfiguration(configuration *schema.Configuration, va } if configuration.LogFormat != "" { - validator.PushWarning(fmt.Errorf(errFmtDeprecatedConfigurationKey, "log_format", "4.33.0", "logging.format")) + validator.PushWarning(fmt.Errorf(errFmtDeprecatedConfigurationKey, "log_format", "4.33.0", "log.format")) if configuration.Logging.Format == "" { configuration.Logging.Format = configuration.LogFormat @@ -44,7 +44,7 @@ func applyDeprecatedLoggingConfiguration(configuration *schema.Configuration, va } if configuration.LogFilePath != "" { - validator.PushWarning(fmt.Errorf(errFmtDeprecatedConfigurationKey, "log_file_path", "4.33.0", "logging.file_path")) + validator.PushWarning(fmt.Errorf(errFmtDeprecatedConfigurationKey, "log_file_path", "4.33.0", "log.file_path")) if configuration.Logging.FilePath == "" { configuration.Logging.FilePath = configuration.LogFilePath diff --git a/internal/configuration/validator/logging_test.go b/internal/configuration/validator/logging_test.go index 75739b70..49ba9c71 100644 --- a/internal/configuration/validator/logging_test.go +++ b/internal/configuration/validator/logging_test.go @@ -33,7 +33,7 @@ func TestShouldSetDefaultLoggingValues(t *testing.T) { func TestShouldRaiseErrorOnInvalidLoggingLevel(t *testing.T) { config := &schema.Configuration{ - Logging: schema.LoggingConfiguration{ + Logging: schema.LogConfiguration{ Level: "TRACE", }, } @@ -73,14 +73,14 @@ func TestShouldMigrateDeprecatedLoggingConfig(t *testing.T) { assert.Equal(t, "json", config.Logging.Format) assert.Equal(t, "/a/b/c", config.Logging.FilePath) - assert.EqualError(t, validator.Warnings()[0], fmt.Sprintf(errFmtDeprecatedConfigurationKey, "log_level", "4.33.0", "logging.level")) - assert.EqualError(t, validator.Warnings()[1], fmt.Sprintf(errFmtDeprecatedConfigurationKey, "log_format", "4.33.0", "logging.format")) - assert.EqualError(t, validator.Warnings()[2], fmt.Sprintf(errFmtDeprecatedConfigurationKey, "log_file_path", "4.33.0", "logging.file_path")) + assert.EqualError(t, validator.Warnings()[0], fmt.Sprintf(errFmtDeprecatedConfigurationKey, "log_level", "4.33.0", "log.level")) + assert.EqualError(t, validator.Warnings()[1], fmt.Sprintf(errFmtDeprecatedConfigurationKey, "log_format", "4.33.0", "log.format")) + assert.EqualError(t, validator.Warnings()[2], fmt.Sprintf(errFmtDeprecatedConfigurationKey, "log_file_path", "4.33.0", "log.file_path")) } func TestShouldRaiseErrorsAndNotOverwriteConfigurationWhenUsingDeprecatedLoggingConfig(t *testing.T) { config := &schema.Configuration{ - Logging: schema.LoggingConfiguration{ + Logging: schema.LogConfiguration{ Level: "info", Format: "text", FilePath: "/x/y/z", @@ -105,7 +105,7 @@ func TestShouldRaiseErrorsAndNotOverwriteConfigurationWhenUsingDeprecatedLogging assert.Len(t, validator.Errors(), 0) require.Len(t, validator.Warnings(), 3) - assert.EqualError(t, validator.Warnings()[0], fmt.Sprintf(errFmtDeprecatedConfigurationKey, "log_level", "4.33.0", "logging.level")) - assert.EqualError(t, validator.Warnings()[1], fmt.Sprintf(errFmtDeprecatedConfigurationKey, "log_format", "4.33.0", "logging.format")) - assert.EqualError(t, validator.Warnings()[2], fmt.Sprintf(errFmtDeprecatedConfigurationKey, "log_file_path", "4.33.0", "logging.file_path")) + assert.EqualError(t, validator.Warnings()[0], fmt.Sprintf(errFmtDeprecatedConfigurationKey, "log_level", "4.33.0", "log.level")) + assert.EqualError(t, validator.Warnings()[1], fmt.Sprintf(errFmtDeprecatedConfigurationKey, "log_format", "4.33.0", "log.format")) + assert.EqualError(t, validator.Warnings()[2], fmt.Sprintf(errFmtDeprecatedConfigurationKey, "log_file_path", "4.33.0", "log.file_path")) } diff --git a/internal/suites/ActiveDirectory/configuration.yml b/internal/suites/ActiveDirectory/configuration.yml index e002ebe8..ed32eaa5 100644 --- a/internal/suites/ActiveDirectory/configuration.yml +++ b/internal/suites/ActiveDirectory/configuration.yml @@ -9,7 +9,7 @@ tls_key: /config/ssl/key.pem theme: grey -logging: +log: level: debug default_redirection_url: https://home.example.com:8080/ diff --git a/internal/suites/BypassAll/configuration.yml b/internal/suites/BypassAll/configuration.yml index a5713533..5c4afdc5 100644 --- a/internal/suites/BypassAll/configuration.yml +++ b/internal/suites/BypassAll/configuration.yml @@ -7,7 +7,7 @@ port: 9091 tls_cert: /config/ssl/cert.pem tls_key: /config/ssl/key.pem -logging: +log: level: debug jwt_secret: unsecure_secret diff --git a/internal/suites/CLI/configuration.yml b/internal/suites/CLI/configuration.yml index 07ee1db1..4d9f244f 100644 --- a/internal/suites/CLI/configuration.yml +++ b/internal/suites/CLI/configuration.yml @@ -7,7 +7,7 @@ port: 9091 tls_cert: /config/ssl/cert.pem tls_key: /config/ssl/key.pem -logging: +log: level: debug jwt_secret: unsecure_secret diff --git a/internal/suites/Docker/configuration.yml b/internal/suites/Docker/configuration.yml index 8d1eee1c..d0476e67 100644 --- a/internal/suites/Docker/configuration.yml +++ b/internal/suites/Docker/configuration.yml @@ -7,7 +7,7 @@ port: 9091 tls_cert: /config/ssl/cert.pem tls_key: /config/ssl/key.pem -logging: +log: level: debug default_redirection_url: https://home.example.com:8080/ diff --git a/internal/suites/DuoPush/configuration.yml b/internal/suites/DuoPush/configuration.yml index bfa8d8d5..dc7ed1f5 100644 --- a/internal/suites/DuoPush/configuration.yml +++ b/internal/suites/DuoPush/configuration.yml @@ -7,7 +7,7 @@ port: 9091 tls_cert: /config/ssl/cert.pem tls_key: /config/ssl/key.pem -logging: +log: level: trace default_redirection_url: https://home.example.com:8080/ diff --git a/internal/suites/HAProxy/configuration.yml b/internal/suites/HAProxy/configuration.yml index eef61d8e..09e61b84 100644 --- a/internal/suites/HAProxy/configuration.yml +++ b/internal/suites/HAProxy/configuration.yml @@ -7,7 +7,7 @@ port: 9091 tls_cert: /config/ssl/cert.pem tls_key: /config/ssl/key.pem -logging: +log: level: debug jwt_secret: unsecure_secret diff --git a/internal/suites/HighAvailability/configuration.yml b/internal/suites/HighAvailability/configuration.yml index 7e15edff..985297c3 100644 --- a/internal/suites/HighAvailability/configuration.yml +++ b/internal/suites/HighAvailability/configuration.yml @@ -7,7 +7,7 @@ port: 9091 tls_cert: /config/ssl/cert.pem tls_key: /config/ssl/key.pem -logging: +log: level: debug jwt_secret: unsecure_secret diff --git a/internal/suites/LDAP/configuration.yml b/internal/suites/LDAP/configuration.yml index e9e3f6ce..6cbfd566 100644 --- a/internal/suites/LDAP/configuration.yml +++ b/internal/suites/LDAP/configuration.yml @@ -9,7 +9,7 @@ tls_key: /config/ssl/key.pem theme: dark -logging: +log: level: debug default_redirection_url: https://home.example.com:8080/ diff --git a/internal/suites/Mariadb/configuration.yml b/internal/suites/Mariadb/configuration.yml index 83366bb4..40914e69 100644 --- a/internal/suites/Mariadb/configuration.yml +++ b/internal/suites/Mariadb/configuration.yml @@ -7,7 +7,7 @@ port: 9091 tls_cert: /config/ssl/cert.pem tls_key: /config/ssl/key.pem -logging: +log: level: debug default_redirection_url: https://home.example.com:8080/ diff --git a/internal/suites/MySQL/configuration.yml b/internal/suites/MySQL/configuration.yml index 13d134ec..36c89591 100644 --- a/internal/suites/MySQL/configuration.yml +++ b/internal/suites/MySQL/configuration.yml @@ -7,7 +7,7 @@ port: 9091 tls_cert: /config/ssl/cert.pem tls_key: /config/ssl/key.pem -logging: +log: level: debug default_redirection_url: https://home.example.com:8080/ diff --git a/internal/suites/NetworkACL/configuration.yml b/internal/suites/NetworkACL/configuration.yml index 8ff6e86f..59ee9295 100644 --- a/internal/suites/NetworkACL/configuration.yml +++ b/internal/suites/NetworkACL/configuration.yml @@ -7,7 +7,7 @@ port: 9091 tls_cert: /config/ssl/cert.pem tls_key: /config/ssl/key.pem -logging: +log: level: debug jwt_secret: unsecure_password diff --git a/internal/suites/OIDC/configuration.yml b/internal/suites/OIDC/configuration.yml index b8fb200e..39c551d9 100644 --- a/internal/suites/OIDC/configuration.yml +++ b/internal/suites/OIDC/configuration.yml @@ -3,7 +3,7 @@ port: 9091 tls_cert: /config/ssl/cert.pem tls_key: /config/ssl/key.pem -logging: +log: level: debug jwt_secret: unsecure_secret diff --git a/internal/suites/OIDCTraefik/configuration.yml b/internal/suites/OIDCTraefik/configuration.yml index d486bed4..eca28965 100644 --- a/internal/suites/OIDCTraefik/configuration.yml +++ b/internal/suites/OIDCTraefik/configuration.yml @@ -3,7 +3,7 @@ port: 9091 tls_cert: /config/ssl/cert.pem tls_key: /config/ssl/key.pem -logging: +log: level: debug jwt_secret: unsecure_secret diff --git a/internal/suites/OneFactorOnly/configuration.yml b/internal/suites/OneFactorOnly/configuration.yml index fc27b993..d3de0083 100644 --- a/internal/suites/OneFactorOnly/configuration.yml +++ b/internal/suites/OneFactorOnly/configuration.yml @@ -7,7 +7,7 @@ port: 9091 tls_cert: /config/ssl/cert.pem tls_key: /config/ssl/key.pem -logging: +log: level: debug default_redirection_url: https://home.example.com:8080/ diff --git a/internal/suites/PathPrefix/configuration.yml b/internal/suites/PathPrefix/configuration.yml index 6f86ae37..d973e5ba 100644 --- a/internal/suites/PathPrefix/configuration.yml +++ b/internal/suites/PathPrefix/configuration.yml @@ -10,7 +10,7 @@ tls_key: /config/ssl/key.pem server: path: auth -logging: +log: level: debug jwt_secret: unsecure_secret diff --git a/internal/suites/Postgres/configuration.yml b/internal/suites/Postgres/configuration.yml index eea9fc1f..e2f789b0 100644 --- a/internal/suites/Postgres/configuration.yml +++ b/internal/suites/Postgres/configuration.yml @@ -7,7 +7,7 @@ port: 9091 tls_cert: /config/ssl/cert.pem tls_key: /config/ssl/key.pem -logging: +log: level: debug default_redirection_url: https://home.example.com:8080/ diff --git a/internal/suites/ShortTimeouts/configuration.yml b/internal/suites/ShortTimeouts/configuration.yml index 62063fe7..953de5f3 100644 --- a/internal/suites/ShortTimeouts/configuration.yml +++ b/internal/suites/ShortTimeouts/configuration.yml @@ -7,7 +7,7 @@ port: 9091 tls_cert: /config/ssl/cert.pem tls_key: /config/ssl/key.pem -logging: +log: level: debug jwt_secret: unsecure_secret diff --git a/internal/suites/Standalone/configuration.yml b/internal/suites/Standalone/configuration.yml index 845b8b31..4abbf13a 100644 --- a/internal/suites/Standalone/configuration.yml +++ b/internal/suites/Standalone/configuration.yml @@ -7,7 +7,7 @@ port: 9091 tls_cert: /config/ssl/cert.pem tls_key: /config/ssl/key.pem -logging: +log: level: debug authentication_backend: diff --git a/internal/suites/Traefik/configuration.yml b/internal/suites/Traefik/configuration.yml index eef61d8e..09e61b84 100644 --- a/internal/suites/Traefik/configuration.yml +++ b/internal/suites/Traefik/configuration.yml @@ -7,7 +7,7 @@ port: 9091 tls_cert: /config/ssl/cert.pem tls_key: /config/ssl/key.pem -logging: +log: level: debug jwt_secret: unsecure_secret diff --git a/internal/suites/Traefik2/configuration.yml b/internal/suites/Traefik2/configuration.yml index 94bfd4e9..79df8f6b 100644 --- a/internal/suites/Traefik2/configuration.yml +++ b/internal/suites/Traefik2/configuration.yml @@ -7,7 +7,7 @@ port: 9091 tls_cert: /config/ssl/cert.pem tls_key: /config/ssl/key.pem -logging: +log: level: debug jwt_secret: unsecure_secret diff --git a/internal/suites/example/kube/authelia/configs/configuration.yml b/internal/suites/example/kube/authelia/configs/configuration.yml index bf9fc50e..362effa8 100644 --- a/internal/suites/example/kube/authelia/configs/configuration.yml +++ b/internal/suites/example/kube/authelia/configs/configuration.yml @@ -7,7 +7,7 @@ port: 443 tls_cert: /config/ssl/cert.pem tls_key: /config/ssl/key.pem -logging: +log: level: debug default_redirection_url: https://home.example.com:8080