diff --git a/roles/calibre/tasks/main.yml b/roles/calibre/tasks/main.yml index f7dc6da..dcc300c 100644 --- a/roles/calibre/tasks/main.yml +++ b/roles/calibre/tasks/main.yml @@ -1,5 +1,3 @@ --- -- apt: - name: calibre - state: present - when: hwpoints|int >= 2 +# Calibre +- apt: name=calibre state=present diff --git a/roles/checkhw/tasks/main.yml b/roles/checkhw/tasks/main.yml index 02462d6..bcb6d5d 100644 --- a/roles/checkhw/tasks/main.yml +++ b/roles/checkhw/tasks/main.yml @@ -1,14 +1,11 @@ --- -- set_fact: - hwpoints: 1 - when: ansible_memtotal_mb|int <= 2048 and ansible_processor_vcpus|int <= 2 +- set_fact: hwpoints=1 + when: {{ ansible_memtotal_mb | int }} <= 2048 and {{ ansible_processor_vcpus | int }} <= 2 -- set_fact: - hwpoints: 2 - when: ansible_memtotal_mb|int <= 4096 and ansible_processor_vcpus|int <= 2 +- set_fact: hwpoints=2 + when: {{ ansible_memtotal_mb | int }} <= 4096 and {{ ansible_processor_vcpus | int }}<= 2 -- set_fact: - hwpoints: 3 - when: ansible_memtotal_mb|int > 4096 and ansible_processor_vcpus|int >= 4 +- set_fact: hwpoints=3 + when: {{ ansible_memtotal_mb | int }} > 4096 and {{ ansible_processor_vcpus | int }} >= 4 -- setup: filter=ansible_local +- setup: diff --git a/roles/chromium/tasks/main.yml b/roles/chromium/tasks/main.yml index f9729f3..bb26d96 100644 --- a/roles/chromium/tasks/main.yml +++ b/roles/chromium/tasks/main.yml @@ -1,5 +1,2 @@ --- -- apt: - name: chromium-browser - state: present - when: hwpoints|int >= 2 +- apt: name=chromium-browser state=present diff --git a/roles/geogebra/tasks/main.yml b/roles/geogebra/tasks/main.yml index 88af2c5..2ce9528 100644 --- a/roles/geogebra/tasks/main.yml +++ b/roles/geogebra/tasks/main.yml @@ -4,4 +4,3 @@ - geogebra - geogebra-gnome state: present - when: hwpoints|int >= 2 diff --git a/roles/gimp/tasks/main.yml b/roles/gimp/tasks/main.yml index 50de172..4a65b82 100644 --- a/roles/gimp/tasks/main.yml +++ b/roles/gimp/tasks/main.yml @@ -4,4 +4,3 @@ - gimp - gimp-help-it state: present - when: hwpoints|int >= 2 diff --git a/roles/googlechrome/tasks/main.yml b/roles/googlechrome/tasks/main.yml index 1fc5f9f..0964d41 100644 --- a/roles/googlechrome/tasks/main.yml +++ b/roles/googlechrome/tasks/main.yml @@ -1,10 +1,6 @@ --- -- block: - - - get_url: - url: "https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb" - dest: /tmp/google-chrome-stable_current_amd64.deb - - - shell: dpkg -i /tmp/google-chrome-stable_current_amd64.deb +- get_url: + url: "https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb" + dest: /tmp/google-chrome-stable_current_amd64.deb - when: hwpoints|int >= 2 +- shell: dpkg -i /tmp/google-chrome-stable_current_amd64.deb diff --git a/roles/inkscape/tasks/main.yml b/roles/inkscape/tasks/main.yml index c168625..68e0ba0 100644 --- a/roles/inkscape/tasks/main.yml +++ b/roles/inkscape/tasks/main.yml @@ -1,5 +1,2 @@ --- -- apt: - name: inkscape - state: present - when: hwpoints|int >= 2 +- apt: name=inkscape state=present diff --git a/roles/install/meta/main.yml b/roles/install/meta/main.yml index baf66ef..6eb354f 100644 --- a/roles/install/meta/main.yml +++ b/roles/install/meta/main.yml @@ -1,17 +1,17 @@ dependencies: - checkhw - neofetch - - googlechrome - - chromium + - { role: googlechrome, when: {{ hwpoints | int }} >= 2 } + - { role: chromium, when: {{ hwpoints | int }} >= 2 } - firefox - libreoffice - - scribus - - calibre - - gimp - - inkscape - - openshot + - { role: scribus, when: {{ hwpoints |int }} >= 2 } + - { role: calibre, when: {{ hwpoints | int }} >= 2 } + - { role: gimp, when: {{ hwpoints | int }} >= 2 } + - { role: inkscape, when: {{ hwpoints | int }} >= 2 } + - { role: openshot, when: {{ hwpoints | int }} >= 3 } - vlc - - geogebra - - minetest - - zoom - - msteams + - { role: geogebra, when: {{ hwpoints | int }} >= 2 } + - { role: minetest, when: {{ hwpoints | int }} >= 2 } + - { role: zoom, when: {{ hwpoints | int }} > 2 } + - { role: msteams, when: {{ hwpoints | int }} > 2 } diff --git a/roles/minetest/tasks/main.yml b/roles/minetest/tasks/main.yml index d35cbb4..b8a44e8 100644 --- a/roles/minetest/tasks/main.yml +++ b/roles/minetest/tasks/main.yml @@ -1,3 +1,2 @@ --- - apt: name=minetest state=present - when: hwpoints|int >= 2 diff --git a/roles/msteams/tasks/main.yml b/roles/msteams/tasks/main.yml index 5995099..fa75f7b 100644 --- a/roles/msteams/tasks/main.yml +++ b/roles/msteams/tasks/main.yml @@ -1,11 +1,7 @@ --- -- block: +- get_url: + url: 'https://go.microsoft.com/fwlink/p/?linkid=2112886&clcid=0x410&culture=it-it&country=it' + dest: /tmp/teams_amd64.deb - - get_url: - url: 'https://go.microsoft.com/fwlink/p/?linkid=2112886&clcid=0x410&culture=it-it&country=it' - dest: /tmp/teams_amd64.deb - - - shell: 'dpkg -i /tmp/teams_amd64.deb' - - when: hwpoints|int > 2 +- shell: 'dpkg -i /tmp/teams_amd64.deb' diff --git a/roles/openshot/tasks/main.yml b/roles/openshot/tasks/main.yml index e29fdb4..bbf7cb3 100644 --- a/roles/openshot/tasks/main.yml +++ b/roles/openshot/tasks/main.yml @@ -1,5 +1,2 @@ --- -- apt: - name: openshot - state: present - when: hwpoints|int >= 2 +- apt: name=openshot state=present diff --git a/roles/scribus/tasks/main.yml b/roles/scribus/tasks/main.yml index abbdd2e..0f06ce7 100644 --- a/roles/scribus/tasks/main.yml +++ b/roles/scribus/tasks/main.yml @@ -1,5 +1,2 @@ --- -- apt: - name: scribus - state: present - when: hwpoints|int >= 2 +- apt: name=scribus state=present diff --git a/roles/zoom/tasks/main.yml b/roles/zoom/tasks/main.yml index e63ab4b..d0075d8 100644 --- a/roles/zoom/tasks/main.yml +++ b/roles/zoom/tasks/main.yml @@ -1,19 +1,11 @@ --- -- block: +- apt: name=libxcb-xtest0 state=present - - apt: - name: libxcb-xtest0 - state: present - - - get_url: - url: "https://zoom.us/client/latest/zoom_amd64.deb" - dest: /tmp/zoom_amd64.deb - - - apt_key: - keyserver: keyserver.ubuntu.com - id: 396060CADD8A75220BFCB369B903BF1861A7C71D - - - shell: dpkg -i /tmp/zoom_amd64.deb +- get_url: + url: "https://zoom.us/client/latest/zoom_amd64.deb" + dest: /tmp/zoom_amd64.deb - when: hwpoints|int > 2 +- apt_key: keyserver=keyserver.ubuntu.com id=396060CADD8A75220BFCB369B903BF1861A7C71D + +- shell: dpkg -i /tmp/zoom_amd64.deb