removing macos

Dinth · Dinth · commit 1a01a9d31d18 · 2025-04-09T14:05:08.000+01:00
diff --git a/inventory/all.yaml b/inventory/all.yaml
@@ -2,26 +2,6 @@ all:
   children:
     workstations:
       children:
-        osx:
-          hosts:
-            michal-macbook-pro-m1:
-              ansible_host: 10.10.10.11
-              ansible_user: macadmin
-              ansible_password: "{{ michal_macbook_pro_m1_pass }}"
-              ansible_become_pass: "{{ michal_macbook_pro_m1_pass }}"
-            paulina-macbook-pro-m1:
-              ansible_host: 10.10.10.12
-              ansible_user: macadmin
-              ansible_password: "{{ paulina_macbook_pro_m1_pass }}"
-              ansible_become_pass: "{{ paulina_macbook_pro_m1_pass }}"
-          vars:
-            users:
-              - michal
-              - paulina
-              - macadmin
-            ssh_users:
-              - michal
-              - macadmin
         linux:
           hosts:
             dinth-mint:
diff --git a/playbooks/update.yaml b/playbooks/update.yaml
@@ -5,6 +5,3 @@
     - ansible.builtin.include_tasks:
         file: ../roles/update_apt.yaml
       when: ansible_distribution == "Debian" or ansible_distribution == "Linux Mint" or ansible_distribution == "Ubuntu"
-    - ansible.builtin.include_tasks:
-        file: ../roles/update_osx.yaml
-      when: ansible_distribution == "MacOSX"
diff --git a/roles/configure_vim.yaml b/roles/configure_vim.yaml
@@ -26,4 +26,4 @@
     - editor
     - vi
     - vim
-    when: ansible_distribution == 'Ubuntu' or ansible_distribution == 'Debian' or ansible_distribution == 'Linux Mint'
+    when: ansible_distribution == 'Ubuntu' or ansible_distribution == 'Debian' or ansible_distribution == 'Linux Mint'
diff --git a/roles/configure_zsh.yaml b/roles/configure_zsh.yaml
@@ -5,7 +5,6 @@
     zsh_plugins: "1password"
     zsh_plugins_linux: ""
     zsh_plugins_servers: ""
-    zsh_plugins_osx: ""
   tasks:
   - name: Check if zsh is installed | shell
     shell: which zsh
@@ -114,13 +113,3 @@
       line: "plugins=({{ zsh_plugins + ' fzf zsh-autosuggestions zsh-syntax-highlighting ' + zsh_plugins_server }})"
     loop: "{{ users }}"
     when: inventory_hostname in groups['servers']
-  - name: Set Oh My ZSH plugins - osx | lineinfile
-    become: true
-    become_user: "{{ item }}"
-    ansible.builtin.lineinfile:
-      state: present
-      path: "~/.zshrc"
-      regexp: "^plugins="
-      line: "plugins=({{ zsh_plugins + ' fzf zsh-autosuggestions zsh-syntax-highlighting ' + zsh_plugins_osx }})"
-    loop: "{{ users }}"
-    when: inventory_hostname in groups['osx']
diff --git a/roles/files/certs/id_ed25510_sk_new_1 b/roles/files/certs/id_ed25510_sk_new_1
@@ -0,0 +1,8 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAASgAAABpzay1zc2
+gtZWQyNTUxOUBvcGVuc3NoLmNvbQAAACB8OfIgwF5opxJmCp81I0czIaUe671C2WVGdIsz
+HYroUgAAAARzc2g6AAAAqIIF2EyCBdhMAAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY2
+9tAAAAIHw58iDAXminEmYKnzUjRzMhpR7rvULZZUZ0izMdiuhSAAAABHNzaDolAAAAMHw5
+8iDAXminEmYKnzU0iFbKwLi7HliBKkG0rGSyG6GyRdrLxwDx6Sa0H7NuupvI+QAAAAAAAA
+AXbWljaGFsQGdhd3JvbnNraWtvdC5jb20BAg==
+-----END OPENSSH PRIVATE KEY-----
diff --git a/roles/files/certs/id_ed25510_sk_new_1.pub b/roles/files/certs/id_ed25510_sk_new_1.pub
@@ -0,0 +1 @@
+sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIHw58iDAXminEmYKnzUjRzMhpR7rvULZZUZ0izMdiuhSAAAABHNzaDo= michal@gawronskikot.com
diff --git a/roles/files/certs/id_ed25519_ansible.pub b/roles/files/certs/id_ed25519_ansible.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEDhVI0tSht0ZKcusFi1dzo6QyjPcwy6A+xCk8jjynba ansible@wickhay
diff --git a/roles/files/certs/id_ed25519_sk_new_2 b/roles/files/certs/id_ed25519_sk_new_2
@@ -0,0 +1,8 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAASgAAABpzay1zc2
+gtZWQyNTUxOUBvcGVuc3NoLmNvbQAAACCvihrNikhEGh5MyvmsHOEFzCrupDJ9dBe3GeK2
+j3ECSgAAAARzc2g6AAAAqHCXj+Nwl4/jAAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY2
+9tAAAAIK+KGs2KSEQaHkzK+awc4QXMKu6kMn10F7cZ4raPcQJKAAAABHNzaDolAAAAMK+K
+Gs2KSEQaHkzK+ayjptu1yiUck3NkUCLjdUywnAKirWoqoiaawFHDm2eBBO8t8AAAAAAAAA
+AXbWljaGFsQGdhd3JvbnNraWtvdC5jb20BAg==
+-----END OPENSSH PRIVATE KEY-----
diff --git a/roles/files/certs/id_ed25519_sk_new_2.pub b/roles/files/certs/id_ed25519_sk_new_2.pub
@@ -0,0 +1 @@
+sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIK+KGs2KSEQaHkzK+awc4QXMKu6kMn10F7cZ4raPcQJKAAAABHNzaDo= michal@gawronskikot.com
diff --git a/roles/files/certs/id_ed25519_sk_new_3 b/roles/files/certs/id_ed25519_sk_new_3
@@ -0,0 +1,8 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAASgAAABpzay1zc2
+gtZWQyNTUxOUBvcGVuc3NoLmNvbQAAACDDjw4gEGwA+d19p3lIf72yL+6UcdvqpGe04vTx
+/gidcgAAAARzc2g6AAAAqGHNAzxhzQM8AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY2
+9tAAAAIMOPDiAQbAD53X2neUh/vbIv7pRx2+qkZ7Ti9PH+CJ1yAAAABHNzaDolAAAAMMOP
+DiAQbAD53X2neUjY+ZRtiZgdH1W5eAN8WJI+J87sqnvsC+W4npEhC1TulqwYcwAAAAAAAA
+AXbWljaGFsQGdhd3JvbnNraWtvdC5jb20BAg==
+-----END OPENSSH PRIVATE KEY-----
diff --git a/roles/files/certs/id_ed25519_sk_new_3.pub b/roles/files/certs/id_ed25519_sk_new_3.pub
@@ -0,0 +1 @@
+sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIMOPDiAQbAD53X2neUh/vbIv7pRx2+qkZ7Ti9PH+CJ1yAAAABHNzaDo= michal@gawronskikot.com
diff --git a/roles/files/install_xcode_clt_on_osx.sh b/roles/files/install_xcode_clt_on_osx.sh
diff --git a/roles/install_fonts.yaml b/roles/install_fonts.yaml
@@ -2,7 +2,6 @@
   hosts: workstations
   vars:
     font_dir_linux: /usr/share/fonts/truetype
