From a408ba3e86a7d809e030647e6fa9d701656dbd94 Mon Sep 17 00:00:00 2001
From: Felix Stupp <felix.stupp@outlook.com>
Date: Tue, 28 May 2019 18:37:05 +0200
Subject: [PATCH] roles/server/gitea: Fixed creating credentials

---
 roles/server/gitea/defaults/main.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/roles/server/gitea/defaults/main.yml b/roles/server/gitea/defaults/main.yml
index 739a2f7..eec62cc 100644
--- a/roles/server/gitea/defaults/main.yml
+++ b/roles/server/gitea/defaults/main.yml
@@ -14,10 +14,13 @@ gitea_socket_path: "{{ gitea_user_directory }}/gitea.socket"
 gitea_configuration_path: "{{ gitea_custom_directory }}/app.ini"
 
 gitea_database_user: "gitea"
-gitea_database_pass: "{{ lookup('password', '/etc/ansible-credentials/mysql/' + gitea_database_user + ' length=80' ) }}"
+gitea_database_pass: "{{ lookup('password', 'credentials/' + inventory_hostname + '/mysql/' + gitea_database_user + ' length=80') }}"
 gitea_database_name: "{{ gitea_database_user }}"
 
-gitea_cookie_secret: "{{ lookup('password', '/etc/ansible-credentials/cookies/' + domain + ' length=80') }}"
+gitea_internal_token: "{{ lookup('password', 'credentials/' + inventory_hostname + '/gitea/' + domain + '/internal_token length=80') }}"
+gitea_cookie_secret: "{{ lookup('password', 'credentials/' + inventory_hostname + '/gitea/' + domain + '/secret_key length=80') }}"
+gitea_lfs_jwt_secret: "{{ lookup('password', 'credentials/' + inventory_hostname + '/gitea/' + domain + '/lfs_jwt_secret length=43') }}"
+gitea_oauth_jwt_secret: "{{ lookup('password', 'credentials/' + inventory_hostname + '/gitea/' + domain + '/oauth_jwt_secret length=80') }}"
 
 gitea_update_script: "update_gitea.sh"
 gitea_update_script_path: "{{ gitea_installation_directory }}/{{ gitea_update_script }}"