diff --git a/roles/calibre-web/tasks/install.yml b/roles/calibre-web/tasks/install.yml index 05557a611..6c35db157 100644 --- a/roles/calibre-web/tasks/install.yml +++ b/roles/calibre-web/tasks/install.yml @@ -1,6 +1,8 @@ - name: "Install ImageMagick package: imagemagick" package: - name: imagemagick + name: + - imagemagick + - python3-venv state: present - name: Allow ImageMagick to read PDFs, per /etc/ImageMagick-6/policy.xml, to create book cover thumbnails diff --git a/roles/network/tasks/debian.yml b/roles/network/tasks/debian.yml index 230de8432..74ca452c7 100644 --- a/roles/network/tasks/debian.yml +++ b/roles/network/tasks/debian.yml @@ -41,7 +41,7 @@ template: dest: /etc/network/interfaces.d/iiab src: network/systemd.j2 - when: not is_raspbian (iiab_lan_iface == "br0" or wan_ip != "dhcp" or gui_static_wan_ip == "undefined") + when: not is_raspbian and (iiab_lan_iface == "br0" or wan_ip != "dhcp" or gui_static_wan_ip == "undefined") - name: Copy the bridge script for RPi template: diff --git a/scripts/ansible b/scripts/ansible index 83d9338e5..c74af4427 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -78,7 +78,7 @@ elif [ -f /etc/debian_version ]; then # Includes Debian, Ubuntu & Raspbian echo -e "https://github.com/iiab/iiab/tree/master/scripts/ansible.md\n" apt update apt -y --allow-downgrades install ansible python3-pymysql python3-psycopg2 \ - python3-passlib python3-pip python3-setuptools virtualenv + python3-passlib python3-pip python3-setuptools python3-venv virtualenv echo -e "\nSUCCESS: verify Ansible using 'ansible --version' and/or 'apt -a list ansible'\n\n" diff --git a/scripts/ansible-2.8.x b/scripts/ansible-2.8.x index 3f0d94ad7..4d57bd1d1 100755 --- a/scripts/ansible-2.8.x +++ b/scripts/ansible-2.8.x @@ -78,7 +78,7 @@ elif [ -f /etc/debian_version ]; then # Includes Debian, Ubuntu & Raspbian echo -e "https://github.com/iiab/iiab/tree/master/scripts/ansible.md\n" apt update apt -y --allow-downgrades install ansible python3-pymysql python3-psycopg2 \ - python3-passlib python3-pip python3-setuptools virtualenv + python3-passlib python3-pip python3-setuptools python3-venv virtualenv echo -e "\nSUCCESS: verify Ansible using 'ansible --version' and/or 'apt -a list ansible'\n\n" diff --git a/scripts/ansible-2.9.x b/scripts/ansible-2.9.x index cc36834a7..81bfce59a 100755 --- a/scripts/ansible-2.9.x +++ b/scripts/ansible-2.9.x @@ -78,7 +78,7 @@ elif [ -f /etc/debian_version ]; then # Includes Debian, Ubuntu & Raspbian echo -e "https://github.com/iiab/iiab/tree/master/scripts/ansible.md\n" apt update apt -y --allow-downgrades install ansible python3-pymysql python3-psycopg2 \ - python3-passlib python3-pip python3-setuptools virtualenv + python3-passlib python3-pip python3-setuptools python3-venv virtualenv echo -e "\nSUCCESS: verify Ansible using 'ansible --version' and/or 'apt -a list ansible'\n\n"