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/kalite/defaults/main.yml

@@ -1,6 +1,6 @@
 ---
 # The values here are defaults.
-# To override them edit the main var definitions in xsce/vars
+# To override them edit the main var definitions in iiab/vars
 kalite_version: "0.17"
 kalite_repo_url: "https://github.com/learningequality/ka-lite.git"
 kalite_root: "/library/ka-lite"

roles/kalite/tasks/install-f18.yml

@@ -36,7 +36,7 @@
   tags:
     - download2
 
-- name: Create xsce-kalite user and password F18
+- name: Create iiab-kalite user and password F18
   user: name={{ kalite_user }}
         password={{ kalite_password_hash }}
         update_password=on_create
@@ -76,4 +76,4 @@
   with_items:
     - { src: 'f18/kalite-serve.service.j2', dest: '/etc/systemd/system/kalite-serve.service', mode: '0644'}
     - { src: 'f18/kalite-cron.service.j2', dest: '/etc/systemd/system/kalite-cron.service', mode: '0644'}
-    - { src: 'f18/xsce_cronservectl.sh.j2', dest: '{{ kalite_root }}/scripts/xsce_cronservectl.sh', mode: '0755'}
+    - { src: 'f18/iiab_cronservectl.sh.j2', dest: '{{ kalite_root }}/scripts/iiab_cronservectl.sh', mode: '0755'}

roles/kalite/tasks/install.yml

@@ -26,6 +26,16 @@
 # python-dateutil==2.4.2
 # django-dbbackup==2.3.2   ## no rpm
 
+- name: use pip to uninstall setuptools for centos
+  command: pip uninstall --yes setuptools
+  when: ansible_distribution == "CentOS"
+
+- name: Get an unbroken version of setuptools for centos
+  command: pip install setuptools==28.8.0
+  when: ansible_distribution == "CentOS"
+
+ 
+
 - name: Downoad kalite with pip
   pip: name=ka-lite version={{ kalite_version }}
        extra_args="--download {{ pip_packages_dir }}"

roles/kalite/templates/f18/iiab_cronservectl.sh.j2

@@ -0,0 +1,56 @@
+#!/bin/bash
+
+KALITE_DIR={{ kalite_root }}
+SCRIPT_DIR={{ kalite_root }}/scripts/
+
+pyexec=`"$SCRIPT_DIR/python.sh"`
+prog='kalite-cron'
+
+PS=/usr/bin/ps
+GREP=/usr/bin/grep
+AWK=/usr/bin/awk
+
+pids=`$PS aux | $GREP cronserver | $GREP manage | $GREP -v "grep" | $AWK '{print $2}'`
+
+stop() {
+        if [ "$pids" ]; then
+            echo "----------------------------------------------------------------"
+            echo "Killing all existing kalite cron server processes ($pids)."
+            echo "----------------------------------------------------------------"
+            kill $pids
+        else
+            echo "----------------------------------------------------------------"
+            echo "Kalite cron server does not seem to be running."
+            echo "----------------------------------------------------------------"
+        fi
+        kill $pids
+        RETVAL=$?
+        return $RETVAL
+}
+
+start() {
+        # Start daemons.
+        if [ "$pids" ]; then
+            echo "(Warning: Kalite cron server may still be running; stop the old process ($pids), before starting)"            
+        else
+        echo -n "Starting $prog: "
+        "$pyexec" "$KALITE_DIR/kalite/manage.py" cronserver $1 &
+        RETVAL=$?
+        return $RETVAL
+        fi
+}
+
+# See how we were called.
+case "$1" in
+  start)
+        start
+        ;;
+  stop)
+        stop
+        ;;
+  *)
+        echo $"Usage: $0 {start|stop}"
+        exit 1
+esac
+
+exit $RETVAL

roles/kalite/templates/f18/kalite-cron.service.j2

@@ -5,8 +5,8 @@ Wants=kalite-serve.service
 
 [Service]
 Type=forking
-ExecStart={{ kalite_root }}/scripts/xsce_cronservectl.sh start
-ExecStop={{ kalite_root }}/scripts/xsce_cronservectl.sh stop
+ExecStart={{ kalite_root }}/scripts/iiab_cronservectl.sh start
+ExecStop={{ kalite_root }}/scripts/iiab_cronservectl.sh stop
 
 [Install]
 WantedBy=multi-user.target