fix: provide default

.env.sample

@@ -30,8 +30,6 @@ GITEA_DEFAULT_USER_VISIBILITY=limited
 GITEA_ALLOWED_USER_VISIBILITY_MODES=limited,private
 GITEA_DEFAULT_ORG_VISIBILITY=limited
 GITEA_REQUIRE_SIGNIN_VIEW=true
-GITEA_ENABLE_PUSH_CREATE_USER=false
-GITEA_ENABLE_PUSH_CREATE_ORG=false
 
 GITEA_REPO_UPLOAD_ENABLED=true
 GITEA_REPO_UPLOAD_ALLOWED_TYPES=*/*
@@ -56,6 +54,7 @@ SECRET_SECRET_KEY_VERSION=v1 # length=64
 # GITEA_MAILER_ADDR=mail.gandi.net
 # GITEA_MAILER_PORT=465
 # SECRET_SMTP_PASSWORD_VERSION=v1
+# GITEA_MAILER_PROTOCOL=smtps
 
 # OATH2 Options
 # GITEA_REGISTER_EMAIL_CONFIRM=replace-me

app.ini.tmpl

@@ -30,8 +30,6 @@ ENABLE_OPENID_SIGNUP = {{ env "GITEA_ENABLE_OPENID_SIGNUP" }}
 
 [repository]
 DEFAULT_BRANCH = main
-ENABLE_PUSH_CREATE_USER = {{ env "GITEA_ENABLE_PUSH_CREATE_USER" }}
-ENABLE_PUSH_CREATE_ORG = {{ env "GITEA_ENABLE_PUSH_CREATE_ORG" }}
 
 [repository.upload]
 ENABLED = {{ env "GITEA_REPO_UPLOAD_ENABLED" }}
@@ -73,7 +71,7 @@ JWT_SECRET = {{ secret "jwt_secret" }}
 [mailer]
 ENABLED        = true
 FROM           = {{ env "GITEA_MAILER_FROM" }}
-PROTOCOL       = smtps
+PROTOCOL       = {{ env "GITEA_MAILER_PROTOCOL" }}
 SMTP_ADDR      = {{ env "GITEA_MAILER_ADDR" }}
 SMTP_PORT      = {{ env "GITEA_MAILER_PORT" }}
 USER           = {{ env "GITEA_MAILER_USER" }}

compose.smtp.yml

@@ -8,6 +8,7 @@ services:
       - GITEA_MAILER_ADDR
       - GITEA_MAILER_PORT
       - GITEA_MAILER_USER
+      - "GITEA_MAILER_PROTOCOL=${GITEA_MAILER_FROM:-smtps}"
     secrets:
       - smtp_password