From f81b91db9940b3c44f93c7845889d50ce05177db Mon Sep 17 00:00:00 2001 From: Nick Sellen Date: Fri, 30 Jul 2021 19:11:32 +0100 Subject: [PATCH 1/2] Add selected environment options --- .env.sample | 17 +++++++++++++++++ compose.yml | 15 ++++++++++++++- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/.env.sample b/.env.sample index bf8820e..3e3594e 100644 --- a/.env.sample +++ b/.env.sample @@ -18,3 +18,20 @@ SECRET_DB_PASSWORD_VERSION=v1 #CMD_OAUTH2_USER_PROFILE_URL="https://keycloak.example.com/auth/realms/realmname/protocol/openid-connect/userinfo" # #SECRET_OAUTH_KEY_VERSION=v1 + +# Options, see https://docs.hedgedoc.org/configuration/ + +# CMD_ALLOW_ANONYMOUS +# CMD_ALLOW_ANONYMOUS_EDITS +# CMD_ALLOW_EMAIL_REGISTER +# CMD_ALLOW_FREEURL +# CMD_ALLOW_GRAVATAR +# CMD_ALLOW_ORIGIN +# CMD_COOKIE_POLICY +# CMD_CSP_ADD_DISQUS +# CMD_CSP_ADD_GOOGLE_ANALYTICS +# CMD_CSP_ENABLE +# CMD_CSP_REPORTURI +# CMD_DEFAULT_PERMISSION +# CMD_EMAIL +# CMD_SESSION_LIFE \ No newline at end of file diff --git a/compose.yml b/compose.yml index 1de9046..dd3152c 100644 --- a/compose.yml +++ b/compose.yml @@ -8,7 +8,20 @@ services: - CMD_DB_USER=codimd - CMD_DB_HOST=db - CMD_DB_PASSWORD_FILE=/run/secrets/db_password - - CMD_EMAIL # Email login enabled? + - CMD_ALLOW_ANONYMOUS + - CMD_ALLOW_ANONYMOUS_EDITS + - CMD_ALLOW_EMAIL_REGISTER + - CMD_ALLOW_FREEURL + - CMD_ALLOW_GRAVATAR + - CMD_ALLOW_ORIGIN + - CMD_COOKIE_POLICY + - CMD_CSP_ADD_DISQUS + - CMD_CSP_ADD_GOOGLE_ANALYTICS + - CMD_CSP_ENABLE + - CMD_CSP_REPORTURI + - CMD_DEFAULT_PERMISSION + - CMD_EMAIL + - CMD_SESSION_LIFE depends_on: - db networks: From a781e47fe2efc418f39ce56a3772d256909bfc83 Mon Sep 17 00:00:00 2001 From: Nick Sellen Date: Fri, 30 Jul 2021 19:43:00 +0100 Subject: [PATCH 2/2] Set new config options to default values --- .env.sample | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.env.sample b/.env.sample index 3e3594e..1e87438 100644 --- a/.env.sample +++ b/.env.sample @@ -21,17 +21,17 @@ SECRET_DB_PASSWORD_VERSION=v1 # Options, see https://docs.hedgedoc.org/configuration/ -# CMD_ALLOW_ANONYMOUS -# CMD_ALLOW_ANONYMOUS_EDITS -# CMD_ALLOW_EMAIL_REGISTER -# CMD_ALLOW_FREEURL -# CMD_ALLOW_GRAVATAR -# CMD_ALLOW_ORIGIN -# CMD_COOKIE_POLICY -# CMD_CSP_ADD_DISQUS -# CMD_CSP_ADD_GOOGLE_ANALYTICS -# CMD_CSP_ENABLE -# CMD_CSP_REPORTURI -# CMD_DEFAULT_PERMISSION -# CMD_EMAIL -# CMD_SESSION_LIFE \ No newline at end of file +# CMD_ALLOW_ANONYMOUS=true +# CMD_ALLOW_ANONYMOUS_EDITS=false +# CMD_ALLOW_EMAIL_REGISTER=true +# CMD_ALLOW_FREEURL=false +# CMD_ALLOW_GRAVATAR=true +# CMD_ALLOW_ORIGIN=localhost +# CMD_COOKIE_POLICY=lax +# CMD_CSP_ADD_DISQUS=false +# CMD_CSP_ADD_GOOGLE_ANALYTICS=false +# CMD_CSP_ENABLE=true +# CMD_CSP_REPORTURI=undefined +# CMD_DEFAULT_PERMISSION=editable +# CMD_EMAIL=true +# CMD_SESSION_LIFE=1209600000 \ No newline at end of file