From 3c2af703415224487eb9c4f6fce1965c368de591 Mon Sep 17 00:00:00 2001 From: Lieuwe Leene Date: Sun, 20 Nov 2022 17:35:28 +0100 Subject: [PATCH] Fix gitea ENV variables and config smtp. --- config/gitea.ini | 94 --------------------------------------------- docker-compose.yaml | 7 ++++ local.env | 12 ++++++ 3 files changed, 19 insertions(+), 94 deletions(-) delete mode 100644 config/gitea.ini diff --git a/config/gitea.ini b/config/gitea.ini deleted file mode 100644 index 0e572ad..0000000 --- a/config/gitea.ini +++ /dev/null @@ -1,94 +0,0 @@ -APP_NAME = Gitea: Git with a cup of tea -RUN_MODE = prod -RUN_USER = git - -[repository] -ROOT = /data/git/repositories - -[repository.local] -LOCAL_COPY_PATH = /data/gitea/tmp/local-repo - -[repository.upload] -TEMP_PATH = /data/gitea/uploads - -[server] -APP_DATA_PATH = /data/gitea -DOMAIN = localhost -SSH_DOMAIN = localhost -HTTP_PORT = 3000 -ROOT_URL = http://localhost:3000/ -DISABLE_SSH = false -SSH_PORT = 22 -SSH_LISTEN_PORT = 22 -LFS_START_SERVER = true -LFS_JWT_SECRET = 13R03sc6ZlnDkBFwKup2PoeT3eOggjn2oEmkOSjkQsE -OFFLINE_MODE = false - -[database] -PATH = /data/gitea/gitea.db -DB_TYPE = postgres -HOST = database:5432 -NAME = gitea -USER = gitea -PASSWD = "hear397sew" -LOG_SQL = false -SCHEMA = -SSL_MODE = disable -CHARSET = utf8 - -[indexer] -ISSUE_INDEXER_PATH = /data/gitea/indexers/issues.bleve - -[session] -PROVIDER_CONFIG = /data/gitea/sessions -PROVIDER = file - -[picture] -AVATAR_UPLOAD_PATH = /data/gitea/avatars -REPOSITORY_AVATAR_UPLOAD_PATH = /data/gitea/repo-avatars -ENABLE_FEDERATED_AVATAR = false - -[attachment] -PATH = /data/gitea/attachments - -[log] -MODE = console -LEVEL = info -ROUTER = console -ROOT_PATH = /data/gitea/log - -[security] -INSTALL_LOCK = true -SECRET_KEY = -REVERSE_PROXY_LIMIT = 1 -REVERSE_PROXY_TRUSTED_PROXIES = * -INTERNAL_TOKEN = eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYmYiOjE2NjcxMjI4NDN9.2POH2B9XRVJQx5Ixymbz1iNT7D8OOPiaJNnk1ELTM8s -PASSWORD_HASH_ALGO = pbkdf2 - -[service] -DISABLE_REGISTRATION = false -REQUIRE_SIGNIN_VIEW = false -REGISTER_EMAIL_CONFIRM = false -ENABLE_NOTIFY_MAIL = false -ALLOW_ONLY_EXTERNAL_REGISTRATION = false -ENABLE_CAPTCHA = false -DEFAULT_KEEP_EMAIL_PRIVATE = false -DEFAULT_ALLOW_CREATE_ORGANIZATION = true -DEFAULT_ENABLE_TIMETRACKING = true -NO_REPLY_ADDRESS = noreply.localhost - -[lfs] -PATH = /data/git/lfs - -[mailer] -ENABLED = false - -[openid] -ENABLE_OPENID_SIGNIN = true -ENABLE_OPENID_SIGNUP = true - -[repository.pull-request] -DEFAULT_MERGE_STYLE = merge - -[repository.signing] -DEFAULT_TRUST_MODEL = committer diff --git a/docker-compose.yaml b/docker-compose.yaml index 35d6f26..b446520 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -91,8 +91,15 @@ services: - VIRTUAL_HOST=git.${NGINX_HOST} - VIRTUAL_PORT=3000 - LETSENCRYPT_HOST=git.${NGINX_HOST} + - GITEA__mailer__PASSWD=${SQL_PSWD} + - GITEA__server__DOMAIN = git.${NGINX_HOST} + - GITEA__server__SSH_DOMAIN = git.${NGINX_HOST} + - GITEA__server__ROOT_URL = https://git.${NGINX_HOST}/ + - GITEA__server__CERT_FILE = /etc/letsencrypt/live/git.${NGINX_HOST}.crt + - GITEA__server__KEY_FILE = /etc/letsencrypt/live/git.${NGINX_HOST}.key volumes: - gitea_data:/data:z + - nginx_certs:/etc/letsencrypt/live:ro,z expose: - "3000" ports: diff --git a/local.env b/local.env index 6514343..4c51e6c 100644 --- a/local.env +++ b/local.env @@ -42,3 +42,15 @@ ROUNDCUBEMAIL_ASPELL_DICTS=en ## NGINX Reverse Proxy NGINX_PROXY_CONTAINER=nginx-proxy LETSENCRYPT_RESTART_CONTAINER=true + +## GITEA Setup + +GITEA__server__HTTP_PORT = 3000 +GITEA__server__DISABLE_SSH = false +GITEA__server__SSH_PORT = 222 +GITEA__server__SSH_LISTEN_PORT = 222 + +GITEA__mailer__ENABLED = true +GITEA__mailer__PROTOCOL = smtp +GITEA__mailer__SMTP_ADDR = mailserver +GITEA__mailer__SMTP_PORT = 25 \ No newline at end of file