diff options
| author | crupest <crupest@outlook.com> | 2024-11-03 19:26:30 +0800 | 
|---|---|---|
| committer | crupest <crupest@outlook.com> | 2024-11-03 19:26:30 +0800 | 
| commit | 87170e873e168690c5f87c271d201a5e1c7833c9 (patch) | |
| tree | c807f47e987230a6523f8ffc4c82a5a94dada5ab | |
| parent | 25743accb3c4656bfe2db290aa4b513b3703663d (diff) | |
| download | crupest-87170e873e168690c5f87c271d201a5e1c7833c9.tar.gz crupest-87170e873e168690c5f87c271d201a5e1c7833c9.tar.bz2 crupest-87170e873e168690c5f87c271d201a5e1c7833c9.zip  | |
fix(forgejo): fix forgejo config.
| -rw-r--r-- | template/forgejo.app.ini.template | 19 | ||||
| -rw-r--r-- | tools/aio/modules/config.py | 10 | 
2 files changed, 12 insertions, 17 deletions
diff --git a/template/forgejo.app.ini.template b/template/forgejo.app.ini.template index 4fbcdec..3de4876 100644 --- a/template/forgejo.app.ini.template +++ b/template/forgejo.app.ini.template @@ -1,16 +1,15 @@  APP_NAME = Forgejo, loved by crupest.  RUN_MODE = prod - -[repository] -ROOT = /data/git/repositories +WORK_PATH = /data/gitea  [server] -APP_DATA_PATH = /data/gitea  HTTP_ADDR        = 0.0.0.0  HTTP_PORT        = 3000 +ROOT_URL         = https://git.${CRUPEST_DOMAIN}  USE_PROXY_PROTOCOL = true  DISABLE_SSH      = true  LFS_START_SERVER = true +LFS_JWT_SECRET = ${CRUPEST_FORGEJO_LFS_JWT_SECRET}  [database]  DB_TYPE = sqlite3 @@ -18,6 +17,7 @@ DB_TYPE = sqlite3  [security]  INSTALL_LOCK = false  SECRET_KEY = ${CRUPEST_FORGEJO_SECURITY_KEY} +INTERNAL_TOKEN = ${CRUPEST_FORGEJO_SECURITY_INTERNAL_TOKEN}  REVERSE_PROXY_LIMIT = 1  REVERSE_PROXY_TRUSTED_PROXIES = * @@ -33,21 +33,14 @@ SMTP_PORT = 465  USER = ${CRUPEST_FORGEJO_MAILER_USER}  PASSWD = ${CRUPEST_FORGEJO_MAILER_PASSWD} -[email.incoming] -ENABLED = true -HOST = mail.${CRUPEST_DOMAIN} -PORT = 993 -USERNAME = ${CRUPEST_FORGEJO_EMAIL_INCOMING_USER} -PASSWORD = ${CRUPEST_FORGEJO_EMAIL_INCOMING_PASSWORD} -USE_TLS = true -  [log]  MODE = console,file  [cron]  ENABLED = true -[log.file] +[oauth2] +JWT_SECRET = ${CRUPEST_FORGEJO_OAUTH2_JWT_SECRET}  [actions]  ENABLED = false diff --git a/tools/aio/modules/config.py b/tools/aio/modules/config.py index 7dc75a1..52f656a 100644 --- a/tools/aio/modules/config.py +++ b/tools/aio/modules/config.py @@ -57,14 +57,16 @@ config_var_list: list = [                "v2ray path, which will be prefixed by _", generate_uuid),      ConfigVar("CRUPEST_FORGEJO_SECURITY_KEY",                "Forgejo secret key.", generate_uuid), +    ConfigVar("CRUPEST_FORGEJO_SECURITY_INTERNAL_TOKEN", +              "Forgejo secret internal token.", generate_uuid), +    ConfigVar("CRUPEST_FORGEJO_LFS_JWT_SECRET", +              "Forgejo LFS JWT secret.", generate_uuid), +    ConfigVar("CRUPEST_FORGEJO_OAUTH2_JWT_SECRET", +              "Forgejo OAUTH2 JWT secret..", generate_uuid),      ConfigVar("CRUPEST_FORGEJO_MAILER_USER",                "Forgejo SMTP user.", "Please input your Forgejo SMTP user."),      ConfigVar("CRUPEST_FORGEJO_MAILER_PASSWD",                "Forgejo SMTP password.", "Please input your Forgejo SMTP password."), -    ConfigVar("CRUPEST_FORGEJO_EMAIL_INCOMING_USER", -              "Forgejo IMAP user.", "Please input your Forgejo IMAP user."), -    ConfigVar("CRUPEST_FORGEJO_EMAIL_INCOMING_PASSWORD", -              "Forgejo IMAP password.", "Please input your Forgejo IMAP password."),  ]  config_var_name_set = set([config_var.name for config_var in config_var_list])  | 
