From e0d73083e2a449cf9acf1a08bb246917de9488d1 Mon Sep 17 00:00:00 2001 From: Javielico Date: Sun, 14 Apr 2024 20:48:18 +0100 Subject: [PATCH 1/4] Adding variable configs --- .env.sample | 10 ++++++++++ compose.yml | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/.env.sample b/.env.sample index eb50fd6..ccee28a 100644 --- a/.env.sample +++ b/.env.sample @@ -20,6 +20,16 @@ GITEA_ENABLE_OPENID_SIGNUP=true GITEA_DISABLE_GRAVATAR=false GITEA_ENABLE_FEDERATED_AVATAR=true GITEA_LANDING_PAGE=organizations +GITEA_SHOW_USER_EMAIL=false +GITEA_DISABLE_REGULAR_ORG_CREATION=true +GITEA_DEFAULT_KEEP_EMAIL_PRIVATE=true +GITEA_DEFAULT_ALLOW_CREATE_ORGANIZATION=false +GITEA_ENABLE_USER_HEATMAP=false +GITEA_DEFAULT_USER_VISIBILITY=limited +GITEA_ALLOWED_USER_VISIBILITY_MODES=limited,private +GITEA_DEFAULT_ORG_VISIBILITY=limited +GITEA_REQUIRE_SIGNIN_VIEW=true + GITEA_REPO_UPLOAD_ENABLED=true GITEA_REPO_UPLOAD_ALLOWED_TYPES=*/* diff --git a/compose.yml b/compose.yml index 395fd5b..5f2bd1d 100644 --- a/compose.yml +++ b/compose.yml @@ -43,6 +43,16 @@ services: - GITEA_REPO_INDEXER_ENABLED - GITEA_ISSUE_INDEXER_TYPE - GITEA_STARTUP_TIMEOUT + - GITEA_SHOW_USER_EMAIL + - GITEA_DISABLE_REGULAR_ORG_CREATION + - GITEA_DEFAULT_KEEP_EMAIL_PRIVATE + - GITEA_DEFAULT_ALLOW_CREATE_ORGANIZATION + - GITEA_ENABLE_USER_HEATMAP + - GITEA_DEFAULT_USER_VISIBILITY + - GITEA_ALLOWED_USER_VISIBILITY_MODES + - GITEA_DEFAULT_ORG_VISIBILITY + - GITEA_REQUIRE_SIGNIN_VIEW + volumes: - data:/var/lib/gitea - config:/etc/gitea From 94de0096fc1e577ecfd3a2906490ae59cc8e5b9e Mon Sep 17 00:00:00 2001 From: Javielico Date: Thu, 18 Apr 2024 19:01:32 +0100 Subject: [PATCH 2/4] Adding DISABLE_AUTH --- .env.sample | 2 +- compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.sample b/.env.sample index ccee28a..e811e5b 100644 --- a/.env.sample +++ b/.env.sample @@ -29,7 +29,7 @@ GITEA_DEFAULT_USER_VISIBILITY=limited GITEA_ALLOWED_USER_VISIBILITY_MODES=limited,private GITEA_DEFAULT_ORG_VISIBILITY=limited GITEA_REQUIRE_SIGNIN_VIEW=true - +GITEA_DISABLE_AUTH=true GITEA_REPO_UPLOAD_ENABLED=true GITEA_REPO_UPLOAD_ALLOWED_TYPES=*/* diff --git a/compose.yml b/compose.yml index 5f2bd1d..bf2ab43 100644 --- a/compose.yml +++ b/compose.yml @@ -52,7 +52,7 @@ services: - GITEA_ALLOWED_USER_VISIBILITY_MODES - GITEA_DEFAULT_ORG_VISIBILITY - GITEA_REQUIRE_SIGNIN_VIEW - + - GITEA_DISABLE_AUTH volumes: - data:/var/lib/gitea - config:/etc/gitea From 2b15ff9c287e9bc5cddf1ad538e47c3850a835c8 Mon Sep 17 00:00:00 2001 From: Javielico Date: Tue, 23 Apr 2024 16:13:28 +0100 Subject: [PATCH 3/4] Added components to app.ini --- .env.sample | 1 - app.ini.tmpl | 12 ++++++++++++ compose.yml | 1 - 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.env.sample b/.env.sample index e811e5b..201bd65 100644 --- a/.env.sample +++ b/.env.sample @@ -29,7 +29,6 @@ GITEA_DEFAULT_USER_VISIBILITY=limited GITEA_ALLOWED_USER_VISIBILITY_MODES=limited,private GITEA_DEFAULT_ORG_VISIBILITY=limited GITEA_REQUIRE_SIGNIN_VIEW=true -GITEA_DISABLE_AUTH=true GITEA_REPO_UPLOAD_ENABLED=true GITEA_REPO_UPLOAD_ALLOWED_TYPES=*/* diff --git a/app.ini.tmpl b/app.ini.tmpl index 0b5c358..fd48984 100644 --- a/app.ini.tmpl +++ b/app.ini.tmpl @@ -16,6 +16,13 @@ ALLOW_ONLY_EXTERNAL_REGISTRATION = {{ env "GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATIO AUTO_WATCH_NEW_REPOS = {{ env "GITEA_AUTO_WATCH_NEW_REPOS" }} DISABLE_REGISTRATION = {{ env "GITEA_DISABLE_REGISTRATION" }} ENABLE_NOTIFY_MAIL = {{ env "GITEA_ENABLE_NOTIFY_MAIL" }} +DEFAULT_KEEP_EMAIL_PRIVATE = {{ env "GITEA_DEFAULT_KEEP_EMAIL_PRIVATE" }} +DEFAULT_ALLOW_CREATE_ORGANIZATION = {{ env "GITEA_DEFAULT_ALLOW_CREATE_ORGANIZATION" }} +ENABLE_USER_HEATMAP = {{ env "GITEA_ENABLE_USER_HEATMAP" }} +DEFAULT_USER_VISIBILITY = {{ env "GITEA_DEFAULT_USER_VISIBILITY" }} +ALLOWED_USER_VISIBILITY_MODES = {{ env "GITEA_ALLOWED_USER_VISIBILITY_MODES" }} +DEFAULT_ORG_VISIBILITY = {{ env "GITEA_DEFAULT_ORG_VISIBILITY" }} +REQUIRE_SIGNIN_VIEW = {{ env "GITEA_REQUIRE_SIGNIN_VIEW" }} [openid] ENABLE_OPENID_SIGNIN = {{ env "GITEA_ENABLE_OPENID_SIGNIN" }} @@ -30,6 +37,8 @@ ALLOWED_TYPES = {{ env "GITEA_REPO_UPLOAD_ALLOWED_TYPES" }} FILE_MAX_SIZE = {{ env "GITEA_REPO_UPLOAD_MAX_SIZE" }} MAX_FILES = {{ env "GITEA_REPO_UPLOAD_MAX_FILES" }} +[ui] +SHOW_USER_EMAIL = {{ env "GITEA_SHOW_USER_EMAIL" }} [indexer] REPO_INDEXER_ENABLED = {{ or (env "GITEA_REPO_INDEXER_ENABLED") "false" }} @@ -52,6 +61,9 @@ REVERSE_PROXY_LIMIT = 1 REVERSE_PROXY_TRUSTED_PROXIES = * SECRET_KEY = {{ secret "secret_key" }} +[admin] +DISABLE_REGULAR_ORG_CREATION = {{ env "GITEA_DISABLE_REGULAR_ORG_CREATION" }} + [oauth2] JWT_SECRET = {{ secret "jwt_secret" }} diff --git a/compose.yml b/compose.yml index bf2ab43..776607f 100644 --- a/compose.yml +++ b/compose.yml @@ -52,7 +52,6 @@ services: - GITEA_ALLOWED_USER_VISIBILITY_MODES - GITEA_DEFAULT_ORG_VISIBILITY - GITEA_REQUIRE_SIGNIN_VIEW - - GITEA_DISABLE_AUTH volumes: - data:/var/lib/gitea - config:/etc/gitea From dbde635976653653862a9664b7d9ae75e29a9166 Mon Sep 17 00:00:00 2001 From: Javielico Date: Tue, 23 Apr 2024 21:45:55 +0100 Subject: [PATCH 4/4] Removing access log to false as fallback has been removed on Gitea 1.21 --- app.ini.tmpl | 1 - 1 file changed, 1 deletion(-) diff --git a/app.ini.tmpl b/app.ini.tmpl index fd48984..896f5b5 100644 --- a/app.ini.tmpl +++ b/app.ini.tmpl @@ -97,5 +97,4 @@ IS_INPUT_FILE = false MODE=console LEVEL=WARN STACKTRACE_LEVEL=None -ENABLE_ACCESS_LOG=false ENABLE_XORM_LOG=false