diff options
| author | heqnx <root@heqnx.com> | 2025-07-12 17:41:30 +0300 |
|---|---|---|
| committer | heqnx <root@heqnx.com> | 2025-07-12 17:41:30 +0300 |
| commit | 62acc6423bfead7cee08352dfc92e154eabbb4aa (patch) | |
| tree | a435a4f996ea7ba28f5bec57baab655aaf114553 /ansible | |
| parent | 6e559dd880cf72b23c98d63e53982e4f359747f4 (diff) | |
| download | ansible-active-directory-range-62acc6423bfead7cee08352dfc92e154eabbb4aa.tar.gz ansible-active-directory-range-62acc6423bfead7cee08352dfc92e154eabbb4aa.zip | |
fixed linux domain join
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/dc01/tasks/reboot.yaml | 2 | ||||
| -rw-r--r-- | ansible/roles/srv01/tasks/join_domain.yaml | 2 | ||||
| -rw-r--r-- | ansible/roles/srv01/tasks/reboot.yaml | 8 | ||||
| -rw-r--r-- | ansible/roles/srv01/tasks/set_hostname.yaml | 8 | ||||
| -rw-r--r-- | ansible/scripts/join-domain.sh | 12 |
5 files changed, 17 insertions, 15 deletions
diff --git a/ansible/roles/dc01/tasks/reboot.yaml b/ansible/roles/dc01/tasks/reboot.yaml index 0e944d0..f36b168 100644 --- a/ansible/roles/dc01/tasks/reboot.yaml +++ b/ansible/roles/dc01/tasks/reboot.yaml @@ -1,3 +1,3 @@ -- name: "reboot" +- name: reboot ansible.windows.win_reboot: reboot_timeout: 3600 diff --git a/ansible/roles/srv01/tasks/join_domain.yaml b/ansible/roles/srv01/tasks/join_domain.yaml index 381abea..7f5796d 100644 --- a/ansible/roles/srv01/tasks/join_domain.yaml +++ b/ansible/roles/srv01/tasks/join_domain.yaml @@ -1,4 +1,4 @@ -- name: "execute join-domain.sh" +- name: execute join-domain.sh script: ../../../scripts/join-domain.sh -d "{{ main_domain_name }}" -n "{{ main_dc01_ip_address }}" -p "{{ default_win_password }}" args: executable: /bin/bash diff --git a/ansible/roles/srv01/tasks/reboot.yaml b/ansible/roles/srv01/tasks/reboot.yaml index f521bdc..d36ed0d 100644 --- a/ansible/roles/srv01/tasks/reboot.yaml +++ b/ansible/roles/srv01/tasks/reboot.yaml @@ -1,5 +1,3 @@ -- name: "reboot" - command: "shutdown -r now &" - async: 1 - poll: 0 - ignore_errors: true +- name: reboot + ansible.builtin.reboot: + reboot_timeout: 3600 diff --git a/ansible/roles/srv01/tasks/set_hostname.yaml b/ansible/roles/srv01/tasks/set_hostname.yaml index 6e04085..9141763 100644 --- a/ansible/roles/srv01/tasks/set_hostname.yaml +++ b/ansible/roles/srv01/tasks/set_hostname.yaml @@ -1,5 +1,9 @@ -- name: "update /etc/hosts" +- name: set hostname + ansible.builtin.hostname: + name: "{{ main_linux_srv01_hostname }}.{{ main_domain_name }}" + +- name: update /etc/hosts ansible.builtin.replace: path: /etc/hosts - regexp: "ubuntu-server2404" + regexp: "ubuntu" replace: "{{ main_linux_srv01_hostname }}.{{ main_domain_name }} {{ main_linux_srv01_hostname }}" diff --git a/ansible/scripts/join-domain.sh b/ansible/scripts/join-domain.sh index 24c87b0..7661acd 100644 --- a/ansible/scripts/join-domain.sh +++ b/ansible/scripts/join-domain.sh @@ -1,6 +1,6 @@ #!/bin/bash -[[ $EUID -ne 0 ]] && printf "%s\n" "run as root" && exit 1 +test "${EUID}" -ne 0 && printf "%s\n" "run as root" && exit 1 while getopts "d:n:p:" arg; do case $arg in @@ -10,11 +10,11 @@ while getopts "d:n:p:" arg; do esac done -DEBIAN_FRONTEND=noninteractive apt-get update -yqq &>/dev/null -DEBIAN_FRONTEND=noninteractive apt-get install -yqq realmd sssd sssd-tools libnss-sss libpam-sss adcli samba-common-bin oddjob oddjob-mkhomedir packagekit krb5-user &>/dev/null -DEBIAN_FRONTEND=noninteractive apt-get autoremove --purge -yqq &>/dev/null -DEBIAN_FRONTEND=noninteractive apt-get clean &>/dev/null -DEBIAN_FRONTEND=noninteractive apt-get autoclean &>/dev/null +DEBIAN_FRONTEND=noninteractive apt-get update -y +DEBIAN_FRONTEND=noninteractive apt-get install -y realmd sssd sssd-tools libnss-sss libpam-sss adcli samba-common-bin oddjob oddjob-mkhomedir packagekit krb5-user +DEBIAN_FRONTEND=noninteractive apt-get autoremove --purge -y +DEBIAN_FRONTEND=noninteractive apt-get clean +DEBIAN_FRONTEND=noninteractive apt-get autoclean if systemctl is-active systemd-resolved; then systemctl disable --now systemd-resolved --no-pager |