From 5dc1ce66424fff2ed853e6e0c8fa74f5365eafed Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 13 May 2024 11:44:33 +0200 Subject: [PATCH 01/16] dd --- group_vars/blocky.yml | 3 +-- roles/mgrote_gitea_setup/tasks/admin.yml | 22 +++++++++++++++++----- roles/mgrote_gitea_setup/tasks/ldap.yml | 2 +- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/group_vars/blocky.yml b/group_vars/blocky.yml index bf43ad80..52f1894a 100644 --- a/group_vars/blocky.yml +++ b/group_vars/blocky.yml @@ -80,7 +80,7 @@ blocky_custom_lookups: # optional ip: 192.168.3.239 - name: pve5-test.mgrote.net ip: 192.168.2.17 - - name: pve5.mgrote.net # bleibt im Router auch angelegt, weil wenn pve aus auch kein blocky ;-) + - name: pve5.mgrote.net # bleibt im Router auch angelegt, weil wenn pve aus auch kein blocky mehr ;-) ip: 192.168.2.16 - name: rb5009.mgrote.net ip: 192.168.2.1 @@ -89,7 +89,6 @@ blocky_custom_lookups: # optional - name: ldap.mgrote.net ip: 192.168.2.47 - ### mgrote_munin_node # kann git.mgrote.net nicht auflösen, deshalb hiermit IP munin_node_plugins: diff --git a/roles/mgrote_gitea_setup/tasks/admin.yml b/roles/mgrote_gitea_setup/tasks/admin.yml index 64543baa..a9263cdf 100644 --- a/roles/mgrote_gitea_setup/tasks/admin.yml +++ b/roles/mgrote_gitea_setup/tasks/admin.yml @@ -4,19 +4,31 @@ # - https://github.com/lldap/lldap/blob/main/example_configs/gitea.md # und # den jeweiligen group/host-Vars! + +- name: Check if Admin-User exists + no_log: true + become_user: gitea + become: true + ansible.builtin.command: | + forgejo admin user create \ + --config "{{ gitea_configuration_path }}/gitea.ini" + --username "{{ gitea_admin_user }}" \ + --password "{{ gitea_admin_user_pass }}" \ + --email "{{ gitea_admin_user }}@mgrote.net" \ + --admin + register: check + ignore_errors: true + - name: Ensure Admin-User exists no_log: true become_user: gitea become: true ansible.builtin.command: | forgejo admin user create \ - --config /etc/gitea/gitea.ini + --config "{{ gitea_configuration_path }}/gitea.ini" --username "{{ gitea_admin_user }}" \ --password "{{ gitea_admin_user_pass }}" \ --email "{{ gitea_admin_user }}@mgrote.net" \ --admin - register: setup_admin - ignore_errors: true - failed_when: 'not "Command error: CreateUser: user already exists [name: mg]" in setup_admin.stderr' # fail Task wenn LDAP schon konfiguriert ist - changed_when: "setup_admin.rc == 0" # chnaged nur wenn Task rc 0 hat, sollte nur beim ersten lauf vorkommen; ungetestet + when: 'not "Command error: CreateUser: user already exists [name: fadmin]" in check' ... diff --git a/roles/mgrote_gitea_setup/tasks/ldap.yml b/roles/mgrote_gitea_setup/tasks/ldap.yml index 7fbb7436..c0a76473 100644 --- a/roles/mgrote_gitea_setup/tasks/ldap.yml +++ b/roles/mgrote_gitea_setup/tasks/ldap.yml @@ -10,7 +10,7 @@ become: true ansible.builtin.command: | forgejo admin auth add-ldap \ - --config "{{ gitea_configuration_path }}/gitea.ini" \ + --config "{{ gitea_configuration_path }}/gitea.ini" --name "lldap" \ --security-protocol "unencrypted" \ --host "{{ gitea_ldap_host }}" \ -- 2.43.0 From 589b079c3f911e93e6fadc4ceab65a8dd5252e8b Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 13 May 2024 11:45:22 +0200 Subject: [PATCH 02/16] ff --- roles/mgrote_gitea_setup/tasks/admin.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/mgrote_gitea_setup/tasks/admin.yml b/roles/mgrote_gitea_setup/tasks/admin.yml index a9263cdf..95cde3b8 100644 --- a/roles/mgrote_gitea_setup/tasks/admin.yml +++ b/roles/mgrote_gitea_setup/tasks/admin.yml @@ -6,7 +6,7 @@ # den jeweiligen group/host-Vars! - name: Check if Admin-User exists - no_log: true +# no_log: true become_user: gitea become: true ansible.builtin.command: | @@ -20,7 +20,7 @@ ignore_errors: true - name: Ensure Admin-User exists - no_log: true +# no_log: true become_user: gitea become: true ansible.builtin.command: | -- 2.43.0 From 341073f7f5f882f3abc976db0b33f893055a45ca Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 13 May 2024 11:45:50 +0200 Subject: [PATCH 03/16] ff --- roles/mgrote_gitea_setup/tasks/admin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/mgrote_gitea_setup/tasks/admin.yml b/roles/mgrote_gitea_setup/tasks/admin.yml index 95cde3b8..f4278f5e 100644 --- a/roles/mgrote_gitea_setup/tasks/admin.yml +++ b/roles/mgrote_gitea_setup/tasks/admin.yml @@ -30,5 +30,5 @@ --password "{{ gitea_admin_user_pass }}" \ --email "{{ gitea_admin_user }}@mgrote.net" \ --admin - when: 'not "Command error: CreateUser: user already exists [name: fadmin]" in check' + when: 'not "Command error: CreateUser: user already exists [name: fadmin]" in check.stderr' ... -- 2.43.0 From bb9089f4a68fb1a0bafdea055cfbb479d0e0ef97 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 13 May 2024 11:46:17 +0200 Subject: [PATCH 04/16] ff --- roles/mgrote_gitea_setup/tasks/admin.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/mgrote_gitea_setup/tasks/admin.yml b/roles/mgrote_gitea_setup/tasks/admin.yml index f4278f5e..4f212539 100644 --- a/roles/mgrote_gitea_setup/tasks/admin.yml +++ b/roles/mgrote_gitea_setup/tasks/admin.yml @@ -6,7 +6,7 @@ # den jeweiligen group/host-Vars! - name: Check if Admin-User exists -# no_log: true + no_log: true become_user: gitea become: true ansible.builtin.command: | @@ -20,7 +20,7 @@ ignore_errors: true - name: Ensure Admin-User exists -# no_log: true + no_log: true become_user: gitea become: true ansible.builtin.command: | -- 2.43.0 From 1eba10e9cbf5471016230fae776c7507d13ffad2 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 13 May 2024 11:47:26 +0200 Subject: [PATCH 05/16] ff --- roles/mgrote_gitea_setup/tasks/admin.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/mgrote_gitea_setup/tasks/admin.yml b/roles/mgrote_gitea_setup/tasks/admin.yml index 4f212539..cba9e35e 100644 --- a/roles/mgrote_gitea_setup/tasks/admin.yml +++ b/roles/mgrote_gitea_setup/tasks/admin.yml @@ -18,6 +18,7 @@ --admin register: check ignore_errors: true + failed_when: 'not "Command error: CreateUser: user already exists [name: fadmin]" in check.stderr' - name: Ensure Admin-User exists no_log: true -- 2.43.0 From d0b2b2d74bf118000032ffd72882c6ffa2b45a08 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 13 May 2024 11:49:19 +0200 Subject: [PATCH 06/16] ff --- roles/mgrote_gitea_setup/tasks/admin.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/roles/mgrote_gitea_setup/tasks/admin.yml b/roles/mgrote_gitea_setup/tasks/admin.yml index cba9e35e..64a5c47c 100644 --- a/roles/mgrote_gitea_setup/tasks/admin.yml +++ b/roles/mgrote_gitea_setup/tasks/admin.yml @@ -12,13 +12,8 @@ ansible.builtin.command: | forgejo admin user create \ --config "{{ gitea_configuration_path }}/gitea.ini" - --username "{{ gitea_admin_user }}" \ - --password "{{ gitea_admin_user_pass }}" \ - --email "{{ gitea_admin_user }}@mgrote.net" \ - --admin + --list register: check - ignore_errors: true - failed_when: 'not "Command error: CreateUser: user already exists [name: fadmin]" in check.stderr' - name: Ensure Admin-User exists no_log: true @@ -31,5 +26,5 @@ --password "{{ gitea_admin_user_pass }}" \ --email "{{ gitea_admin_user }}@mgrote.net" \ --admin - when: 'not "Command error: CreateUser: user already exists [name: fadmin]" in check.stderr' + when: '"{{ gitea_admin_user }}@mgrote.net" in check.stdout' ... -- 2.43.0 From 7e20fbd466f5ea7577b02e881c97bf9e2a332666 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 13 May 2024 11:49:36 +0200 Subject: [PATCH 07/16] ff --- roles/mgrote_gitea_setup/tasks/admin.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/mgrote_gitea_setup/tasks/admin.yml b/roles/mgrote_gitea_setup/tasks/admin.yml index 64a5c47c..b51c9751 100644 --- a/roles/mgrote_gitea_setup/tasks/admin.yml +++ b/roles/mgrote_gitea_setup/tasks/admin.yml @@ -6,7 +6,7 @@ # den jeweiligen group/host-Vars! - name: Check if Admin-User exists - no_log: true +# no_log: true become_user: gitea become: true ansible.builtin.command: | @@ -16,7 +16,7 @@ register: check - name: Ensure Admin-User exists - no_log: true + #no_log: true become_user: gitea become: true ansible.builtin.command: | -- 2.43.0 From 8e4865e4daa803d4ff0968aa6d47e54a6ab555ef Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 13 May 2024 11:50:19 +0200 Subject: [PATCH 08/16] f --- roles/mgrote_gitea_setup/tasks/admin.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/roles/mgrote_gitea_setup/tasks/admin.yml b/roles/mgrote_gitea_setup/tasks/admin.yml index b51c9751..e3a0287a 100644 --- a/roles/mgrote_gitea_setup/tasks/admin.yml +++ b/roles/mgrote_gitea_setup/tasks/admin.yml @@ -10,9 +10,8 @@ become_user: gitea become: true ansible.builtin.command: | - forgejo admin user create \ + forgejo admin user list \ --config "{{ gitea_configuration_path }}/gitea.ini" - --list register: check - name: Ensure Admin-User exists -- 2.43.0 From 9b8b740177b666cc9c5aafa4299e072e01e26be7 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 13 May 2024 11:50:56 +0200 Subject: [PATCH 09/16] ff --- roles/mgrote_gitea_setup/tasks/admin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/mgrote_gitea_setup/tasks/admin.yml b/roles/mgrote_gitea_setup/tasks/admin.yml index e3a0287a..c92bbdcd 100644 --- a/roles/mgrote_gitea_setup/tasks/admin.yml +++ b/roles/mgrote_gitea_setup/tasks/admin.yml @@ -25,5 +25,5 @@ --password "{{ gitea_admin_user_pass }}" \ --email "{{ gitea_admin_user }}@mgrote.net" \ --admin - when: '"{{ gitea_admin_user }}@mgrote.net" in check.stdout' + when: 'not "{{ gitea_admin_user }}@mgrote.net" in check.stdout' ... -- 2.43.0 From cdc3d842a5d6bdb86e0cab9a8672cfa13ce794df Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 13 May 2024 11:51:22 +0200 Subject: [PATCH 10/16] ff --- roles/mgrote_gitea_setup/tasks/admin.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/mgrote_gitea_setup/tasks/admin.yml b/roles/mgrote_gitea_setup/tasks/admin.yml index c92bbdcd..ebada1ba 100644 --- a/roles/mgrote_gitea_setup/tasks/admin.yml +++ b/roles/mgrote_gitea_setup/tasks/admin.yml @@ -6,13 +6,14 @@ # den jeweiligen group/host-Vars! - name: Check if Admin-User exists -# no_log: true + no_log: true become_user: gitea become: true ansible.builtin.command: | forgejo admin user list \ --config "{{ gitea_configuration_path }}/gitea.ini" register: check + changed_when: false - name: Ensure Admin-User exists #no_log: true -- 2.43.0 From 4d8d21bfe6039acf402638637eeb416373f64f75 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 13 May 2024 11:52:04 +0200 Subject: [PATCH 11/16] ff --- roles/mgrote_gitea_setup/tasks/admin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/mgrote_gitea_setup/tasks/admin.yml b/roles/mgrote_gitea_setup/tasks/admin.yml index ebada1ba..5e15200e 100644 --- a/roles/mgrote_gitea_setup/tasks/admin.yml +++ b/roles/mgrote_gitea_setup/tasks/admin.yml @@ -26,5 +26,5 @@ --password "{{ gitea_admin_user_pass }}" \ --email "{{ gitea_admin_user }}@mgrote.net" \ --admin - when: 'not "{{ gitea_admin_user }}@mgrote.net" in check.stdout' + when: 'not "gitea_admin_user@mgrote.net" in check.stdout' ... -- 2.43.0 From 1d859ed64d1be9a015cca4e690bacfaddb16cc27 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 13 May 2024 11:53:12 +0200 Subject: [PATCH 12/16] ff --- roles/mgrote_gitea_setup/tasks/admin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/mgrote_gitea_setup/tasks/admin.yml b/roles/mgrote_gitea_setup/tasks/admin.yml index 5e15200e..0b5eb028 100644 --- a/roles/mgrote_gitea_setup/tasks/admin.yml +++ b/roles/mgrote_gitea_setup/tasks/admin.yml @@ -26,5 +26,5 @@ --password "{{ gitea_admin_user_pass }}" \ --email "{{ gitea_admin_user }}@mgrote.net" \ --admin - when: 'not "gitea_admin_user@mgrote.net" in check.stdout' + when: 'not "gitea_admin_user" in check.stdout' ... -- 2.43.0 From 7798d19c2022cf7e17e668517432307baf1bc1fe Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 13 May 2024 11:53:55 +0200 Subject: [PATCH 13/16] f --- roles/mgrote_gitea_setup/tasks/admin.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/roles/mgrote_gitea_setup/tasks/admin.yml b/roles/mgrote_gitea_setup/tasks/admin.yml index 0b5eb028..deb69b05 100644 --- a/roles/mgrote_gitea_setup/tasks/admin.yml +++ b/roles/mgrote_gitea_setup/tasks/admin.yml @@ -15,6 +15,10 @@ register: check changed_when: false +- name: dbug + ansible.builtin.debug: + msg: "{{ check }}" + - name: Ensure Admin-User exists #no_log: true become_user: gitea -- 2.43.0 From de4391dac3b42cccf7d6923c78272735a56c5fdc Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 13 May 2024 11:57:24 +0200 Subject: [PATCH 14/16] dd --- roles/mgrote_gitea_setup/tasks/admin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/mgrote_gitea_setup/tasks/admin.yml b/roles/mgrote_gitea_setup/tasks/admin.yml index deb69b05..230214e2 100644 --- a/roles/mgrote_gitea_setup/tasks/admin.yml +++ b/roles/mgrote_gitea_setup/tasks/admin.yml @@ -30,5 +30,5 @@ --password "{{ gitea_admin_user_pass }}" \ --email "{{ gitea_admin_user }}@mgrote.net" \ --admin - when: 'not "gitea_admin_user" in check.stdout' + when: 'not "{{ gitea_admin_user }}@mgrote.net" in check.stdout' ... -- 2.43.0 From 6f5b1d87f884fc086b2df13454366c3f60543a92 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 13 May 2024 11:58:05 +0200 Subject: [PATCH 15/16] ff --- roles/mgrote_gitea_setup/tasks/admin.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/mgrote_gitea_setup/tasks/admin.yml b/roles/mgrote_gitea_setup/tasks/admin.yml index 230214e2..c9ecf58b 100644 --- a/roles/mgrote_gitea_setup/tasks/admin.yml +++ b/roles/mgrote_gitea_setup/tasks/admin.yml @@ -15,10 +15,6 @@ register: check changed_when: false -- name: dbug - ansible.builtin.debug: - msg: "{{ check }}" - - name: Ensure Admin-User exists #no_log: true become_user: gitea @@ -31,4 +27,8 @@ --email "{{ gitea_admin_user }}@mgrote.net" \ --admin when: 'not "{{ gitea_admin_user }}@mgrote.net" in check.stdout' + +- name: Show existing users + ansible.builtin.debug: + msg: "{{ check.stdout_lines }}" ... -- 2.43.0 From 9114f22e84ef98e0effd2d995127cbda07d290c2 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 13 May 2024 11:59:25 +0200 Subject: [PATCH 16/16] ff --- roles/mgrote_gitea_setup/tasks/admin.yml | 2 +- roles/mgrote_gitea_setup/tasks/ldap.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/mgrote_gitea_setup/tasks/admin.yml b/roles/mgrote_gitea_setup/tasks/admin.yml index c9ecf58b..5d80697a 100644 --- a/roles/mgrote_gitea_setup/tasks/admin.yml +++ b/roles/mgrote_gitea_setup/tasks/admin.yml @@ -21,7 +21,7 @@ become: true ansible.builtin.command: | forgejo admin user create \ - --config "{{ gitea_configuration_path }}/gitea.ini" + --config "{{ gitea_configuration_path }}/gitea.ini" \ --username "{{ gitea_admin_user }}" \ --password "{{ gitea_admin_user_pass }}" \ --email "{{ gitea_admin_user }}@mgrote.net" \ diff --git a/roles/mgrote_gitea_setup/tasks/ldap.yml b/roles/mgrote_gitea_setup/tasks/ldap.yml index c0a76473..7fbb7436 100644 --- a/roles/mgrote_gitea_setup/tasks/ldap.yml +++ b/roles/mgrote_gitea_setup/tasks/ldap.yml @@ -10,7 +10,7 @@ become: true ansible.builtin.command: | forgejo admin auth add-ldap \ - --config "{{ gitea_configuration_path }}/gitea.ini" + --config "{{ gitea_configuration_path }}/gitea.ini" \ --name "lldap" \ --security-protocol "unencrypted" \ --host "{{ gitea_ldap_host }}" \ -- 2.43.0