From 879cb58cd12fc1d3f045257c87b40e21bd892a5b Mon Sep 17 00:00:00 2001 From: Kishan Takoordyal Date: Tue, 12 Aug 2025 18:42:49 +0400 Subject: [PATCH] Remove anything related to zsh --- .gitignore | 1 + inventory/mscc-demo/group_vars/all/vault.yml | 41 ++++++++------------ inventory/mscc-demo/hosts | 2 +- playbooks/roles/access/tasks/main.yml | 7 +--- playbooks/roles/common/defaults/main.yml | 20 ---------- playbooks/roles/docker/tasks/main.yml | 10 ----- 6 files changed, 20 insertions(+), 61 deletions(-) diff --git a/.gitignore b/.gitignore index bec7743..a63ea1a 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ ansible_collections *.pyc .venv .vault_password +.ansible diff --git a/inventory/mscc-demo/group_vars/all/vault.yml b/inventory/mscc-demo/group_vars/all/vault.yml index 74f757b..9e62fe3 100644 --- a/inventory/mscc-demo/group_vars/all/vault.yml +++ b/inventory/mscc-demo/group_vars/all/vault.yml @@ -1,25 +1,18 @@ $ANSIBLE_VAULT;1.1;AES256 -31303065633266656263636132653162306461306261356365363266356438653061333839323062 -6333363730613039366532643533316133363933303134340a633135363361386162356361376365 -32653031393338633661653266306462646130356532333036343731316238663032333063353332 -3536363432616361660a326231396139306431353633373463396430343738623962386363363562 -63663062376134636664656238643663666161373061656331613436656331323832366462393165 -66383538326663613364383436356231346237633231383365653362313736303439623061373030 -36643931326463343030353830626364643539383365333239633161366234343766333464633864 -32313134363661343539663363396236333430363264623038636633383431643931303832313831 -65363064623563363033616161313664643632343462636665303364326633383730343561643639 -34636338356334666462353036666131363263386366336162613338356438303733313964633539 -34396363633238366361313433333932316565613864333961646162376232336134353262646539 -61643561366266643662376533366664346637663831353461333462376338393431306139343539 -31613865363062623963393462613464363362396565623736313266323836613961366266323962 -63323638393163323261643933353032303765386162653834646236313336623431333936303137 -64366134613261336561653763356562363865396339663033626566613339343435323066636631 -35343366373730363466303032616564303063376639333332396665626336343832636230643637 -38353230373539343131326331623736326632653962386661353639303432323361633736303937 -31646166343861303534646336663232353265336330656537613039373962643966613432336137 -35633138373164346432343238353033376164306236323138613638393762363335653930613461 -34323964343038643435626132656161393733356261383937303366386462626665653039356138 -61646465386564393033613735343066336138326465383130326162323363373339336262313537 -32393136626564313132613166303536306361366335373264343435643461376636626461613635 -63636436646566613534666565656535376333386337393564313038346535633163396265633032 -33373566356632653861 +61343263366137353437383638356663336231666132346335303833363439633266313535393232 +6662313566653237636432346531646436326139626235300a336539656261353838303338373938 +38303938343832323561613238303065646636343139343733333538656633363837633132316163 +3134613836343938630a303162663333333437363361626537643334646534663264343536666561 +31323066353964623732353965393736343437313165396163353935386630356134373132626232 +63376566393165366561323537393466383832376361326534346134336464613330653830326334 +65633766653063626665383538393733366630336263383636376631313434636461366463366264 +61346136633833313734383264666261393864373964613966316233313836333333636634646361 +30363334393532616138656431333436636661613339653666343266373566333130333962616334 +37396134353365636536366633316262653766656438653361343432643630646262343265326434 +34343038373164323864626163656266613531393432306661643535386539376231313566656139 +33393838333164373431376138353166333763303434643261316430616138303338306662343864 +66306136663662626438626438333664323532656333623763616162306235383336393063343861 +65373539383532386433316537636639653262363434633131396663616465326639353833376131 +63393864666162623161383361633366333039333565666261313836376134316365653330613533 +34346462343332626262396436346337646336313532353430613633313033333561393339353566 +3663 diff --git a/inventory/mscc-demo/hosts b/inventory/mscc-demo/hosts index 5057fd8..757313f 100644 --- a/inventory/mscc-demo/hosts +++ b/inventory/mscc-demo/hosts @@ -3,4 +3,4 @@ ansible_ssh_private_key_file=~/.ssh/id_rsa ansible_ssh_extra_args="-o IdentitiesOnly=yes -o StrictHostKeyChecking=no" [server] -mscc-demo-instance ansible_host=128.199.78.165 ansible_ssh_user=edgeking810 +mscc-demo-instance ansible_host=139.59.112.240 ansible_ssh_user=edgeking810 diff --git a/playbooks/roles/access/tasks/main.yml b/playbooks/roles/access/tasks/main.yml index 3179592..0673349 100644 --- a/playbooks/roles/access/tasks/main.yml +++ b/playbooks/roles/access/tasks/main.yml @@ -14,16 +14,11 @@ validate: visudo -cf %s become: true -- name: Check if zsh is installed - ansible.builtin.stat: - path: /bin/zsh - register: access_zsh_installed - - name: Create accounts ansible.builtin.user: name: '{{ item.key }}' password: '' - shell: '{{ "/bin/zsh" if access_zsh_installed.stat.exists else "/bin/bash" }}' + shell: '/bin/bash' group: admin generate_ssh_key: false state: present diff --git a/playbooks/roles/common/defaults/main.yml b/playbooks/roles/common/defaults/main.yml index 4801420..8489324 100644 --- a/playbooks/roles/common/defaults/main.yml +++ b/playbooks/roles/common/defaults/main.yml @@ -27,23 +27,3 @@ docker_packages: # noqa var-naming[no-role-prefix] - docker-ce-cli - containerd.io - docker-compose-plugin - -zsh_packages: # noqa var-naming[no-role-prefix] - - zsh - - ruby - - ruby-dev - - libz-dev - - libiconv-hook1 - - libiconv-hook-dev - - zlib1g-dev - - fzf - -zsh_extensions: # noqa var-naming[no-role-prefix] - - repo: https://github.com/zsh-users/zsh-syntax-highlighting.git - dest: ~/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting - - repo: https://github.com/junegunn/fzf.git - dest: ~/.fzf - - repo: https://github.com/zsh-users/zsh-autosuggestions.git - dest: ~/.oh-my-zsh/custom/plugins/zsh-autosuggestions - - repo: https://github.com/romkatv/powerlevel10k.git - dest: ~/.oh-my-zsh/custom/themes/powerlevel10k diff --git a/playbooks/roles/docker/tasks/main.yml b/playbooks/roles/docker/tasks/main.yml index aec3889..676deea 100644 --- a/playbooks/roles/docker/tasks/main.yml +++ b/playbooks/roles/docker/tasks/main.yml @@ -1,14 +1,4 @@ --- -- name: Login to custom docker registry - community.docker.docker_login: - registry_url: '{{ custom_docker_registry.server_address }}' - username: '{{ custom_docker_registry.username }}' - password: '{{ custom_docker_registry.password }}' - become: true - become_user: '{{ item.key }}' - loop: '{{ access.admin | dict2items }}' - when: custom_docker_registry is defined - - name: Deploy Docker containers ansible.builtin.include_tasks: container.yml loop: '{{ docker_containers }}'