From 8e4969509a9421ca3a13486500fa4643f9310a60 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Thu, 12 Sep 2024 12:52:09 +0200 Subject: [PATCH] ff --- group_vars/all.yml | 4 +++- group_vars/blocky.yml | 5 ++++- roles/mgrote_user_setup/defaults/main.yml | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/group_vars/all.yml b/group_vars/all.yml index 87b06980..ff3ea155 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -15,8 +15,10 @@ dotfiles: - user: root home: /root dotfiles_repo_url: https://git.mgrote.net/mg/dotfiles -dotfiles_vim_vundle_repo_url: https://git.mgrote.net/mirrors/Vundle.vim.git +ansible_forgejo_user: svc_ansible +ansible_forgejo_user_pass: "{{ lookup('viczem.keepass.keepass', 'user_setup_forgejo_user_pass', 'password') }}" # user ist dem Repo als "Collaborator" + "RO" hinzugefügt worden +dotfiles_vim_vundle_repo_url: "https://{{ ansible_forgejo_user | urlencode }}:{{ ansible_forgejo_user_pass | urlencode }}@git.mgrote.net/mirrors/Vundle.vim.git" ### mgrote_netplan netplan_configure: true diff --git a/group_vars/blocky.yml b/group_vars/blocky.yml index b5ed8c83..0c357366 100644 --- a/group_vars/blocky.yml +++ b/group_vars/blocky.yml @@ -24,7 +24,10 @@ apt_packages_extra: - libnet-dns-perl # für munin: dnsresponse_ ### mgrote_user_setup -dotfiles_vim_vundle_repo_url: http://192.168.2.42:3000/mirrors/Vundle.vim.git +ansible_forgejo_user: svc_ansible +ansible_forgejo_user_pass: "{{ lookup('viczem.keepass.keepass', 'user_setup_forgejo_user_pass', 'password') }}" # user ist dem Repo als "Collaborator" + "RO" hinzugefügt worden + +dotfiles_vim_vundle_repo_url: "https://{{ ansible_forgejo_user | urlencode }}:{{ ansible_forgejo_user_pass | urlencode }}@192.168.2.42:3000/mirrors/Vundle.vim.git" dotfiles: - user: mg home: /home/mg diff --git a/roles/mgrote_user_setup/defaults/main.yml b/roles/mgrote_user_setup/defaults/main.yml index fb4c2491..532d0f59 100644 --- a/roles/mgrote_user_setup/defaults/main.yml +++ b/roles/mgrote_user_setup/defaults/main.yml @@ -6,7 +6,7 @@ dotfiles: home: /root ansible_forgejo_user: svc_ansible -ansible_forgejo_user_pass: "{{ lookup('viczem.keepass.keepass', 'user_setup_forgejo_user_pass', 'password') }}" # user ist dem Repo als "Collaborator" hinzugefügt worden +ansible_forgejo_user_pass: "{{ lookup('viczem.keepass.keepass', 'user_setup_forgejo_user_pass', 'password') }}" # user ist dem Repo als "Collaborator" + "RO" hinzugefügt worden dotfiles_vim_vundle_repo_url: "https://{{ ansible_forgejo_user | urlencode }}:{{ ansible_forgejo_user_pass | urlencode }}@git.mgrote.net/mirrors/Vundle.vim.git" dotfiles_repo_url: https://git.mgrote.net/mg/dotfiles