diff --git a/group_vars/all/main.yml b/group_vars/all/main.yml index fa3ea0d..aeb5f3a 100644 --- a/group_vars/all/main.yml +++ b/group_vars/all/main.yml @@ -2348,7 +2348,7 @@ default_user: - name: localadmin user_id: 1051 group_id: 1051 - group: sysadm + group: localadmin password: $y$j9T$1WH8G2UkuN1jjp4QLuoeC0$dXpOnJUfMMAqAXlwN8XD0pq78r.a4UZOgt3LY4afxy/ shell: /bin/bash ssh_keys: diff --git a/host_vars/backup.oopen.de.yml b/host_vars/backup.oopen.de.yml index 70a8bdd..c64178c 100644 --- a/host_vars/backup.oopen.de.yml +++ b/host_vars/backup.oopen.de.yml @@ -271,6 +271,7 @@ default_user: - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGRaUsGqBvZBDzyh1kuldC/jdbtuoXFgBZ7PbgSqytSn root@cl-fm' - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEvmOpsiL+eiJ3qZVDJiUCFVZge0OQJ1hpZgw7pJ8sq5 root@cl-irights' - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIjr0aBl2KQTJnlVK03DOs0u+IXSon4VewwAzzSBsmVW root@cl-lubax' + - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMhwPCxVHqABXzyXwVuqbH703RCU0N+SC/cx4TuoHhGU root@cl-nd' - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL7h6rR+q5bRh/qgzA7ZyiZcRr9vMbo7cxhQsoukWmUn root@cl-vbrg' - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIcHQfSVG8DM1qHp2ce73ZBWXknZGZFur5s27V58T7ON root@cl-opp' - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIClnyNS5RQsbXmgOX7NU7i154DElOlha3y0ybF6FwScT root@cl-test' diff --git a/host_vars/file-km-neu.anw-km.netz.yml b/host_vars/file-km-neu.anw-km.netz.yml new file mode 100644 index 0000000..d280e3c --- /dev/null +++ b/host_vars/file-km-neu.anw-km.netz.yml @@ -0,0 +1,768 @@ +--- + +# --- +# vars used by roles/network_interfaces +# --- + + +# If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted +network_manage_devices: True + +# Should the interfaces be reloaded after config change? +network_interface_reload: False + +network_interface_path: /etc/network/interfaces.d +network_interface_required_packages: + - vlan + - bridge-utils + - ifmetric + - ifupdown + - ifenslave + + +network_interfaces: + + - device: br0 + # use only once per device (for the first device entry) + headline: br0 - bridge over device eno1np0 + + # auto & allow are only used for the first device entry + allow: [] # array of allow-[stanzas] eg. allow-hotplug + auto: true + + family: inet + method: static + description: + address: 192.168.122.210 + netmask: 24 + gateway: 192.168.122.254 + + # optional dns settings nameservers: [] + # + # nameservers: + # - 194.150.168.168 # dns.as250.net + # - 91.239.100.100 # anycast.censurfridns.dk + # search: warenform.de + # + + # optional bridge parameters bridge: {} + # bridge: + # ports: + # stp: + # fd: + # maxwait: + # waitport: + bridge: + ports: eno1np0 # for mor devices support a blank separated list + stp: !!str off + fd: 5 + hello: 2 + maxage: 12 + + # inline hook scripts + pre-up: + - !!str "ip link set dev eno1np0 up" # pre-up script lines + up: [] #up script lines + post-up: [] # post-up script lines (alias for up) + pre-down: [] # pre-down script lines (alias for down) + down: [] # down script lines + post-down: [] # post-down script lines + + +# --- +# vars used by roles/ansible_dependencies +# --- + + +# --- +# vars used by roles/ansible_user +# --- + + +# --- +# vars used by roles/common/tasks/basic.yml +# --- + + +# --- +# vars used by roles/common/tasks/sshd.yml +# --- + + +# --- +# vars used by roles/common/tasks/apt.yml +# --- + + +# --- +# vars used by roles/common/tasks/systemd-resolved.yml +# --- + +systemd_resolved: true + +# CyberGhost - Schnelle Verbindung mit Keine-Logs-Datenschutzrichtlinie +# Primäre DNS-Adresse: 38.132.106.139 +# Sekundäre DNS-Adresse: 194.187.251.67 +# +# Cloudflare (USA) Bester kostenloser DNS-Server für Gaming mit zuverlässigen Verbindungen +# primäre DNS-Adresse +# IPv4: 1.1.1.1 +# IPv6: 2606:4700:4700::1111 +# sekundäre DNS-Adresse +# IPv4: 1.0.0.1 +# IPv6: 2606:4700:4700::1001 +# +# Google (USA) Public DNS - Großartige Kombination aus Geschwindigkeit und Sicherheit +# primäre DNS-Adresse +# IPv4: 8.8.8.8 +# IPv6: 2001:4860:4860::8888 +# sekundäre DNS-Adresse +# IPv4: 8.8.4.4 +# IPv6: 2001:4860:4860::8844 +# +# Quad9 (CH) - Blockiert mühelos schädliche Seiten und verhindert Phishing-Betrug +# primäre DNS-Adresse +# IPv4: 9.9.9.9 +# IPv6: 2620:fe::fe +# sekundäre DNS-Adresse +# IPv4: 149.112.112.112 +# IPv6: 2620:fe::9 +# +# OpenNIC - https://www.opennic.org/ +# IPv4: 195.10.195.195 - ns31.de +# IPv4: 94.16.114.254 - ns28.de +# IPv4: 51.254.162.59 - ns9.de +# IPv4: 194.36.144.87 - ns29.de +# IPv6: 2a00:f826:8:2::195 - ns31.de +# +# Freifunk München (normales DNS, DNS-over-TLS und DNS-over-HTTPS) +# IPv4: 5.1.66.255 +# IPv6: 2001:678:e68:f000:: +# Servername für DNS-over-TLS: dot.ffmuc.net +# IPv4: 185.150.99.255 +# IPv6: 2001:678:ed0:f000:: +# Servername für DNS-over-TLS: dot.ffmuc.net +# für iOS 14+: DoT-Server-Konfiguration (unsigniert, vom PrHdb) +resolved_nameserver: + - 192.168.122.1 + +# search domains +# +# If there are more than one search domains, then specify them here in the order in which +# the resolver should also search them +# +#resolved_domains: [] +resolved_domains: + - ~. + - anw-km.netz + +resolved_dnssec: false + +# dns.as250.net: 194.150.168.168 +# +resolved_fallback_nameserver: + - 172.16.122.254 + + +# --- +# vars used by roles/common/tasks/cron.yml +# --- + +cron_user_special_time_entries: + + - name: "Restart DNS Cache service 'systemd-resolved'" + special_time: reboot + job: "sleep 10 ; /bin/systemctl restart systemd-resolved" + insertafter: PATH + + + +# --- +# vars used by roles/common/tasks/users.yml +# --- + +extra_user: + + - name: advoware + user_id: 1115 + group_id: 1115 + group: advoware + home: / data/home/advoware + password: $y$j9T$wuQkVnvJxMIy/2Hvmqm2w/$AlMLFmglx764uNSekaFJ3inN59jiDc8.4F2vhUybF22 + shell: /bin/bash + ssh_keys: + - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO90culn3sicU2chTHn40ytcTay0nUIHap0uF/5fVM6P chris@sol' + - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOQHMUKlDh2ufno5pZOhUY5xFljC1R5zQ/GjOHDkS58D root@sol' + + - name: a-jur + user_id: 1110 + group_id: 1110 + group: a-jur + home: / data/home/a-jur + password: $y$j9T$wuQkVnvJxMIy/2Hvmqm2w/$AlMLFmglx764uNSekaFJ3inN59jiDc8.4F2vhUybF22 + shell: /bin/bash + ssh_keys: + - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO90culn3sicU2chTHn40ytcTay0nUIHap0uF/5fVM6P chris@sol' + - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOQHMUKlDh2ufno5pZOhUY5xFljC1R5zQ/GjOHDkS58D root@sol' + + - name: back + user_id: 1060 + group_id: 1060 + group: back + home: /home/back + password: $y$j9T$WmitGB98lhPLJ39Iy4YfH.$irv0LP1bB5ImQKBUr1acEif6Ed6zDu6gLQuGQd/i5s0 + shell: /bin/bash + ssh_keys: + - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO90culn3sicU2chTHn40ytcTay0nUIHap0uF/5fVM6P chris@sol' + - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOQHMUKlDh2ufno5pZOhUY5xFljC1R5zQ/GjOHDkS58D root@sol' + - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKd0AwTHbDBK4Dgs+IZWmtnDBjoVIogOUvkLIYvsff1y root@backup.open.de' + + - name: borg + user_id: 1065 + group_id: 1065 + group: borg + home: /home/borg + password: $y$j9T$JPKlR6kIk7GJStSdmAQWq/$e1vJER6KL/dk1diFNtC.COw9lu2uT6ZdrUgGcNVb912 + shell: /bin/bash + ssh_keys: + - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO90culn3sicU2chTHn40ytcTay0nUIHap0uF/5fVM6P chris@sol' + - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOQHMUKlDh2ufno5pZOhUY5xFljC1R5zQ/GjOHDkS58D root@sol' + - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILsqkTV7RiYPljwlP/MZA+MBeTgiwZI7oCAD77Ujpm1V root@file-km' + - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOan+hwlA8B3mk82tsvL1LGlejrF5pqT2J3POrg/QJLX root@gw-km' + + +# --- +# vars used by roles/common/tasks/users-systemfiles.yml +# --- + + +# --- +# vars used by roles/common/tasks/webadmin-user.yml +# --- + + +# --- +# vars used by roles/common/tasks/sudoers.yml +# --- +# +# see: roles/common/tasks/vars + +sudoers_file_user_back_mount_privileges: + - 'ALL=(root) NOPASSWD: /usr/bin/mount' + - 'ALL=(root) NOPASSWD: /usr/bin/umount' + + +# --- +# vars used by roles/common/tasks/caching-nameserver.yml +# --- + + +# --- +# vars used by roles/common/tasks/git.yml +# --- + + +# --- +# vars used by roles/common/tasks/samba-config-server.yml +# vars used by roles/common/tasks/samba-user.yml +# --- + +samba_server_ip: 192.168.122.210 +samba_server_cidr_prefix: 24 + +samba_workgroup: WORKGROUP + +samba_netbios_name: FILE-KM + +samba_server_min_protocol: !!str NT1 + +samba_groups: + - name: kanzlei + group_id: 1100 + - name: a-jur + group_id: 1110 + - name: advoware + group_id: 1115 + - name: intern + group_id: 1120 + - name: aulmann + group_id: 1130 + - name: howe + group_id: 1140 + - name: stahmann + group_id: 1150 + - name: traine + group_id: 1160 + - name: public + group_id: 1170 + - name: alle + group_id: 1180 + + + +samba_user: + + - name: advoware + groups: + - advoware + password: '9WNRbc49m3' + + - name: a-jur + groups: + - a-jur + - alle + - intern + - kanzlei + password: 'a-jur' + + - name: andrea + groups: + - advoware + - aulmann + - howe + - stahmann + - traine + - public + password: 'fXc3bmK9gj' + + - name: andreas + groups: + - a-jur + - advoware + - alle + - kanzlei + password: 'YKQRa.M9-6rL' + + - name: aphex2 + groups: + - alle + - aulmann + - howe + - stahmann + - traine + - public + password: 'J3KMRprK9H' + + - name: berenice + groups: + - advoware + - kanzlei + - a-jur + - alle + password: 'berenice' + + - name: beuster + groups: + - advoware + - aulmann + - howe + - stahmann + - traine + - public + - alle + password: 'zlm17Kx' + + - name: buero + groups: + - advoware + - kanzlei + - a-jur + - alle + password: 'buero' + + - name: buero2 + groups: + - advoware + - kanzlei + - a-jur + - alle + password: 'buero2' + + - name: buero3 + groups: + - advoware + - kanzlei + - a-jur + - alle + password: 'buero3' + + - name: buero4 + groups: + - advoware + - kanzlei + - a-jur + - alle + password: 'buero4' + + - name: buero7 + groups: + - advoware + - kanzlei + - a-jur + - alle + password: 'buero7' + + - name: chris + groups: + - a-jur + - advoware + - alle + - aulmann + - intern + - kanzlei + - stahmann + - traine + - public + password: !vault | + $ANSIBLE_VAULT;1.1;AES256 + 30383265366434633965346530666535363761396165393434643665393137353765653739636364 + 6330623334353763613065343336306434376335646666380a363030363335656261656236636562 + 63663763616630383264303039336562626537366634303636356237323630666635356130383165 + 3837613337343533650a663061366230353531316535656433643162353063383534323833323138 + 3430 + + - name: christina + groups: + - advoware + - alle + - aulmann + - howe + - stahmann + - traine + - public + password: 'qvR7zX4Lhs' + + - name: federico + groups: + - advoware + - alle + - aulmann + - howe + - stahmann + - traine + - public + password: 'zHfj9g3NcC' + +# - name: gerhard +# groups: +# - advoware +# - alle +# - aulmann +# - howe +# - stahmann +# - traine +# - public +# password: 'bHdhzWnTj9' + + - name: ho-st1 + groups: + - alle + - howe + - stahmann + password: '44-Ro-440' + +# - name: howe-staff-1 +# groups: +# - advoware +# - alle +# - aulmann +# - howe +# password: '' + + - name: irina + groups: + - advoware + - alle + - aulmann + - howe + - stahmann + - traine + - public + password: 'W9NKv39pXW' + + - name: jessica + groups: + - advoware + - alle + - aulmann + - howe + - stahmann + - traine + - public + password: 'bV3pjPtjkR' + +# - name: laura +# groups: +# - alle +# - aulmann +# - howe +# - stahmann +# - traine +# password: '99-Hamburg-990' + + - name: lenovo3 + groups: + - advoware + - alle + - aulmann + - howe + - stahmann + - traine + - public + password: 'fndvLmrt7W' + + - name: lenovo4 + groups: + - advoware + - alle + - aulmann + - howe + - stahmann + - traine + - public + password: 'tpCMmTKj7H' + + - name: lenovo5 + groups: + - advoware + - alle + - aulmann + - howe + - stahmann + - traine + - public + password: 'L5Hannover51' + + - name: lenovo6 + groups: + - advoware + - alle + - aulmann + - howe + - stahmann + - traine + password: '66koeln66' + + - name: rm-buero1 + groups: + - advoware + - alle + - a-jur + - kanzlei + password: '' + + - name: rm-buero2 + groups: + - advoware + - alle + - a-jur + - kanzlei + password: '' + + - name: rolf + groups: + - alle + - aulmann + - howe + - stahmann + - traine + - public + password: '4xNVNFXgP4' + + - name: sysadm + groups: + - a-jur + - advoware + - alle + - aulmann + - intern + - kanzlei + - stahmann + - traine + - public + password: 'Ax_GSHh5' + + - name: thomas + groups: + - advoware + - alle + - traine + password: '55-tho-mas-550' + + - name: Tresen + groups: + - a-jur + - advoware + - alle + - kanzlei + - howe + - stahmann + - traine + - public + password: 'maltzwo2' + + - name: winadm + groups: + - a-jur + - advoware + - alle + - intern + - kanzlei + - public + password: 'Ax_GSHh5' + + + +base_home: /data/home + +remove_samba_users: + - name: howe-staff-1 + - name: gerhard + - name: laura + +#remove_samba_users: [] +#remove_samba_users: +# - name: evren + +samba_shares: + + - name: a-jur + comment: a-jur Dokumente + path: /data/samba/a-jur + group_valid_users: a-jur + group_write_list: a-jur + file_create_mask: !!str 664 + dir_create_mask: !!str 2775 + vfs_object_recycle: true + recycle_path: '@Recycle' + vfs_object_recycle_is_visible: true + + - name: kanzlei + comment: Kanzlei auf Fileserver + path: /data/samba/kanzlei + group_valid_users: kanzlei + group_write_list: kanzlei + file_create_mask: !!str 664 + dir_create_mask: !!str 2775 + vfs_object_recycle: true + recycle_path: '@Recycle' + vfs_object_recycle_is_visible: true + + - name: install + comment: Install auf Fileserver + path: /data/samba/no-backup-shares/install + group_valid_users: intern + group_write_list: intern + file_create_mask: !!str 660 + dir_create_mask: !!str 2770 + vfs_object_recycle: false + + - name: aulmann + comment: Aulmann auf Fileserver + path: /data/samba/Aulmann + group_valid_users: aulmann + group_write_list: aulmann + file_create_mask: !!str 660 + dir_create_mask: !!str 2770 + vfs_object_recycle: true + recycle_path: '@Recycle' + vfs_object_recycle_is_visible: true + + - name: howe + comment: Howe auf Fileserver + path: /data/samba/Howe + group_valid_users: howe + group_write_list: howe + file_create_mask: !!str 660 + dir_create_mask: !!str 2770 + vfs_object_recycle: true + recycle_path: '@Recycle' + vfs_object_recycle_is_visible: true + + - name: stahmann + comment: Stahmann auf Fileserver + path: /data/samba/Stahmann + group_valid_users: stahmann + group_write_list: stahmann + file_create_mask: !!str 660 + dir_create_mask: !!str 2770 + vfs_object_recycle: true + recycle_path: '@Recycle' + vfs_object_recycle_is_visible: true + + - name: traine + comment: Traine auf Fileserver + path: /data/samba/Traine + group_valid_users: traine + group_write_list: traine + file_create_mask: !!str 660 + dir_create_mask: !!str 2770 + vfs_object_recycle: true + recycle_path: '@Recycle' + vfs_object_recycle_is_visible: true + + - name: public + comment: Public auf Fileserver + path: /data/samba/public + group_valid_users: public + group_write_list: public + file_create_mask: !!str 660 + dir_create_mask: !!str 2770 + vfs_object_recycle: true + recycle_path: '@Recycle' + vfs_object_recycle_is_visible: true + + - name: Advoware-Schriftverkehr + comment: Advoware Dokumente + path: /data/samba/Advoware-Schriftverkehr + group_valid_users: advoware + group_write_list: advoware + file_create_mask: !!str 660 + dir_create_mask: !!str 2770 + vfs_object_recycle: true + recycle_path: '@Recycle' + vfs_object_recycle_is_visible: true + + - name: Advoware-Backup + comment: Advoware Dokumente + path: /data/samba/Advoware-Backup + group_valid_users: intern + group_write_list: intern + file_create_mask: !!str 660 + dir_create_mask: !!str 2770 + vfs_object_recycle: true + recycle_path: '@Recycle' + vfs_object_recycle_is_visible: false + + - name: alle + comment: Alle auf Fileserver + path: /data/samba/Alle + group_valid_users: alle + group_write_list: alle + file_create_mask: !!str 660 + dir_create_mask: !!str 2770 + vfs_object_recycle: true + recycle_path: '@Recycle' + vfs_object_recycle_is_visible: true + +# - name: web +# comment: Web auf Fileserver +# path: /data/samba/Web +# group_valid_users: web +# group_write_list: web +# file_create_mask: !!str 660 +# dir_create_mask: !!str 2770 +# vfs_object_recycle: true +# recycle_path: '@Recycle' + + +# ============================== + + +# --- +# vars used by scripts/reset_root_passwd.yml +# --- + +root_user: + name: root + password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq. diff --git a/host_vars/o19.oopen.de.yml b/host_vars/o19.oopen.de.yml index 9838f94..4eebd5a 100644 --- a/host_vars/o19.oopen.de.yml +++ b/host_vars/o19.oopen.de.yml @@ -143,6 +143,10 @@ network_interfaces: # vars used by roles/common/tasks/apt.yml # --- +apt_install_extra_pkgs: true +apt_extra_pkgs: + - systemd-cryptsetup + # --- # vars used by roles/common/tasks/systemd-resolved.yml diff --git a/host_vars/o29.oopen.de.yml b/host_vars/o29.oopen.de.yml index 06b95af..e4df42d 100644 --- a/host_vars/o29.oopen.de.yml +++ b/host_vars/o29.oopen.de.yml @@ -146,6 +146,10 @@ network_interfaces: # vars used by roles/common/tasks/apt.yml # --- +apt_install_extra_pkgs: true +apt_extra_pkgs: + - systemd-cryptsetup + # --- # vars used by roles/common/tasks/systemd-resolved.yml diff --git a/host_vars/o31.oopen.de.yml b/host_vars/o31.oopen.de.yml index 1d98326..b043b9d 100644 --- a/host_vars/o31.oopen.de.yml +++ b/host_vars/o31.oopen.de.yml @@ -148,6 +148,10 @@ network_interfaces: # vars used by roles/common/tasks/apt.yml # --- +apt_install_extra_pkgs: true +apt_extra_pkgs: + - systemd-cryptsetup + # --- # vars used by roles/common/tasks/systemd-resolved.yml diff --git a/host_vars/o38.oopen.de.yml b/host_vars/o38.oopen.de.yml index 807bacc..d39a7b8 100644 --- a/host_vars/o38.oopen.de.yml +++ b/host_vars/o38.oopen.de.yml @@ -143,6 +143,10 @@ network_interfaces: # vars used by roles/common/tasks/apt.yml # --- +apt_install_extra_pkgs: true +apt_extra_pkgs: + - systemd-cryptsetup + # --- # vars used by roles/common/tasks/systemd-resolved.yml diff --git a/host_vars/o44.oopen.de.yml b/host_vars/o44.oopen.de.yml index 2b0a859..f7d64e2 100644 --- a/host_vars/o44.oopen.de.yml +++ b/host_vars/o44.oopen.de.yml @@ -143,6 +143,10 @@ network_interfaces: # vars used by roles/common/tasks/apt.yml # --- +apt_install_extra_pkgs: true +apt_extra_pkgs: + - systemd-cryptsetup + # --- # vars used by roles/common/tasks/systemd-resolved.yml diff --git a/hosts b/hosts index c5dd1b4..3607569 100644 --- a/hosts +++ b/hosts @@ -76,6 +76,7 @@ file-ebs.ebs.netz file-fm.fm.netz file-fhxb.fhxb.netz file-km.anw-km.netz +file-km-neu.anw-km.netz file-kb.anw-kb.netz file-blkr.blkr.netz file-dissens.dissens.netz @@ -552,6 +553,7 @@ gw-irights.oopen.de # - Kanzlei Berenice gw-km.oopen.de file-km.anw-km.netz +file-km-neu.anw-km.netz file-kb.anw-kb.netz # - Kanzlei BLKR @@ -1418,6 +1420,7 @@ file-ebs.ebs.netz file-fm.fm.netz file-fhxb.fhxb.netz file-km.anw-km.netz +file-km-neu.anw-km.netz file-kb.anw-kb.netz file-blkr.blkr.netz file-dissens.dissens.netz @@ -1552,6 +1555,7 @@ file-ah.kanzlei-kiel.netz file-ah-neu.kanzlei-kiel.netz file-ah-alt.kanzlei-kiel.netz file-km.anw-km.netz +file-km-neu.anw-km.netz file-kb.anw-kb.netz file-blkr.blkr.netz zapata.opp.netz @@ -1717,6 +1721,7 @@ file-ebs.ebs.netz file-fm.fm.netz file-fhxb.fhxb.netz file-km.anw-km.netz +file-km-neu.anw-km.netz file-kb.anw-kb.netz file-blkr.blkr.netz file-dissens.dissens.netz @@ -1962,6 +1967,7 @@ file-ebs.ebs.netz file-fm.fm.netz file-fhxb.fhxb.netz file-km.anw-km.netz +file-km-neu.anw-km.netz file-kb.anw-kb.netz file-blkr.blkr.netz file-dissens.dissens.netz diff --git a/roles/common/tasks/users.yml b/roles/common/tasks/users.yml index 2a43a66..513ba5d 100644 --- a/roles/common/tasks/users.yml +++ b/roles/common/tasks/users.yml @@ -1,5 +1,31 @@ --- +# --- +# - Set base home directory +# --- + +- name: HOME in /etc/default/useradd setzen oder hinter Kommentar einfügen + ansible.builtin.lineinfile: + path: /etc/default/useradd + regexp: '^HOME=' + insertafter: '^#\s*HOME=' + line: "HOME={{ base_home }}" + backup: true + when: + - base_home is defined + - base_home != '/home' + +- name: DHOME in /etc/adduser.conf setzen oder hinter Kommentar einfügen + ansible.builtin.lineinfile: + path: /etc/adduser.conf + regexp: '^DHOME=' + insertafter: '^#\s*DHOME=' + line: "DHOME={{ base_home }}" + backup: true + when: + - base_home is defined + - base_home != '/home' + # --- # - default user/groups # --- @@ -22,8 +48,7 @@ state: present uid: '{{ item.user_id | default(omit) }}' group: '{{ item.group | default(omit) }}' - #group: '{{ item.name | default(omit) }}' - home: '{{ item.home | default(omit) }}' + home: "{{ item.home | default('/home/' ~ item.name) }}" shell: '{{ item.shell|d("/bin/bash") }}' password: "{{ item.password }}" update_password: on_create