Merge pull request #327 from iiab/master

sync from iiab:master

roles/nextcloud/defaults/main.yml

@@ -17,13 +17,18 @@
 nextcloud_url: /nextcloud
 nextcloud_prefix: /opt
 nextcloud_data_dir: "{{ content_base }}/nextcloud/data"    # /library/nextcloud/data
+
+# 2020-01-07: If installing IIAB often, download.nextcloud.com may throttle
+# you to ~100 kbit/sec, delaying your IIAB install by an hour or more (#2112).
+# The following line can avoid that: (but might install an older Nextcloud!)
+# nextcloud_dl_url: http://d.iiab.io/packages
 nextcloud_dl_url: https://download.nextcloud.com/server/releases
 
 # For OLD OS's where PHP 7.1+ isn't detected -- e.g. Raspbian 9, Debian 9, Ubuntu 16.04
 nextcloud_orig_src_file_old: latest-15.tar.bz2    
 nextcloud_src_file_old: nextcloud_{{ nextcloud_orig_src_file_old }}
 # For NEW OS's where PHP 7.1+ is auto-detected -- e.g. Raspbian 10, Debian 10 & Ubuntu 18.04
-nextcloud_orig_src_file: latest-17.tar.bz2
+nextcloud_orig_src_file: latest.tar.bz2
 nextcloud_src_file: nextcloud_{{ nextcloud_orig_src_file }}
 
 # We install on MySQL with these settings:

roles/nextcloud/tasks/enable_or_disable.yml

@@ -23,7 +23,7 @@
     state: absent
   when: not nextcloud_enabled and is_redhat
 
-- name: Restart Apache, enabling/disabling http://box/nextcloud
+- name: Restart {{ apache_service }}, enabling/disabling http://box/nextcloud
   systemd:
     name: "{{ apache_service }}"
     daemon-reload: yes

roles/nextcloud/tasks/main.yml

@@ -9,10 +9,10 @@
   include_tasks: install.yml
   when: nextcloud_install and (not nextcloud_installed is defined or not nextcloud_page.stat.exists)
 
-- name: Provision NextCloud's Mysql DB
+- name: Provision Nextcloud's MySQL DB, run Nextcloud's install wizard, etc
   include_tasks: setup.yml
   when: nextcloud_install and not installing
 
-- name: Enables or disable Nextcloud!
+- name: Enable or disable Nextcloud
   include_tasks: enable_or_disable.yml
   when: nextcloud_install or nextcloud_installed is defined

roles/nextcloud/tasks/setup.yml

@@ -14,7 +14,7 @@
     - ::1
     - localhost
 
-# the install wizard does not succeed if already installed
+# The install wizard fails if already installed.
 - name: Determine if Nextcloud is installed
   shell: >
     php {{ nextcloud_prefix }}/nextcloud/occ status |
@@ -37,7 +37,9 @@
   become_user: "{{ apache_user }}"
   when: nextcloud_enabled and returned.stdout == "false"
 
-- name: Allow access from all hosts and ips
+# RELATED: /etc/apache2/sites-available/nextcloud.conf sourced from
+# https://github.com/iiab/iiab/blob/master/roles/nextcloud/templates/nextcloud.conf.j2
+- name: 'Allow Nextcloud access from all hosts and IP addresses (SEE ALSO: /etc/apache2/sites-available/nextcloud.conf)'
   command: php {{ nextcloud_prefix }}/nextcloud/occ config:system:set trusted_domains 1 --value=*
   become: yes
   become_user: "{{ apache_user }}"

roles/phpmyadmin/defaults/main.yml

@@ -4,5 +4,5 @@
 # All above are set in: github.com/iiab/iiab/blob/master/vars/default_vars.yml
 # If nec, change them by editing /etc/iiab/local_vars.yml prior to installing!
 
-phpmyadmin_name: "phpMyAdmin-5.0.0-all-languages"
+phpmyadmin_name: "phpMyAdmin-5.0.1-all-languages"
 phpmyadmin_name_zip: "{{ phpmyadmin_name }}.zip"

vars/default_vars.yml

@@ -387,6 +387,11 @@ nextcloud_enabled: False
 nextcloud_allow_public_ips: False
 # Configuration tips for IPv4 access controls and tuning RAM/resources:
 # https://github.com/iiab/iiab/blob/master/roles/nextcloud/README.md
+#
+# 2020-01-07: If installing IIAB often, download.nextcloud.com may throttle
+# you to ~100 kbit/sec, delaying your IIAB install by an hour or more (#2112).
+# Uncomment the following line to end that: (might install an older Nextcloud!)
+# nextcloud_dl_url: http://d.iiab.io/packages
 
 # A full-featured PBX (for rural telephony, etc) based on Asterisk and FreePBX.
 # Works on Ubuntu 18.04, Debian 9. Experimental on Rasp/RPi 3. Uses Node.js 10.x

vars/local_vars_big.yml

@@ -243,6 +243,11 @@ nextcloud_enabled: True
 nextcloud_allow_public_ips: False
 # Configuration tips for IPv4 access controls and tuning RAM/resources:
 # https://github.com/iiab/iiab/blob/master/roles/nextcloud/README.md
+#
+# 2020-01-07: If installing IIAB often, download.nextcloud.com may throttle
+# you to ~100 kbit/sec, delaying your IIAB install by an hour or more (#2112).
+# Uncomment the following line to end that: (might install an older Nextcloud!)
+# nextcloud_dl_url: http://d.iiab.io/packages
 
 # A full-featured PBX (for rural telephony, etc) based on Asterisk and FreePBX.
 # Works on Ubuntu 18.04, Debian 9. Experimental on Rasp/RPi 3. Uses Node.js 10.x

vars/local_vars_medium.yml

@@ -243,6 +243,11 @@ nextcloud_enabled: True
 nextcloud_allow_public_ips: False
 # Configuration tips for IPv4 access controls and tuning RAM/resources:
 # https://github.com/iiab/iiab/blob/master/roles/nextcloud/README.md
+#
+# 2020-01-07: If installing IIAB often, download.nextcloud.com may throttle
+# you to ~100 kbit/sec, delaying your IIAB install by an hour or more (#2112).
+# Uncomment the following line to end that: (might install an older Nextcloud!)
+# nextcloud_dl_url: http://d.iiab.io/packages
 
 # A full-featured PBX (for rural telephony, etc) based on Asterisk and FreePBX.
 # Works on Ubuntu 18.04, Debian 9. Experimental on Rasp/RPi 3. Uses Node.js 10.x

vars/local_vars_min.yml

@@ -243,6 +243,11 @@ nextcloud_enabled: False
 nextcloud_allow_public_ips: False
 # Configuration tips for IPv4 access controls and tuning RAM/resources:
 # https://github.com/iiab/iiab/blob/master/roles/nextcloud/README.md
+#
+# 2020-01-07: If installing IIAB often, download.nextcloud.com may throttle
+# you to ~100 kbit/sec, delaying your IIAB install by an hour or more (#2112).
+# Uncomment the following line to end that: (might install an older Nextcloud!)
+# nextcloud_dl_url: http://d.iiab.io/packages
 
 # A full-featured PBX (for rural telephony, etc) based on Asterisk and FreePBX.
 # Works on Ubuntu 18.04, Debian 9. Experimental on Rasp/RPi 3. Uses Node.js 10.x