From 3252c27b0ab736098761659065c6c6dfc0dfb431 Mon Sep 17 00:00:00 2001 From: binary Date: Fri, 19 Mar 2021 22:02:51 +0100 Subject: Get rid of deprecated agnostic variables --- group_vars/alpine.yml | 2 -- group_vars/linux.yml | 6 ------ roles/rc/tasks/main.yml | 2 +- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/group_vars/alpine.yml b/group_vars/alpine.yml index 448587c..249da5f 100644 --- a/group_vars/alpine.yml +++ b/group_vars/alpine.yml @@ -8,5 +8,3 @@ path_zsh: "/usr/bin/zsh" path_zshconfig: "/etc/zsh/zshrc" path_tmuxconfig: "/etc/tmux.conf" path_gitshell: "/usr/bin/git-shell" - -os_distribution: "alpine" diff --git a/group_vars/linux.yml b/group_vars/linux.yml index 81ffaf1..ef93439 100644 --- a/group_vars/linux.yml +++ b/group_vars/linux.yml @@ -9,12 +9,6 @@ _groups: - archlinux - debian -ansible_become_method: "sudo" - group_root: "root" user_op: "puffy" - path_wgquick: "/usr/bin/wg-quick" - -os_type: "linux" - diff --git a/roles/rc/tasks/main.yml b/roles/rc/tasks/main.yml index 8ba98aa..c8a7e90 100644 --- a/roles/rc/tasks/main.yml +++ b/roles/rc/tasks/main.yml @@ -4,7 +4,7 @@ --- - name: include rc task per-system - include_tasks: "rc_{{ os_distribution }}.yml" + include_tasks: "rc_{{ ansible_distribution | lower }}.yml" - name: start and enable service on boot service: -- cgit v1.2.3