From 1ee8b97930b4eb061b9e6a11597084e2ce0a43b4 Mon Sep 17 00:00:00 2001 From: Manish Maharjan <112875432+mmaharjan-ccdc@users.noreply.github.com> Date: Wed, 26 Jun 2024 17:20:56 +0100 Subject: [PATCH 1/9] TO-249 ec2-user --- tasks/Darwin.yml | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/tasks/Darwin.yml b/tasks/Darwin.yml index 934ade2..3ff2834 100644 --- a/tasks/Darwin.yml +++ b/tasks/Darwin.yml @@ -33,7 +33,14 @@ # state: present # become: true -- name: Set autoLoginUser +- name: Check if vagrant user exists + ansible.builtin.command: + cmd: id -u vagrant + register: vagrant_user + ignore_errors: true + +- name: Set autoLoginUser for vagrant + when: vagrant_user.rc == 0 community.general.osx_defaults: domain: /Library/Preferences/com.apple.loginwindow key: autoLoginUser @@ -42,13 +49,38 @@ state: present become: true -- name: Set the autologon password # noqa: no-changed-when +- name: Set the autologon password for vagrant # noqa: no-changed-when + when: vagrant_user.rc == 0 ansible.builtin.command: cmd: kcpassword vagrant environment: PATH: "/opt/homebrew/bin:/usr/local/bin:{{ ansible_env.PATH }}" become: true +- name: Check if ec2-user user exists + ansible.builtin.command: + cmd: id -u ec2-user + register: ec2_user + ignore_errors: true + +- name: Set autoLoginUser for ec2-user + when: ec2_user.rc == 0 + community.general.osx_defaults: + domain: /Library/Preferences/com.apple.loginwindow + key: autoLoginUser + type: string + value: ec2-user + state: present + become: true + +- name: Set the autologon password for ec2-user # noqa: no-changed-when + when: ec2_user.rc == 0 + ansible.builtin.command: + cmd: kcpassword ec2-user + environment: + PATH: "/opt/homebrew/bin:/usr/local/bin:{{ ansible_env.PATH }}" + become: true + - name: Set Europe/London time zone community.general.timezone: name: "Europe/London" From d0d4aecbdf4f306d46a97ec124ad218ffc18e0bf Mon Sep 17 00:00:00 2001 From: Manish Maharjan <112875432+mmaharjan-ccdc@users.noreply.github.com> Date: Wed, 26 Jun 2024 17:30:13 +0100 Subject: [PATCH 2/9] TO-249 let vagrant parts fail --- tasks/Darwin.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tasks/Darwin.yml b/tasks/Darwin.yml index 3ff2834..6fe5986 100644 --- a/tasks/Darwin.yml +++ b/tasks/Darwin.yml @@ -48,6 +48,7 @@ value: vagrant state: present become: true + ignore_errors: true - name: Set the autologon password for vagrant # noqa: no-changed-when when: vagrant_user.rc == 0 @@ -56,6 +57,7 @@ environment: PATH: "/opt/homebrew/bin:/usr/local/bin:{{ ansible_env.PATH }}" become: true + ignore_errors: true - name: Check if ec2-user user exists ansible.builtin.command: From 6a73eb61030246e3c02ee4bb0f7fe2ffc4ba6f07 Mon Sep 17 00:00:00 2001 From: Manish Maharjan <112875432+mmaharjan-ccdc@users.noreply.github.com> Date: Thu, 27 Jun 2024 11:53:34 +0100 Subject: [PATCH 3/9] TO-249 put in "{{ current_user }}" --- vars/macos.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vars/macos.yml b/vars/macos.yml index f4ee408..0284444 100644 --- a/vars/macos.yml +++ b/vars/macos.yml @@ -2,10 +2,11 @@ terraform_ostype: "macos" ansible_ssh_transfer_method: scp # ansible_python_interpreter: /usr/local/bin/python3 -homebrew_user: vagrant +homebrew_user: "{{ current_user }}" homebrew_taps: - name: xfreebird/utils - name: xcodesorg/made +current_user: "{{ lookup('env','USER') }}" homebrew_installed_packages: - kcpassword From 9d93dbbc6a4c7136e8e755b5ef860dbf21fd0832 Mon Sep 17 00:00:00 2001 From: Manish Maharjan <112875432+mmaharjan-ccdc@users.noreply.github.com> Date: Thu, 27 Jun 2024 11:55:10 +0100 Subject: [PATCH 4/9] TO-249 set as current user in tasks --- tasks/Darwin.yml | 34 ++-------------------------------- 1 file changed, 2 insertions(+), 32 deletions(-) diff --git a/tasks/Darwin.yml b/tasks/Darwin.yml index 6fe5986..2a3a5e7 100644 --- a/tasks/Darwin.yml +++ b/tasks/Darwin.yml @@ -33,19 +33,13 @@ # state: present # become: true -- name: Check if vagrant user exists - ansible.builtin.command: - cmd: id -u vagrant - register: vagrant_user - ignore_errors: true - - name: Set autoLoginUser for vagrant when: vagrant_user.rc == 0 community.general.osx_defaults: domain: /Library/Preferences/com.apple.loginwindow key: autoLoginUser type: string - value: vagrant + value: "{{ current_user }}" state: present become: true ignore_errors: true @@ -53,36 +47,12 @@ - name: Set the autologon password for vagrant # noqa: no-changed-when when: vagrant_user.rc == 0 ansible.builtin.command: - cmd: kcpassword vagrant + cmd: kcpassword "{{ current_user }}" environment: PATH: "/opt/homebrew/bin:/usr/local/bin:{{ ansible_env.PATH }}" become: true ignore_errors: true -- name: Check if ec2-user user exists - ansible.builtin.command: - cmd: id -u ec2-user - register: ec2_user - ignore_errors: true - -- name: Set autoLoginUser for ec2-user - when: ec2_user.rc == 0 - community.general.osx_defaults: - domain: /Library/Preferences/com.apple.loginwindow - key: autoLoginUser - type: string - value: ec2-user - state: present - become: true - -- name: Set the autologon password for ec2-user # noqa: no-changed-when - when: ec2_user.rc == 0 - ansible.builtin.command: - cmd: kcpassword ec2-user - environment: - PATH: "/opt/homebrew/bin:/usr/local/bin:{{ ansible_env.PATH }}" - become: true - - name: Set Europe/London time zone community.general.timezone: name: "Europe/London" From d92c8f2ec05b0d02834612c1a5d7f6a445641d0a Mon Sep 17 00:00:00 2001 From: Manish Maharjan <112875432+mmaharjan-ccdc@users.noreply.github.com> Date: Thu, 27 Jun 2024 12:12:31 +0100 Subject: [PATCH 5/9] TO-249 remove ignore true --- tasks/Darwin.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tasks/Darwin.yml b/tasks/Darwin.yml index 2a3a5e7..b0106e2 100644 --- a/tasks/Darwin.yml +++ b/tasks/Darwin.yml @@ -34,7 +34,6 @@ # become: true - name: Set autoLoginUser for vagrant - when: vagrant_user.rc == 0 community.general.osx_defaults: domain: /Library/Preferences/com.apple.loginwindow key: autoLoginUser @@ -42,16 +41,13 @@ value: "{{ current_user }}" state: present become: true - ignore_errors: true - name: Set the autologon password for vagrant # noqa: no-changed-when - when: vagrant_user.rc == 0 ansible.builtin.command: cmd: kcpassword "{{ current_user }}" environment: PATH: "/opt/homebrew/bin:/usr/local/bin:{{ ansible_env.PATH }}" become: true - ignore_errors: true - name: Set Europe/London time zone community.general.timezone: From 5884dbbfe7df5b545fcba4c134d5e25d16ec2236 Mon Sep 17 00:00:00 2001 From: Manish Maharjan <112875432+mmaharjan-ccdc@users.noreply.github.com> Date: Thu, 27 Jun 2024 12:28:36 +0100 Subject: [PATCH 6/9] TO-249 update name to be current user --- tasks/Darwin.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/Darwin.yml b/tasks/Darwin.yml index b0106e2..850ae86 100644 --- a/tasks/Darwin.yml +++ b/tasks/Darwin.yml @@ -33,7 +33,7 @@ # state: present # become: true -- name: Set autoLoginUser for vagrant +- name: Set autoLoginUser for current user community.general.osx_defaults: domain: /Library/Preferences/com.apple.loginwindow key: autoLoginUser @@ -42,7 +42,7 @@ state: present become: true -- name: Set the autologon password for vagrant # noqa: no-changed-when +- name: Set the autologon password for current user # noqa: no-changed-when ansible.builtin.command: cmd: kcpassword "{{ current_user }}" environment: From 01c80218de7be26757dbf5e2b60eb57deedcd6e1 Mon Sep 17 00:00:00 2001 From: Manish Maharjan <112875432+mmaharjan-ccdc@users.noreply.github.com> Date: Thu, 27 Jun 2024 12:32:15 +0100 Subject: [PATCH 7/9] TO-249 update to current_user to ansible_user --- tasks/Darwin.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/Darwin.yml b/tasks/Darwin.yml index 850ae86..be7d20c 100644 --- a/tasks/Darwin.yml +++ b/tasks/Darwin.yml @@ -38,13 +38,13 @@ domain: /Library/Preferences/com.apple.loginwindow key: autoLoginUser type: string - value: "{{ current_user }}" + value: "{{ ansible_user }}" state: present become: true - name: Set the autologon password for current user # noqa: no-changed-when ansible.builtin.command: - cmd: kcpassword "{{ current_user }}" + cmd: kcpassword "{{ ansible_user }}" environment: PATH: "/opt/homebrew/bin:/usr/local/bin:{{ ansible_env.PATH }}" become: true From ebc97fad12b9968e9162fba0b7617a0ea0099c02 Mon Sep 17 00:00:00 2001 From: Manish Maharjan <112875432+mmaharjan-ccdc@users.noreply.github.com> Date: Thu, 27 Jun 2024 12:32:34 +0100 Subject: [PATCH 8/9] TO-249 another update to ansible_user --- vars/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/macos.yml b/vars/macos.yml index 0284444..455d9ff 100644 --- a/vars/macos.yml +++ b/vars/macos.yml @@ -2,7 +2,7 @@ terraform_ostype: "macos" ansible_ssh_transfer_method: scp # ansible_python_interpreter: /usr/local/bin/python3 -homebrew_user: "{{ current_user }}" +homebrew_user: "{{ ansible_user }}" homebrew_taps: - name: xfreebird/utils - name: xcodesorg/made From 76ab367fb996b81491d0f9a6c19175bd436cd2b7 Mon Sep 17 00:00:00 2001 From: Manish Maharjan <112875432+mmaharjan-ccdc@users.noreply.github.com> Date: Thu, 27 Jun 2024 12:40:54 +0100 Subject: [PATCH 9/9] TO-249 try ansible_env.USER instead of ansible_user --- tasks/Darwin.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/Darwin.yml b/tasks/Darwin.yml index be7d20c..4ea9ef1 100644 --- a/tasks/Darwin.yml +++ b/tasks/Darwin.yml @@ -38,13 +38,13 @@ domain: /Library/Preferences/com.apple.loginwindow key: autoLoginUser type: string - value: "{{ ansible_user }}" + value: "{{ ansible_env.USER }}" state: present become: true - name: Set the autologon password for current user # noqa: no-changed-when ansible.builtin.command: - cmd: kcpassword "{{ ansible_user }}" + cmd: kcpassword "{{ ansible_env.USER }}" environment: PATH: "/opt/homebrew/bin:/usr/local/bin:{{ ansible_env.PATH }}" become: true