Merge pull request 'New options in the app.ini template.' (#2) from development into main

Reviewed-on: ghost-automation/ds-gitea#2

README.org

@@ -2,7 +2,7 @@
 #+AUTHOR: DeadSwitch | The Silent Architect
 #+OPTIONS: toc:nil num:nil \n:t
 
-[[https://opensource.org/licenses/MIT][https://img.shields.io/badge/license-MIT-blue.svg]] [[https://img.shields.io/badge/version-3.0.1-green.svg]]
+[[https://opensource.org/licenses/MIT][https://img.shields.io/badge/license-MIT-blue.svg]] [[https://img.shields.io/badge/version-3.0.2-green.svg]]
 
 * ds-gitea
 
@@ -36,11 +36,11 @@ gitea_user: git
 gitea_group: git
 gitea_http_port: 3000
 gitea_ssh_port: 22
-gitea_database_server: ''
-gitea_reverse_proxy: ''
 gitea_require_signin_view: true
 gitea_disable_registration: true
 gitea_register_manual_confirm: false
+gitea_enable_captcha: false
+gitea_default_keep_email_private: true
 #+end_src
 
 * Requirements
@@ -57,7 +57,7 @@ gitea_register_manual_confirm: false
 * Variables
 
 | Variable                         | Type    | Comment                                          |
-|-------------------------------+---------+--------------------------------------------------|
+|----------------------------------+---------+--------------------------------------------------|
 | gitea_user                       | string  | Gitea user                                       |
 | gitea_group                      | string  | Gitea group                                      |
 | gitea_binary_url                 | string  | Download URL of Gitea                            |
@@ -84,6 +84,8 @@ gitea_register_manual_confirm: false
 | gitea_require_signin_view        | boolean | If false, public repos are visible without login |
 | gitea_disable_registration       | boolean | Turn off the user registration feature           |
 | gitea_register_manual_confirm    | boolean | Registration requires admin verification         |
+| gitea_enable_captcha             | boolean | Enable captcha for registration                  |
+| gitea_default_keep_email_private | boolean | Default email policy: private                    |
 
 * Handlers
 
@@ -107,6 +109,8 @@ Then re-run the playbook to finish the installation.
 
 * Example Playbook
 
+You can find more playbook examples in the =examples= directory.
+
 #+begin_src yaml
 - name: Deploy a Gitea server
   hosts: gitea

defaults/main.yml

@@ -4,3 +4,7 @@ gitea_group: git
 gitea_http_port: 3000
 gitea_ssh_port: 22
 gitea_require_signin_view: true
+gitea_disable_registration: true
+gitea_register_manual_confirm: false
+gitea_enable_captcha: false
+gitea_default_keep_email_private: true

templates/app.ini.j2

@@ -52,9 +52,9 @@ REGISTER_EMAIL_CONFIRM = false
 ENABLE_NOTIFY_MAIL = false
 DISABLE_REGISTRATION = {{ gitea_disable_registration }}
 ALLOW_ONLY_EXTERNAL_REGISTRATION = false
-ENABLE_CAPTCHA = false
+ENABLE_CAPTCHA = {{ gitea_enable_captcha }}
 REQUIRE_SIGNIN_VIEW = {{ gitea_require_signin_view }}
-DEFAULT_KEEP_EMAIL_PRIVATE = false
+DEFAULT_KEEP_EMAIL_PRIVATE = {{ gitea_default_keep_email_private }}
 DEFAULT_ALLOW_CREATE_ORGANIZATION = true
 DEFAULT_ENABLE_TIMETRACKING = true
 NO_REPLY_ADDRESS = noreply.localhost