Test (#20)

* change apache_data to apache_user in all

* no libapach2 in centos. just php. no php-magick in centos

* remove redundant vars entries

* do not create apache user

* missed one pound sign

* soft code all references to apache_user

* centos requires older setuptools

* revert ansible_lsb.id in xsce.yml

* try getting recent pip

* move pip download to 2prep so that kalite success is not dependent on iiab coming first

* still need to replace setuptools in kalite

* add curl -- needed in debian

* massivly substitue iiab for xsce, and rename files

* completed runansible

* centos fixes,install  pip

* appliance means no iptables rules

* change to earlier version of setuptools for centos

* delete file duplicate, hopefully unnecessary. generate the offline docs

* wiki docs errors

* create the admin group -- deleted earlier

* use the --yes option with pip uninstall

* base of repo moved from schoolserver to iiab, unleashkids.org->iiab.io

* network detection broken due to tupo

roles/nextcloud/tasks/main.yml

@@ -11,8 +11,8 @@
 - name: Get the nextcloud software
   get_url: url={{ nextcloud_dl_url }}/{{ nextcloud_src_file }}  dest={{ downloads_dir }}/{{ nextcloud_src_file }}
   when: not {{ use_cache }} and not {{ no_network }}
-  async: 300
-  poll: 5
+  async: 900
+  poll: 15
   tags:
     - download
 
@@ -64,22 +64,22 @@
   template: src=autoconfig.php.j2
             dest={{ nextcloud_prefix }}/nextcloud/config/autoconfig.php
             owner={{ apache_user }}
-            group=apache
+            group={{ apache_user }}
             mode=0640
   when: is_centos
 
 - name: Make apache owner
   file: path={{ nextcloud_prefix }}/nextcloud
-        owner={{ apache_data }}
-        group=apache
+        owner={{ apache_user }}
+        group={{ apache_user }}
         recurse=yes
         state=directory
 
 - name: Create data directory library
   file: path={{ item }}
         mode=0750
-        owner={{ apache_data}}
-        group=apache
+        owner={{ apache_user }}
+        group={{ apache_user }}
         state=directory
   with_items:
     - "{{ nextcloud_data_dir }}"

roles/nextcloud/tasks/nextcloud_enabled.yml

@@ -28,7 +28,7 @@
   service: name={{ apache_service }} state=restarted
 
 - name: Run nextcloud initial install wizard
-  shell: curl http://{{ xsce_hostname }}{{ nextcloud_url }}/index.php
+  shell: curl http://{{ iiab_hostname }}{{ nextcloud_url }}/index.php
   when: nextcloud_enabled
 
 - name: Remove Rewrite URL

roles/nextcloud/templates/autoconfig.php.j2

@@ -3,8 +3,8 @@ $AUTOCONFIG = array(
   'directory'     => '{{ nextcloud_data_dir }}',
   'trusted_domains' =>
     array (
-     0 => '{{ xsce_hostname }}.{{ xsce_domain }}',
-     1 => "{{ xsce_hostname }}",
+     0 => '{{ iiab_hostname }}.{{ iiab_domain }}',
+     1 => "{{ iiab_hostname }}",
      2 => 'localhost',
      3 => 'internet-in-a-box.lan',
      4 => 'internet-in-a-box',
@@ -16,7 +16,7 @@ $AUTOCONFIG = array(
      10 => 'box',
      11 => '172.18.96.1',
     ), 
-  'overwrite.cli.url' => 'http://{{ xsce_hostname }}.{{ xsce_domain }}/nextcloud',
+  'overwrite.cli.url' => 'http://{{ iiab_hostname }}.{{ iiab_domain }}/nextcloud',
   'dbtype' => 'mysql',
   'dbname' => '{{ nextcloud_dbname }}',
   'dbhost' => '{{ nextcloud_dbhost }}',