Merge branch 'main' into include_tasks

defaults/main.yml

@@ -5,7 +5,7 @@ gitea_lib_dir: "/var/lib/gitea"
 gitea_user: 'git'
 gitea_group: 'git'
 gitea_confdir: '/etc/gitea/app.ini'
-gitea_version: '1.17.3'
+gitea_version: '1.18.0'
 
 
 #[CONFIG]
@@ -34,7 +34,7 @@ gitea_database_config:
   - 'USER     = admin'
   - 'PASSWD   = changeme'
   - 'SSL_MODE = disable'
-  - 'PATH     = /home/git/data/gitea.db'
+
 
 gitea_repository_config:
   - 'ROOT = /home/git/gitea-repositories'
@@ -47,17 +47,20 @@ gitea_server_config:
   - 'DISABLE_SSH      = false'
   - 'SSH_PORT         = 22'
   - 'LFS_START_SERVER = true'
-  - 'LFS_CONTENT_PATH = /home/git/data/lfs'
   - 'LFS_JWT_SECRET   = ' #40 random chars
   - 'OFFLINE_MODE     = false'
 
+gitea_lfs_config: 
+  - 'PATH = /home/git/data/lfs' 
+
 gitea_mailer_config:
   - 'ENABLED        = true'
-  - 'HOST           = mail.example.org:587'
+  - 'SMTP_ADDR      = mail.example.org'
+  - 'SMTP_PORT      = 587'
   - 'FROM           = noreply@example.org'
   - 'USER           = noreply@example.org'
   - 'PASSWD         = CHANGEME' #PASSWD
-  - 'IS_TLS_ENABLED = true'
+  - 'PROTOCOL       = smtp+starttls'
 
 gitea_service_config:
   - 'REGISTER_EMAIL_CONFIRM            = true'

templates/etc/gitea/app.ini.j2

@@ -35,6 +35,10 @@
 {{ item }}
 {% endfor %}
 
+[lfs]
+{% for item in gitea_lfs_config %}
+{{ item }}
+{% endfor %}
 
 [mailer]
 {% for item in gitea_mailer_config %}