external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00
Code Issues Releases Wiki Activity

not just is_ubuntu_18: make U19/U20 possible

Browse source
This commit is contained in:
holta 2019-05-24 21:58:37 -04:00
parent 5033f9b108
commit a74e187aac
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
roles/calibre/tasks/debs.yml
View file

@ -46,7 +46,8 @@
- name: Install/Upgrade to Calibre testing .deb's - target Ubuntu 16.04 (not rpi and not ubuntu_18)
command: scripts/calibre-install-latest.sh
when: not is_rpi and not is_ubuntu_18 and internet_available
when: not is_rpi and (is_ubuntu_16 or is_debian_9) and internet_available
#when: not is_rpi and not is_ubuntu_18 and internet_available
- name: Install/Upgrade to Calibre unstable .deb's IF calibre_unstable_debs
command: scripts/calibre-install-unstable.sh

5
roles/httpd/tasks/main.yml
View file

@ -29,10 +29,11 @@
when: is_debian and ansible_distribution_major_version == "8"
# SQLite3 no longer included in another package
- name: Install php{{ php_version }}-sqlite3 (debian-9 or ubuntu-18)
- name: Install php{{ php_version }}-sqlite3 (debian-9+ or ubuntu-18+)
package:
name: "php{{ php_version }}-sqlite3"
when: (is_debian and ansible_distribution_major_version == "9") or is_ubuntu_18
when: (is_debian and not is_debian_8) or (is_ubuntu and not is_ubuntu_16)
#when: (is_debian and ansible_distribution_major_version == "9") or is_ubuntu_18
- name: 'Install 4 packages: httpd, mod_authnz_external, php, php-curl (redhat)'
package: