From 4aa5562c497702cfabf36d44e8346c189968f9e8 Mon Sep 17 00:00:00 2001
From: L3D <l3d@c3woc.de>
Date: Sun, 21 Mar 2021 23:34:25 +0100
Subject: [PATCH] reorder pictures variables

---
 README.md              | 6 +++++-
 defaults/main.yml      | 4 ++--
 templates/gitea.ini.j2 | 7 +++++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 0c72d8a..ceaf5be 100644
--- a/README.md
+++ b/README.md
@@ -178,6 +178,11 @@ Here is a deeper insight into the variables of this gitea role. For the exact fu
 | `gitea_session_provider` | `file` | Session engine provider |
 | `gitea_session_extra_config` | `''` | you can use this variable to pass additional config parameters in the `[session]` section of the config. |
 
+### Picture ([picture](https://docs.gitea.io/en-us/config-cheat-sheet/#picture-picture))
+| variable name | default value | description |
+| ------------- | ------------- | ----------- |
+| `gitea_disable_gravatar` | `true` | Do you want to disable Gravatar ? (privacy and so on) (true/false) |
+| `gitea_picture_extra_config` | `''` | you can use this variable to pass additional config parameters in the `[picture]` section of the config. |
 
 
 
@@ -191,7 +196,6 @@ Here is a deeper insight into the variables of this gitea role. For the exact fu
 ### Look and feel
 | variable name | default value | description |
 | ------------- | ------------- | ----------- |
-| `gitea_disable_gravatar` | `true` | Do you want to disable Gravatar ? (privacy and so on) (true/false) |
 
 
 ### Security
diff --git a/defaults/main.yml b/defaults/main.yml
index 01141e1..e94ab31 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -108,9 +108,9 @@ gitea_mailer_extra_config: ''
 gitea_session_provider: 'file'
 gitea_session_extra_config: ''
 
-#
-# look and feel
+# Picture (picture)
 gitea_disable_gravatar: true
+gitea_picture_extra_config: ''
 
 # security
 gitea_lfs_jwt_secret: ''
diff --git a/templates/gitea.ini.j2 b/templates/gitea.ini.j2
index cbc2f68..4b579a0 100644
--- a/templates/gitea.ini.j2
+++ b/templates/gitea.ini.j2
@@ -130,11 +130,14 @@ PROVIDER_CONFIG = {{ gitea_home }}/data/sessions
 {{ gitea_session_extra_config }}
 ;
 ;
-;
+; -> https://docs.gitea.io/en-us/config-cheat-sheet/#picture-picture
 [picture]
 AVATAR_UPLOAD_PATH = {{ gitea_home }}/data/avatars
-; This value will always be true in offline mode.
 DISABLE_GRAVATAR   = {{ gitea_disable_gravatar | ternary('true', 'false') }}
+{{ gitea_picture_extra_config }}
+;
+;
+;
 
 [attachment]
 ; Whether attachments are enabled. Defaults to `true`