diff --git a/group_vars/all/all b/group_vars/all/all index 2d841ab..80efa61 100644 --- a/group_vars/all/all +++ b/group_vars/all/all @@ -3,7 +3,7 @@ user: name: vincent home: /home/vincent uid: 1024 - mail: vincent@ducamps.win + mail: vincent@ducamps.eu groups: - docker @@ -14,14 +14,12 @@ user: privatekey: - keyname: "id_gitea" key: "{{lookup('hashi_vault', 'secret=secrets/data/ansible/privatekey:gitea')}}" - - keyname: "id_consort" - key: "{{lookup('hashi_vault', 'secret=secrets/data/ansible/privatekey:consort')}}" domain: - name: ducamps.win + name: ducamps.eu hass_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDfVei9iC/Ra5qmSZcLu8z2CTaXCmfn4JSS4o3eu0HhykdYGSqhBTcUDD3/FhcTPQJVFsu1P4Gwqq1dCE+EvaZZRQaMUqVKUpOliThSG6etbImkvqLQQsC1qt+/NqSvfzu2+28A6+YspzuxsViGo7e3Gg9MdwV3LMGh0mcOr/uXb/HIk18sJg5yQpwMfYTj0Wda90nyegcN3F2iZMeauh/aaFJzWcHNakAAewceDYOErU07NhlZgVA2C8HgkJ8HL7AqIVqt9VOx3xLp91DbKTNXSxvyM0X4NQP24P7ZFxAOk/j0AX3hAWhaNmievCHyBWvQve1VshZXFwEIiuHm8q4GSCxK2r0oQudKdtIuQMfuUALigdiSxo522oEiML/2kSk17WsxZwh7SxfD0DKa82fy9iAwcAluWLwJ+yN3nGnDFF/tHYaamSiowpmTTmQ9ycyIPWPLVZclt3BlEt9WH/FPOdzAyY7YLzW9X6jhsU3QwViyaTRGqAdqzUAiflKCMsNzb5kq0oYsDFC+/eqp1USlgTZDhoKtTKRGEjW2KuUlDsXGBeB6w1D8XZxXJXAaHuMh4oMUgLswjLUdTH3oLnnAvfOrl8O66kTkmcQ8i/kr1wDODMy/oNUzs8q4DeRuhD5dpUiTUGYDTWPYj6m6U/GAEHvN/2YEqSgfVff1iQ4VBw== @@ -33,12 +31,9 @@ system_arch_local_mirror: "https://arch.{{domain.name}}" system_sudoers_group: "workstationAdmin" user_custom_host: - - host: "git.ducamps.win" + - host: "git.ducamps.eu" user: "git" keyfile: "~/.ssh/id_gitea" - - host: "gitlab.com" - user: "git" - keyfile: "~/.ssh/id_consort" user_config_repo: "ssh://git@git.{{ domain.name }}:2222/vincent/conf2.git" system_user: diff --git a/group_vars/all/sssd b/group_vars/all/sssd index 9650a7c..2aaa561 100644 --- a/group_vars/all/sssd +++ b/group_vars/all/sssd @@ -1,7 +1,7 @@ sssd_configure: true # sssd_configure is False by default - by default nothing is done by this role. ldap_search_base: "dc=ducamps,dc=win" -ldap_uri: "ldaps://ldap.ducamps.win" +ldap_uri: "ldaps://ldap.ducamps.eu" ldap_sudo_search_base: "ou=sudoers,dc=ducamps,dc=win" ldap_default_bind_dn : "uid=vaultserviceaccount,cn=users,dc=ducamps,dc=win" ldap_password : "{{lookup('hashi_vault', 'secret=secrets/data/ansible/other:vaulserviceaccount')}}" diff --git a/group_vars/workstation b/group_vars/workstation index b3bab91..464ad87 100644 --- a/group_vars/workstation +++ b/group_vars/workstation @@ -83,4 +83,3 @@ keystodeploy: user: "{{ user.name }}" sshkey: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDNwf36RNKFbMMV4PYaYLI3+1wVgCiLjN3sNmDM5mh//JIRmkhCvmzDEPGC31p61IpV6kmLNSKkX7T9ZadRBulQ74CLi/WTy3rimR9n2AMXQLhGSc7MxZOUQrFMBL2vn4n9/ezVigbsy0a7NqItH4gS4nqipfxz2jV+amKm6MpqnwksJjSO37IPRDZ/UKSq4BfYflgUE0Bkw8eE+HOUiXXTTC5uU3U3fXbqDMWOV+Vi6YbVZnYLwiUtnPn5+jcpC0ztB4B8gqorfexY1sJDBZBy/eH2+dzJdVQrwl3E1TBMORMD0VAqJkeEjxoyjfC7a/58h0e1x0mte4NkRQ7943tD8NWelhqZBGS7YGtGKyTVLewATERTEIokGJi+CrMRkcmWnfrpJ5A85lmbupWMzNrCvp0VTQ3G5vPT8eGWliMvwGthacXNZEsGmZu3BtPmIUedwsCTO/WKXHFt4xdohKnbCpOOjb5HXVe1N58CoOSFxJsZIjGSFLlOopTR9evfA80= vincent@oscar -virt_default_user: "{{user.name}}" diff --git a/host_vars/fixe-pc b/host_vars/fixe-pc index 0db0b7d..097ca4d 100644 --- a/host_vars/fixe-pc +++ b/host_vars/fixe-pc @@ -6,12 +6,12 @@ gpu: bumblebee: false hosts_file_snippets: | - #192.168.1.50 arch.ducamps.win - #192.168.1.50 www.ducamps.win - #192.168.1.50 file.ducamps.win - #192.168.1.50 supysonic.ducamps.win - #192.168.1.50 syno.ducamps.win - #192.168.1.50 vault.ducamps.win - #192.168.1.50 ww.ducamps.win - #192.168.1.50 hass.ducamps.win - #192.168.1.50 git.ducamps.win + #192.168.1.50 arch.ducamps.eu + #192.168.1.50 www.ducamps.eu + #192.168.1.50 file.ducamps.eu + #192.168.1.50 supysonic.ducamps.eu + #192.168.1.50 syno.ducamps.eu + #192.168.1.50 vault.ducamps.eu + #192.168.1.50 ww.ducamps.eu + #192.168.1.50 hass.ducamps.eu + #192.168.1.50 git.ducamps.eu diff --git a/roles/requirements.yml b/roles/requirements.yml index ce8cf15..2d78493 100644 --- a/roles/requirements.yml +++ b/roles/requirements.yml @@ -1,42 +1,42 @@ --- -- src: ssh://git@git.ducamps.win:2222/ansible-roles/ansible-arch-provissionning.git +- src: ssh://git@git.ducamps.eu:2222/ansible-roles/ansible-arch-provissionning.git scm: git -- src: ssh://git@git.ducamps.win:2222/ansible-roles/ansible-manager.git +- src: ssh://git@git.ducamps.eu:2222/ansible-roles/ansible-manager.git scm: git -- src: ssh://git@git.ducamps.win:2222/ansible-roles/ansible-role-sssd +- src: ssh://git@git.ducamps.eu:2222/ansible-roles/ansible-role-sssd scm: git -- src: ssh://git@git.ducamps.win:2222/ansible-roles/ansible_bootstrap.git +- src: ssh://git@git.ducamps.eu:2222/ansible-roles/ansible_bootstrap.git scm: git -- src: ssh://git@git.ducamps.win:2222/ansible-roles/autofs.git +- src: ssh://git@git.ducamps.eu:2222/ansible-roles/autofs.git scm: git -- src: ssh://git@git.ducamps.win:2222/ansible-roles/bluetooth.git +- src: ssh://git@git.ducamps.eu:2222/ansible-roles/bluetooth.git scm: git -- src: ssh://git@git.ducamps.win:2222/ansible-roles/cronie.git +- src: ssh://git@git.ducamps.eu:2222/ansible-roles/cronie.git scm: git -- src: ssh://git@git.ducamps.win:2222/ansible-roles/cups.git +- src: ssh://git@git.ducamps.eu:2222/ansible-roles/cups.git scm: git -- src: ssh://git@git.ducamps.win:2222/ansible-roles/docker.git +- src: ssh://git@git.ducamps.eu:2222/ansible-roles/docker.git scm: git -- src: ssh://git@git.ducamps.win:2222/ansible-roles/grub_themes.git +- src: ssh://git@git.ducamps.eu:2222/ansible-roles/grub_themes.git scm: git -- src: ssh://git@git.ducamps.win:2222/ansible-roles/hass-client-control.git +- src: ssh://git@git.ducamps.eu:2222/ansible-roles/hass-client-control.git scm: git -- src: ssh://git@git.ducamps.win:2222/ansible-roles/laptop.git +- src: ssh://git@git.ducamps.eu:2222/ansible-roles/laptop.git scm: git -- src: ssh://git@git.ducamps.win:2222/ansible-roles/mpd.git +- src: ssh://git@git.ducamps.eu:2222/ansible-roles/mpd.git scm: git -- src: ssh://git@git.ducamps.win:2222/ansible-roles/nvidia.git +- src: ssh://git@git.ducamps.eu:2222/ansible-roles/nvidia.git scm: git -- src: ssh://git@git.ducamps.win:2222/ansible-roles/system.git +- src: ssh://git@git.ducamps.eu:2222/ansible-roles/system.git scm: git -- src: ssh://git@git.ducamps.win:2222/ansible-roles/user_config.git +- src: ssh://git@git.ducamps.eu:2222/ansible-roles/user_config.git scm: git -- src: ssh://git@git.ducamps.win:2222/ansible-roles/virt.git +- src: ssh://git@git.ducamps.eu:2222/ansible-roles/virt.git scm: git -- src: ssh://git@git.ducamps.win:2222/ansible-roles/workstation.git +- src: ssh://git@git.ducamps.eu:2222/ansible-roles/workstation.git scm: git -- src: ssh://git@git.ducamps.win:2222/ansible-roles/syncthing.git +- src: ssh://git@git.ducamps.eu:2222/ansible-roles/syncthing.git scm: git -- src: ssh://git@git.ducamps.win:2222/ansible-roles/ansible-user.git +- src: ssh://git@git.ducamps.eu:2222/ansible-roles/ansible-user.git scm: git