diff --git a/group_vars/all/all b/group_vars/all/all index 044ca37..d0767ed 100644 --- a/group_vars/all/all +++ b/group_vars/all/all @@ -12,4 +12,12 @@ hass_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDfVei9iC/Ra5qmSZcLu8z2CTa JD_myJDemail: ducampsvincent@gmail.com JD_myJDPassword: "{{ vault_MyJdownloader }}" JD_defaultdownloadfolder: /mnt/diskstation/media/download/incomplete -system_arch_local_mirror: "http://arch.{{domain.name}}" \ No newline at end of file +system_arch_local_mirror: "http://arch.{{domain.name}}" + +privatekeytodeploy: + - user: "{{user.name}}" + keyfile: "/home/{{user.name}}/.ssh/id_gitea" + privatekey: "{{vault_gitea_private_key}}" + - user: root + keyfile: /root/.ssh/id_gitea + privatekey: "{{vault_gitea_private_key}}" diff --git a/group_vars/server/server b/group_vars/server/server index 9040d39..306aa77 100644 --- a/group_vars/server/server +++ b/group_vars/server/server @@ -1,4 +1,4 @@ -syncthing_address: "0.0.0.0:8384" +syncthing_address: "0.0.0.0:8384" syncthing_gui_user: "{{user.name}}" syncthing_gui_password: $2a$10$nJZ8YN/1mB84Cbi79BKka.6SFMAKF.CBwyCNJDA9qUgXdkcuBilx2 @@ -34,18 +34,18 @@ supysonic_db_password: "{{ vault_mysql_supysonic }}" supysonic_SQl_target_file: /mnt/diskstation/git/backup/postgres/last/supysonic.sql supysonic_force_site_update: true -docker_users: "{{user.name}}" +docker_users: "{{user.name}}" hass_SQl_target_file: /mnt/diskstation/git/backup/postgres/last/hass.sql hass_db_password: "{{ vault_mysql_hass }}" hass_repo: "gitea@git.{{ domain.name }}:vincent/HASS_conf.git" -hass_users: "{{user.name}}" +hass_users: "{{user.name}}" keystodeploy: - name: juicessh with password user: "{{user.name}}" - sshkey: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINN5V9WPPi2/HwAQuDeaJO3hUPf8HxNMHqVmkf1pDjWg JuiceSSH + sshkey: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINN5V9WPPi2/HwAQuDeaJO3hUPf8HxNMHqVmkf1pDjWg JuiceSSH - name: fixe-pc new user: "{{user.name}}" sshkey: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDBrP9akjyailPU9tUMvKrtDsqjI191W1L95u3OFjBqqapXgbDVx1FVtSlIIKcCHZyTII1zgC7woZmNRpmaIJRh6N+VIuRrRs29xx2GUVc4pxflUwwIAK36hgZS3nqmA2biacmPR9HogZLZMcPtZdLhWGlLuUv1cWqbqW7UcDa0lbubCo2v4OQMx/zt37voKAZSkkbH9mVszH6eKxNFy1KXbLYhwXiKfYBnAHbivhiSkZUGV6D4HNj8Jx6IY1YF3bfwMXmt841Q/7OY+t3RTIS8ewvSF+jpQ7GKHBEsZTZUGwIoSyZFFvCgKQVOJu/ZJJS4HNkluilir9Sxtx2LRgy+HHQ251trnsVsJp3ts4uTiMkKJQy1PXy1ZvQXYkip9Af3vlXUMmTyVj8cv+No07G1rZ1pZ3wXKX4RkTsoep5GsYlhyUd7GzsAQQiX9YhYyWDQ6NHBYAGAWbw2BLNxltWa4AyWOa1C8v+1+mRwdvpdMY7powJNCXQaIJmiOZiI/Us= vincent@fixe-pc-2020-03-01 @@ -56,14 +56,6 @@ keystodeploy: user: drone-deploy sshkey: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDUaK+pQlosmopbZfucll9UdqDOTaODOBwoxRwkJEk1i drone@oscar -privatekeytodeploy: - - user: "{{user.name}}" - keyfile: "/home/{{user.name}}/.ssh/id_gitea" - privatekey: "{{vault_gitea_private_key}}" - - user: root - keyfile: /root/.ssh/id_gitea - privatekey: "{{vault_gitea_private_key}}" - pihole_admin_password: "{{ vault_pihole_admin }}" pihole_local_resolver: 192.168.1.10 pihole_local_domain: "{{ domain.name }}"