Stop checking for WSL

admin-cli.yml

@@ -18,7 +18,6 @@
   hosts: all
   vars:
     gui: false
-    wsl_distro: "{{ lookup('env', 'WSL_DISTRO_NAME') }}"
   tasks:
     - name: Include main
       ansible.builtin.include_tasks: main.yml

admin-gui.yml

@@ -18,7 +18,6 @@
   hosts: all
   vars:
     gui: true
-    wsl_distro: "{{ lookup('env', 'WSL_DISTRO_NAME') }}"
   tasks:
     - name: Include main
       ansible.builtin.include_tasks: main.yml

roles/debian/tasks/main.yml

@@ -21,7 +21,6 @@
 - import_tasks: modules.yml
 - import_tasks: ssh.yml
 - import_tasks: solokeys.yml
-  when: wsl_distro is not defined
 - import_tasks: sudo.yml
 - import_tasks: vscode.yml
   when: gui == true

roles/debian/tasks/ssh.yml

@@ -26,10 +26,9 @@
     name: ssh.service
     enabled: yes
     state: started
-  when: wsl_distro is not defined
 - name: Restart SSH
   become: true
   ansible.builtin.systemd:
     name: ssh.service
     state: restarted
-  when: changed_ssh_config.changed == true and wsl_distro is not defined
+  when: changed_ssh_config.changed == true

roles/fedora/tasks/packagekit.yml

@@ -24,7 +24,7 @@
     enabled: no
     masked: yes
     state: stopped
-  when: packagekitservice.stat.exists and wsl_distro is not defined
+  when: packagekitservice.stat.exists
 - name: Disable PackageKit offline updates
   become: true
   ansible.builtin.systemd:
@@ -32,11 +32,10 @@
     enabled: no
     masked: yes
     state: stopped
-  when: packagekitservice.stat.exists and wsl_distro is not defined
+  when: packagekitservice.stat.exists
 - name: Enable automatic updates
   become: true
   ansible.builtin.systemd:
     name: dnf-automatic-install.timer
     enabled: yes
     state: started
-  when: wsl_distro is not defined

roles/fedora/tasks/solokeys.yml

@@ -22,8 +22,8 @@
 - name: Reload udevadm rules
   become: true
   ansible.builtin.command: udevadm control --reload-rules
-  when: solokeys_copy.changed and wsl_distro is not defined
+  when: solokeys_copy.changed
 - name: Trigger udevadm
   become: true
   ansible.builtin.command: udevadm trigger
-  when: solokeys_copy.changed and wsl_distro is not defined
+  when: solokeys_copy.changed

roles/fedora/tasks/ssh.yml

@@ -26,13 +26,12 @@
     name: sshd.service
     enabled: yes
     state: started
-  when: wsl_distro is not defined
 - name: Restart SSH
   become: true
   ansible.builtin.systemd:
     name: sshd.service
     state: restarted
-  when: changed_ssh_config.changed == true and wsl_distro is not defined
+  when: changed_ssh_config.changed == true
 - name: Check for firewalld
   ansible.builtin.stat:
     path: /usr/sbin/firewalld

roles/kali/tasks/ssh.yml

@@ -26,10 +26,9 @@
     name: ssh.service
     enabled: yes
     state: started
-  when: wsl_distro is not defined
 - name: Restart SSH
   become: true
   ansible.builtin.systemd:
     name: ssh.service
     state: restarted
-  when: changed_ssh_config.changed == true and wsl_distro is not defined
+  when: changed_ssh_config.changed == true

roles/opensuse-leap/tasks/main.yml

@@ -18,6 +18,4 @@
   when: gui == true
 - import_tasks: modules.yml
 - import_tasks: ssh.yml
-  when: wsl_distro is not defined
 - import_tasks: solokeys.yml
-  when: wsl_distro is not defined

roles/opensuse-tumbleweed/tasks/main.yml

@@ -18,6 +18,4 @@
   when: gui == true
 - import_tasks: modules.yml
 - import_tasks: ssh.yml
-  when: wsl_distro is not defined
 - import_tasks: solokeys.yml
-  when: wsl_distro is not defined

roles/ubuntu/tasks/ssh.yml

@@ -26,10 +26,9 @@
     name: ssh.service
     enabled: yes
     state: started
-  when: wsl_distro is not defined
 - name: Restart SSH
   become: true
   ansible.builtin.systemd:
     name: ssh.service
     state: restarted
-  when: changed_ssh_config.changed == true and wsl_distro is not defined
+  when: changed_ssh_config.changed == true