diff --git a/roles/arch/tasks/main.yml b/roles/arch/tasks/main.yml index 07075c0..9b69c33 100644 --- a/roles/arch/tasks/main.yml +++ b/roles/arch/tasks/main.yml @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -- include: packages-cli.yml -- include: packages-gui.yml +- import_tasks: packages-cli.yml +- import_tasks: packages-gui.yml when: gui == true -- include: modules.yml -- include: ssh.yml -- include: solokeys.yml -- include: locale.yml -- include: printing.yml -- include: localbin.yml +- import_tasks: modules.yml +- import_tasks: ssh.yml +- import_tasks: solokeys.yml +- import_tasks: locale.yml +- import_tasks: printing.yml +- import_tasks: localbin.yml diff --git a/roles/debian/tasks/main.yml b/roles/debian/tasks/main.yml index dcd71d3..3a96e90 100644 --- a/roles/debian/tasks/main.yml +++ b/roles/debian/tasks/main.yml @@ -13,17 +13,17 @@ # See the License for the specific language governing permissions and # limitations under the License. -- include: apt-sources.yml -- include: packages-cli.yml -- include: packages-gui.yml +- import_tasks: apt-sources.yml +- import_tasks: packages-cli.yml +- import_tasks: packages-gui.yml when: gui == true -- include: build-env.yml -- include: modules.yml -- include: ssh.yml -- include: solokeys.yml +- import_tasks: build-env.yml +- import_tasks: modules.yml +- import_tasks: ssh.yml +- import_tasks: solokeys.yml when: wsl_distro is not defined -- include: sudo.yml -- include: vscode.yml +- import_tasks: sudo.yml +- import_tasks: vscode.yml when: gui == true -- include: packagekit.yml +- import_tasks: packagekit.yml when: gui == true diff --git a/roles/el/tasks/main.yml b/roles/el/tasks/main.yml index 8f0e781..52d040b 100644 --- a/roles/el/tasks/main.yml +++ b/roles/el/tasks/main.yml @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -- include: packages-cli.yml -- include: packages-gui.yml +- import_tasks: packages-cli.yml +- import_tasks: packages-gui.yml when: gui == true -- include: modules.yml -- include: ssh.yml -- include: solokeys.yml -- include: packagekit.yml -- include: vscode.yml +- import_tasks: modules.yml +- import_tasks: ssh.yml +- import_tasks: solokeys.yml +- import_tasks: packagekit.yml +- import_tasks: vscode.yml diff --git a/roles/fedora/tasks/main.yml b/roles/fedora/tasks/main.yml index e2c076c..02658e3 100644 --- a/roles/fedora/tasks/main.yml +++ b/roles/fedora/tasks/main.yml @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -- include: packages-cli.yml -- include: packages-gui.yml +- import_tasks: packages-cli.yml +- import_tasks: packages-gui.yml when: gui == true -- include: modules.yml -- include: ssh.yml -- include: solokeys.yml -- include: vscode.yml +- import_tasks: modules.yml +- import_tasks: ssh.yml +- import_tasks: solokeys.yml +- import_tasks: vscode.yml when: gui == true -- include: packagekit.yml +- import_tasks: packagekit.yml diff --git a/roles/freebsd/tasks/main.yml b/roles/freebsd/tasks/main.yml index 0422dc4..0c094ea 100644 --- a/roles/freebsd/tasks/main.yml +++ b/roles/freebsd/tasks/main.yml @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -- include: packages-cli.yml -- include: packages-gui.yml +- import_tasks: packages-cli.yml +- import_tasks: packages-gui.yml when: gui == true -- include: rc.yml -- include: sysctl.yml -- include: sudo.yml -- include: ssh.yml -- include: xorg.yml +- import_tasks: rc.yml +- import_tasks: sysctl.yml +- import_tasks: sudo.yml +- import_tasks: ssh.yml +- import_tasks: xorg.yml when: gui == true diff --git a/roles/home-cli/tasks/main.yml b/roles/home-cli/tasks/main.yml index 642d145..47f3069 100644 --- a/roles/home-cli/tasks/main.yml +++ b/roles/home-cli/tasks/main.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -- include: dirs.yml +- import_tasks: dirs.yml -- include: dotfiles.yml -- include: shell.yml -- include: vim.yml -- include: ssh-authorized-keys.yml +- import_tasks: dotfiles.yml +- import_tasks: shell.yml +- import_tasks: vim.yml +- import_tasks: ssh-authorized-keys.yml diff --git a/roles/home-gui/tasks/main.yml b/roles/home-gui/tasks/main.yml index d7369ca..64c229c 100644 --- a/roles/home-gui/tasks/main.yml +++ b/roles/home-gui/tasks/main.yml @@ -13,10 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -- include: dirs.yml +- import_tasks: dirs.yml -- include: dotfiles.yml -- include: firefox.yml -- include: gnome.yml -- include: mate.yml -- include: sublimetext.yml +- import_tasks: dotfiles.yml +- import_tasks: firefox.yml +- import_tasks: gnome.yml +- import_tasks: mate.yml +- import_tasks: sublimetext.yml diff --git a/roles/netbsd/tasks/main.yml b/roles/netbsd/tasks/main.yml index 23bd96e..f4bc9fa 100644 --- a/roles/netbsd/tasks/main.yml +++ b/roles/netbsd/tasks/main.yml @@ -13,10 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -- include: packages-cli.yml -- include: packages-gui.yml +- import_tasks: packages-cli.yml +- import_tasks: packages-gui.yml when: gui == true -- include: sudo.yml -- include: console.yml -- include: xorg.yml +- import_tasks: sudo.yml +- import_tasks: console.yml +- import_tasks: xorg.yml when: gui == true diff --git a/roles/opensuse-leap/tasks/main.yml b/roles/opensuse-leap/tasks/main.yml index de69f2f..432f8f7 100644 --- a/roles/opensuse-leap/tasks/main.yml +++ b/roles/opensuse-leap/tasks/main.yml @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -- include: packages-cli.yml -- include: packages-gui.yml +- import_tasks: packages-cli.yml +- import_tasks: packages-gui.yml when: gui == true -- include: modules.yml -- include: ssh.yml +- import_tasks: modules.yml +- import_tasks: ssh.yml when: wsl_distro is not defined -- include: solokeys.yml +- import_tasks: solokeys.yml when: wsl_distro is not defined diff --git a/roles/opensuse-tumbleweed/tasks/main.yml b/roles/opensuse-tumbleweed/tasks/main.yml index de69f2f..432f8f7 100644 --- a/roles/opensuse-tumbleweed/tasks/main.yml +++ b/roles/opensuse-tumbleweed/tasks/main.yml @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -- include: packages-cli.yml -- include: packages-gui.yml +- import_tasks: packages-cli.yml +- import_tasks: packages-gui.yml when: gui == true -- include: modules.yml -- include: ssh.yml +- import_tasks: modules.yml +- import_tasks: ssh.yml when: wsl_distro is not defined -- include: solokeys.yml +- import_tasks: solokeys.yml when: wsl_distro is not defined diff --git a/roles/ubuntu/tasks/main.yml b/roles/ubuntu/tasks/main.yml index 85b2710..4f0fbf8 100644 --- a/roles/ubuntu/tasks/main.yml +++ b/roles/ubuntu/tasks/main.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -- include: packages-cli.yml -- include: packages-gui.yml +- import_tasks: packages-cli.yml +- import_tasks: packages-gui.yml when: gui == true -- include: build-env.yml -- include: modules.yml -- include: ssh.yml +- import_tasks: build-env.yml +- import_tasks: modules.yml +- import_tasks: ssh.yml