From 191d7a790792180b2507185fd573dde28166afce Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Fri, 19 Aug 2022 21:54:18 +0200 Subject: [PATCH] Adapted role names --- playbook.yml | 48 +++++++++++-------- .../meta/main.yml | 0 .../tasks/main.yml | 0 .../tasks/main.yml | 0 .../vars/main.yml | 0 roles/application-ssh/meta/main.yml | 2 + .../tasks/main.yml | 0 .../tasks/main.yml | 0 .../meta/main.yml | 2 +- roles/collection-office-tools/meta/main.yml | 2 +- roles/system-gnome/Readme.md | 2 +- roles/system-swapfile/meta/main.yml | 2 +- roles/tool-ssh-client/meta/main.yml | 2 - 13 files changed, 33 insertions(+), 27 deletions(-) rename roles/{tool-libreoffice => application-libreoffice}/meta/main.yml (100%) rename roles/{tool-libreoffice => application-libreoffice}/tasks/main.yml (100%) rename roles/{tool-nextcloud-client => application-nextcloud-client}/tasks/main.yml (100%) rename roles/{tool-nextcloud-client => application-nextcloud-client}/vars/main.yml (100%) create mode 100644 roles/application-ssh/meta/main.yml rename roles/{tool-ssh-client => application-ssh}/tasks/main.yml (100%) rename roles/{tool-torbrowser => application-torbrowser}/tasks/main.yml (100%) delete mode 100644 roles/tool-ssh-client/meta/main.yml diff --git a/playbook.yml b/playbook.yml index 976d133e..7c29195d 100644 --- a/playbook.yml +++ b/playbook.yml @@ -2,67 +2,73 @@ hosts: all become: true roles: - - native-pacman-update - - native-administrator - - native-caffeine - - native-non-free-drivers -- name: native-collection-office + - system-pacman + - collection-administrator-tools-base + - application-caffeine + - driver-non-free + +- name: collection-office-tools hosts: collection_officetools_hosts become: true roles: - - native-collection-office + - collection-office-tools + - name: GNOME setup hosts: gnome_hosts become: true roles: - - native-gnome + - system-gnome + - name: setup msi rgb keyboard hosts: msi_perkeyrgb_hosts become: true roles: - - native-msi-perkeyrgb + - driver-msi-perkeyrgb + - name: setup ssh hosts hosts: ssh_hosts become: false roles: - - native-msi-perkeyrgb + - application-ssh + - name: setup swapfile hosts hosts: swapfile_hosts become: false roles: - - role: native-swapfile + - role: driver-swapfile + - name: setup gaming hosts hosts: gaming_hosts become: true roles: - - native-games + - collection-games + - name: setup multiprinter hosts hosts: epson_multiprinter_hosts become: true roles: - - native-epson-multiprinter + - driver-epson-multiprinter + - name: setup torbrowser hosts hosts: torbrowser_hosts become: true roles: - - native-torbrowser -- name: setup libreoffice hosts - hosts: libreoffice_hosts - become: true - roles: - - native-libreoffice + - application-torbrowser + - name: setup nextcloud-client hosts: nextcloud_client_hosts become: true roles: - - native-nextcloud-client + - application-nextcloud-client + - name: setup dia hosts: dia_hosts become: true roles: - - native-dia + - application-dia + - name: setup docker hosts: docker_hosts become: true roles: - - native-docker + - application-docker diff --git a/roles/tool-libreoffice/meta/main.yml b/roles/application-libreoffice/meta/main.yml similarity index 100% rename from roles/tool-libreoffice/meta/main.yml rename to roles/application-libreoffice/meta/main.yml diff --git a/roles/tool-libreoffice/tasks/main.yml b/roles/application-libreoffice/tasks/main.yml similarity index 100% rename from roles/tool-libreoffice/tasks/main.yml rename to roles/application-libreoffice/tasks/main.yml diff --git a/roles/tool-nextcloud-client/tasks/main.yml b/roles/application-nextcloud-client/tasks/main.yml similarity index 100% rename from roles/tool-nextcloud-client/tasks/main.yml rename to roles/application-nextcloud-client/tasks/main.yml diff --git a/roles/tool-nextcloud-client/vars/main.yml b/roles/application-nextcloud-client/vars/main.yml similarity index 100% rename from roles/tool-nextcloud-client/vars/main.yml rename to roles/application-nextcloud-client/vars/main.yml diff --git a/roles/application-ssh/meta/main.yml b/roles/application-ssh/meta/main.yml new file mode 100644 index 00000000..f4aa4bc0 --- /dev/null +++ b/roles/application-ssh/meta/main.yml @@ -0,0 +1,2 @@ +dependencies: +- application-git \ No newline at end of file diff --git a/roles/tool-ssh-client/tasks/main.yml b/roles/application-ssh/tasks/main.yml similarity index 100% rename from roles/tool-ssh-client/tasks/main.yml rename to roles/application-ssh/tasks/main.yml diff --git a/roles/tool-torbrowser/tasks/main.yml b/roles/application-torbrowser/tasks/main.yml similarity index 100% rename from roles/tool-torbrowser/tasks/main.yml rename to roles/application-torbrowser/tasks/main.yml diff --git a/roles/collection-administrator-tools-base/meta/main.yml b/roles/collection-administrator-tools-base/meta/main.yml index 3bce5ffa..f4aa4bc0 100644 --- a/roles/collection-administrator-tools-base/meta/main.yml +++ b/roles/collection-administrator-tools-base/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-git \ No newline at end of file +- application-git \ No newline at end of file diff --git a/roles/collection-office-tools/meta/main.yml b/roles/collection-office-tools/meta/main.yml index a5fa2770..a5c9e617 100644 --- a/roles/collection-office-tools/meta/main.yml +++ b/roles/collection-office-tools/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-libreoffice \ No newline at end of file +- application-libreoffice \ No newline at end of file diff --git a/roles/system-gnome/Readme.md b/roles/system-gnome/Readme.md index f53d1b1b..8ade9fc6 100644 --- a/roles/system-gnome/Readme.md +++ b/roles/system-gnome/Readme.md @@ -1,3 +1,3 @@ -# native-gnome +# system-gnome ## further information - https://askubuntu.com/questions/1029376/how-do-i-enable-and-disable-gnome-extensions-from-the-command-line \ No newline at end of file diff --git a/roles/system-swapfile/meta/main.yml b/roles/system-swapfile/meta/main.yml index 3bce5ffa..f4aa4bc0 100644 --- a/roles/system-swapfile/meta/main.yml +++ b/roles/system-swapfile/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-git \ No newline at end of file +- application-git \ No newline at end of file diff --git a/roles/tool-ssh-client/meta/main.yml b/roles/tool-ssh-client/meta/main.yml deleted file mode 100644 index 3bce5ffa..00000000 --- a/roles/tool-ssh-client/meta/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -dependencies: -- native-git \ No newline at end of file