From 755c56cf6ec61ae83493a73f665f6228f81e0bec Mon Sep 17 00:00:00 2001 From: leo Date: Wed, 17 May 2023 19:59:38 +0200 Subject: [PATCH] schema: add Init record --- package.dhall | 4 ++-- schema.dhall | 15 +++++++++++---- validate.dhall | 2 +- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/package.dhall b/package.dhall index 847c418..702a2f1 100644 --- a/package.dhall +++ b/package.dhall @@ -1,10 +1,10 @@ { Schema = ./schema.dhall - sha256:1aa8c2f42fc6fc3055a35c1285314340f934aa50226c6cdc96f8d19471a84835 + sha256:d393b005ad10d5b8e775956dbc4e792c9da9c7760baf03e537dfac52b1ecfd31 ? ./schema.dhall , Schema/validate = ./validate.dhall - sha256:78f05c1c7d49d3d8854b8a000600a30e55c7c2771bf9f91dc4717ef30a191a91 + sha256:aff9136148e3214a4ea0f091901516cf5e74eb24648492b60fa9ee6892e1237b ? ./validate.dhall , Schema/version = ./version.dhall diff --git a/schema.dhall b/schema.dhall index 4115206..81038f1 100644 --- a/schema.dhall +++ b/schema.dhall @@ -40,7 +40,7 @@ let Schema = , MaxAge : Natural } , Logger : { JSON : Bool, Fmt : Optional Text } - , InitialAdminPassword : Text + , Init : { CreateAdmin : Bool, AdminPassword : Text } , Registration : { Allowed : Bool } } , default = @@ -78,9 +78,16 @@ let Schema = , MaxAge = 3600 } , Logger = { JSON = True, Fmt = None Text } - , InitialAdminPassword = - -- | used for the first admin, forced change on first login. - "50ce50fd0e4f5894d74c4caecb450b00c594681d9397de98ffc0c76af5cff5953eb795f7" + , Init = + { CreateAdmin = + -- | if this is True, attempt to create a user with admin + -- | privileges with the password specified below (or better - + -- | overriden); it fails if users already exist in the DB. + False + , AdminPassword = + -- | used for the first admin, forced change on first login. + "50ce50fd0e4f5894d74c4caecb450b00c594681d9397de98ffc0c76af5cff5953eb795f7" + } , Registration.Allowed = True } } diff --git a/validate.dhall b/validate.dhall index 018c039..673ae0b 100644 --- a/validate.dhall +++ b/validate.dhall @@ -5,7 +5,7 @@ let Prelude = let Schema = ./schema.dhall - sha256:1aa8c2f42fc6fc3055a35c1285314340f934aa50226c6cdc96f8d19471a84835 + sha256:d393b005ad10d5b8e775956dbc4e792c9da9c7760baf03e537dfac52b1ecfd31 ? ./schema.dhall let Schema/validate