-    font_dir_darwin: /Library/Fonts
     font_dir: "{{ lookup('vars','font_dir_'+ansible_os_family|lower, default=font_dir_linux) }}"
     default_terminal_font: "InconsolataGo Nerd Font 11"
   tasks:
diff --git a/roles/install_homebrew.yaml b/roles/install_homebrew.yaml
diff --git a/roles/install_printer.yaml b/roles/install_printer.yaml
@@ -1,16 +1,10 @@
 - name: Install printers
 #  hosts: workstations
-  hosts: michal-macbook-pro-m1
   vars:
       # taking the link from european version of Canon website and resolving the redirect via wget
       # temporary measure, in the future i would like to automatically download the latest version of the driver somehow
     driver_lnx: "https://gdlp01.c-wss.com/gds/8/0100007658/40/linux-UFRII-drv-v590-m17n-03.tar.gz"
-    driver_osx: "https://gdlp01.c-wss.com/gds/8/0100012238/02/mac-UFRII-LIPSLX-v101919-06.dmg"
-    driver_scan_osx: "https://gdlp01.c-wss.com/gds/5/0100012265/01/mac-scan-v21515-00.dmg"
   tasks:
-    - ansible.builtin.include_tasks:
-        file: ./install_printer_osx.yaml
-      when: ansible_distribution == "MacOSX"
     - ansible.builtin.include_tasks:
         file: ./install_printer_deb.yaml
-      when: ansible_distribution == "Debian" or ansible_distribution == "Ubuntu" or ansible_distribution == "Linux Mint"
+      when: ansible_distribution == "Debian" or ansible_distribution == "Ubuntu" or ansible_distribution == "Linux Mint"
diff --git a/roles/install_printer_osx.yaml b/roles/install_printer_osx.yaml
diff --git a/roles/install_xcode.yaml b/roles/install_xcode.yaml
diff --git a/roles/proxmox_deploy.yaml b/roles/proxmox_deploy.yaml
@@ -115,4 +115,4 @@
       ansible.builtin.user:
         name: root
         password: "{{ r230_proxmox_root_pass | password_hash('sha512','') }}"
-        update_password: always
+        update_password: always
diff --git a/roles/required_pkgs.yaml b/roles/required_pkgs.yaml
@@ -3,5 +3,3 @@
   tasks:
   - include: ./required_pkgs_apt.yaml
     when: ansible_distribution == "Debian" or ansible_distribution == "Ubuntu" or ansible_distribution == "Linux Mint"
-  - include: ./required_pkgs_osx.yaml
-    when: ansible_distribution == "MacOSX"
diff --git a/roles/required_pkgs_osx.yaml b/roles/required_pkgs_osx.yaml
diff --git a/roles/update_osx.yaml b/roles/update_osx.yaml

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+[email protected] AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIHw58iDAXminEmYKnzUjRzMhpR7rvULZZUZ0izMdiuhSAAAABHNzaDo= [email protected]`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEDhVI0tSht0ZKcusFi1dzo6QyjPcwy6A+xCk8jjynba ansible@wickhay`