1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00

Merge pull request #409 from iiab/master

Sync from iiab:master
This commit is contained in:
A Holt 2020-07-11 13:46:40 -04:00 committed by GitHub
commit 10fc1291ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 38 additions and 20 deletions

View file

@ -39,6 +39,7 @@
- iw - iw
- rfkill - rfkill
- wireless-tools - wireless-tools
- cloud-guest-utils
state: present state: present
- name: Increase swap file size (to CONF_SWAPSIZE={{ pi_swap_file_size }} in /etc/dphys-swapfile) as kalite pip download fails - name: Increase swap file size (to CONF_SWAPSIZE={{ pi_swap_file_size }} in /etc/dphys-swapfile) as kalite pip download fails

View file

@ -14,7 +14,7 @@ if [ -f /.resize-rootfs ];then
root_part_no=${root_part: (-1)} root_part_no=${root_part: (-1)}
# Resize partition # Resize partition
parted -s /dev/$root_dev resizepart $root_part_no 100% growpart /dev/$root_dev $root_part_no
resize2fs /dev/$root_part resize2fs /dev/$root_part
rm /.resize-rootfs rm /.resize-rootfs
fi fi

View file

@ -5,8 +5,8 @@
name: name:
- "{{ apache_service }}" # apache2 on Debuntu - "{{ apache_service }}" # apache2 on Debuntu
- "libapache2-mod-php{{ php_version }}" # 2020-06-15: Required (e.g. for Elgg, Moodle & possibly others) now that mysql/tasks/install.yml installs "php{{ php_version }}-common" rather than the full "php{{ php_version }}" - "libapache2-mod-php{{ php_version }}" # 2020-06-15: Required (e.g. for Elgg, Moodle & possibly others) now that mysql/tasks/install.yml installs "php{{ php_version }}-common" rather than the full "php{{ php_version }}"
- "php{{ php_version }}" # - "php{{ php_version }}"
- "php{{ php_version }}-curl" # - "php{{ php_version }}-curl"
state: present state: present
when: is_debuntu | bool when: is_debuntu | bool
# when: is_debian | bool # when: is_debian | bool
@ -32,12 +32,12 @@
# is the only role that needs it? # is the only role that needs it?
# #
# Legacy Comment: SQLite3 no longer included in another package # Legacy Comment: SQLite3 no longer included in another package
- name: Install php{{ php_version }}-sqlite3 (raspbian-9+ or debian-9+ or ubuntu-18+) #- name: Install php{{ php_version }}-sqlite3 (raspbian-9+ or debian-9+ or ubuntu-18+)
package: # package:
name: "php{{ php_version }}-sqlite3" # name: "php{{ php_version }}-sqlite3"
#when: is_raspbian_9 or is_debian_9 or is_ubuntu_18 # #when: is_raspbian_9 or is_debian_9 or is_ubuntu_18
when: is_debuntu and (not is_debian_8) and (not is_ubuntu_16) # when: is_debuntu and (not is_debian_8) and (not is_ubuntu_16)
#when: (is_debian and ansible_distribution_major_version == "9") or is_ubuntu_18 # #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)' - name: 'Install 4 packages: httpd, mod_authnz_external, php, php-curl (redhat)'
package: package:

View file

@ -5,24 +5,18 @@
# - 7 DB config # - 7 DB config
# - 2 record as installed # - 2 record as installed
- name: 'Install MySQL packages: mariadb-server, mariadb-client, and 9 php packages (debuntu)' - name: 'Install MySQL packages: mariadb-server, mariadb-client (debuntu)'
package: package:
name: name:
- mariadb-server - mariadb-server
- mariadb-client - mariadb-client
# - php{{ php_version }} # On Ubuntu 20.04 (and prob other OS's) this forces the install of: apache2 apache2-bin apache2-data apache2-utils libapache2-mod-php{{ php_version }} ETC
- php{{ php_version }}-common # 2020-05-21: @jvonau suggests this to avoid Apache above. Or its superset php{{ php_version }}-cli if absolutely nec?
- php{{ php_version }}-mysql
- php-pear
- php{{ php_version }}-gd
- php{{ php_version }}-imap
- php{{ php_version }}-ldap
- php{{ php_version }}-odbc
- php{{ php_version }}-xml # Was below
- php{{ php_version }}-xmlrpc
state: present state: present
when: is_debuntu | bool when: is_debuntu | bool
# 2020-07-11:
# 10 PHP package installs moved to roles/www_base/tasks/main.yml
# php{{ php_version }}-sqlite3 install moved to roles/osm-vector-maps/tasks/install.yml
# - name: "Install packages: mysql, MySQL-python and 9 php packages (OS's other than debuntu)" # - name: "Install packages: mysql, MySQL-python and 9 php packages (OS's other than debuntu)"
# package: # package:
# name: # name:

View file

@ -1,3 +1,8 @@
- name: Install php{{ php_version }}-sqlite3
package:
name: "php{{ php_version }}-sqlite3"
state: present
- name: Ensure directory {{ vector_map_path }}/maplist/assets exists - name: Ensure directory {{ vector_map_path }}/maplist/assets exists
file: file:
path: "{{ vector_map_path }}/maplist/assets" # /library/www/osm-vector-maps path: "{{ vector_map_path }}/maplist/assets" # /library/www/osm-vector-maps

View file

@ -1,6 +1,24 @@
# Role "www_base" runs here, probably in 3-BASE-SERVER. # Role "www_base" runs here, probably in 3-BASE-SERVER.
# Role "www_options" runs later, likely in 4-SERVER-OPTIONS. # Role "www_options" runs later, likely in 4-SERVER-OPTIONS.
- name: 'Install ~10 PHP packages (debuntu)'
package:
name:
# - php{{ php_version }} # On Ubuntu 20.04 (and prob other OS's) this forces the install of: apache2 apache2-bin apache2-data apache2-utils libapache2-mod-php{{ php_version }} ETC
- php{{ php_version }}-common # 2020-05-21: @jvonau suggests this to avoid Apache above. Or its superset php{{ php_version }}-cli if absolutely nec?
- php{{ php_version }}-curl
- php{{ php_version }}-gd
- php{{ php_version }}-imap
- php{{ php_version }}-ldap
- php{{ php_version }}-mysql
- php{{ php_version }}-odbc
- php-pear
# - php{{ php_version }}-sqlite3 # 2020-07-10: Experimentally install this within roles/osm-vector-maps/tasks/install.yml only, as part of OSM fix PR #2464 for #2461.
- php{{ php_version }}-xml # Was below
- php{{ php_version }}-xmlrpc
state: present
when: is_debuntu | bool
- name: Using html.yml - name: Using html.yml
include_tasks: html.yml include_tasks: html.yml