From 0658971dbbae78ee52e0cd50f0d413ede5cc5deb Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Fri, 27 Sep 2024 09:42:27 +0200 Subject: [PATCH 1/2] chore(forgejo): Update mailer settings for new configuration Split 'SMTP_HOST' variable into 'SMTP_ADDR' and 'SMTP_PORT' to follow updated configuration style. --- roles/forgejo/defaults/main.yml | 3 ++- roles/forgejo/templates/docker-stack.yml.j2 | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/roles/forgejo/defaults/main.yml b/roles/forgejo/defaults/main.yml index 09a244b..bf8aa53 100644 --- a/roles/forgejo/defaults/main.yml +++ b/roles/forgejo/defaults/main.yml @@ -17,7 +17,8 @@ forgejo_app_admin_username: Myforgejousername # can not be set to admin in Forge forgejo_app_admin_password: Myforgejopassword forgejo_app_admin_email: myadmin@mydomain.mytld -# forgejo_smtp_host: domain.com:port +# forgejo_smtp_addr: domain.com +# forgejo_smtp_port: 465 # forgejo_smtp_username: my@username.com # forgejo_smtp_password: # forgejo_smtp_force_tls: false # forces tls if it is on a non-traditional tls port. Overwrites starttls so should generally be off diff --git a/roles/forgejo/templates/docker-stack.yml.j2 b/roles/forgejo/templates/docker-stack.yml.j2 index 5bad7af..ba5618b 100644 --- a/roles/forgejo/templates/docker-stack.yml.j2 +++ b/roles/forgejo/templates/docker-stack.yml.j2 @@ -29,12 +29,13 @@ services: {% if forgejo_app_admin_username is not undefined and not None and forgejo_app_admin_password is not undefined and not None %} - FORGEJO__security__INSTALL_LOCK=true {% endif %} -{% if forgejo_smtp_host is not undefined and not None and forgejo_smtp_username is not undefined and not None and forgejo_smtp_password is not undefined and not None %} +{% if forgejo_smtp_addr is not undefined and not None and forgejo_smtp_port is not undefined and not None and forgejo_smtp_username is not undefined and not None and forgejo_smtp_password is not undefined and not None %} - FORGEJO__mailer__ENABLED=true - FORGEJO__service__ENABLE_NOTIFY_MAIL=true - FORGEJO__mailer__FROM=forgejo@{{ server_domain }} - FORGEJO__mailer__TYPE=smtp - - FORGEJO__mailer__HOST={{ forgejo_smtp_host }} + - FORGEJO__mailer__SMTP_ADDR={{ forgejo_smtp_addr }} + - FORGEJO__mailer__SMTP_PORT={{ forgejo_smtp_port }} - FORGEJO__mailer__IS_TLS_ENABLED={{ (forgejo_smtp_force_tls is not undefined and not None) | ternary(forgejo_smtp_force_tls,'false') }} - FORGEJO__mailer__USER={{ forgejo_smtp_username }} - FORGEJO__mailer__PASSWD={{ forgejo_smtp_password }} From 409f50a5efd2cc2fa3d17ea6fa01ba6a66c38323 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Fri, 27 Sep 2024 09:42:47 +0200 Subject: [PATCH 2/2] feat(forgejo): Allow enabling git lfs --- roles/forgejo/defaults/main.yml | 5 +++++ roles/forgejo/templates/docker-stack.yml.j2 | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/roles/forgejo/defaults/main.yml b/roles/forgejo/defaults/main.yml index bf8aa53..0b7ce48 100644 --- a/roles/forgejo/defaults/main.yml +++ b/roles/forgejo/defaults/main.yml @@ -23,6 +23,11 @@ forgejo_app_admin_email: myadmin@mydomain.mytld # forgejo_smtp_password: # forgejo_smtp_force_tls: false # forces tls if it is on a non-traditional tls port. Overwrites starttls so should generally be off +forgejo_use_lfs: false +forgejo_lfs_max_filesize: 0 +forgejo_lfs_http_auth_expiry: 24h +# forgejo_lfs_jwt_secret: + forgejo_use_ci: false # forgejo_ci_github_client: # forgejo_ci_github_secret: diff --git a/roles/forgejo/templates/docker-stack.yml.j2 b/roles/forgejo/templates/docker-stack.yml.j2 index ba5618b..a035a74 100644 --- a/roles/forgejo/templates/docker-stack.yml.j2 +++ b/roles/forgejo/templates/docker-stack.yml.j2 @@ -40,6 +40,14 @@ services: - FORGEJO__mailer__USER={{ forgejo_smtp_username }} - FORGEJO__mailer__PASSWD={{ forgejo_smtp_password }} {% endif %} +{% if forgejo_use_lfs %} + - FORGEJO__server__LFS_START_SERVER=true +{% if forgejo_lfs_jwt_secret is not undefined and not none %} + - FORGEJO__server__LFS_JWT_SECRET={{ forgejo_lfs_jwt_secret }} +{% endif %} + - FORGEJO__server__LFS_HTTP_AUTH_EXPIRY={{ forgejo_lfs_http_auth_expiry }} + - FORGEJO__server__LFS_MAX_FILE_SIZE={{ forgejo_lfs_max_filesize }} +{% endif %} {% if forgejo_use_s3 %} - FORGEJO__storage__STORAGE_TYPE="minio" - FORGEJO__storage__MINIO_USE_SSL={{ forgejo_s3_use_ssl }}