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/3-base-server/meta/main.yml

@@ -1,4 +1,4 @@
 dependencies:
    - { role: httpd, tags: ['services','httpd','base'] }
-   - { role: xsce-admin, tags: ['services','xsce-admin','base'] }
+   - { role: iiab-admin, tags: ['services','iiab-admin','base'] }
    - { role: network, tags: ['services','base','network'], when: not gui_desired_network_role is defined }

roles/3-base-server/tasks/main.yml

@@ -2,7 +2,7 @@
   file: dest={{ doc_root }}/local_content
         state=directory
 
-- name: Set up to issue warning if xsce-admin password is still default
+- name: Set up to issue warning if iiab-admin password is still default
   template: src=profile_ssh_warn.sh
             dest=/etc/profile.d/
 
@@ -30,7 +30,7 @@
 
 # If we got here we're done
 - name: Record base gui version
-  lineinfile: dest=/etc/xsce/xsce.env
+  lineinfile: dest=/etc/iiab/iiab.env
               regexp='^BASE_VERSION=*'
               line='BASE_VERSION="{{ gui_version }}"'
               state=present

roles/3-base-server/templates/lxde_ssh_warn.sh

@@ -2,17 +2,17 @@
 # credit to the folks at raspberry pi foundatioon
 check_hash ()
 {
-   if ! id -u xsce-admin > /dev/null 2>&1 ; then return 0 ; fi
+   if ! id -u iiab-admin > /dev/null 2>&1 ; then return 0 ; fi
    if grep -q "^PasswordAuthentication\s*no" /etc/ssh/sshd_config ; then return 0 ; fi
    test -x /usr/bin/mkpasswd || return 0
-   SHADOW="$(sudo -n grep -E '^xsce-admin:' /etc/shadow 2>/dev/null)"
+   SHADOW="$(sudo -n grep -E '^iiab-admin:' /etc/shadow 2>/dev/null)"
    test -n "${SHADOW}" || return 0
-   if echo $SHADOW | grep -q "xsce-admin:!" ; then return 0 ; fi
+   if echo $SHADOW | grep -q "iiab-admin:!" ; then return 0 ; fi
    SHADOW_PW=$(echo $SHADOW | cut -d: -f2)
-   if [ "$SHADOW_PW" != "\$6\$xsce51\$D.IrrEeLBYIuJkGDmi27pZUGOwPFp98qpl3hxMwWV4hXigFGmdSvy3s/j7tn6OnyTTLmlV7SsN0lCUAFzxSop." ]; then return 0 ; fi
+   if [ "$SHADOW_PW" != "\$6\$iiab51\$D.IrrEeLBYIuJkGDmi27pZUGOwPFp98qpl3hxMwWV4hXigFGmdSvy3s/j7tn6OnyTTLmlV7SsN0lCUAFzxSop." ]; then return 0 ; fi
 
    if echo "${SHADOW}" | grep -q "${HASH}"; then
-	zenity --warning --text="SSH is enabled and the default password for the 'xsce-admin' user has not been changed.\nThis is a security risk - please go to the xsce-console and use utilities-> change password   to set a new password."
+	zenity --warning --text="SSH is enabled and the default password for the 'iiab-admin' user has not been changed.\nThis is a security risk - please go to the iiab-console and use utilities-> change password   to set a new password."
    fi
 }
 

roles/3-base-server/templates/profile_ssh_warn.sh

@@ -2,17 +2,17 @@
 # credit to the folks at raspberry pi foundatioon
 check_hash ()
 {
-   if ! id -u xsce-admin > /dev/null 2>&1 ; then return 0 ; fi
+   if ! id -u iiab-admin > /dev/null 2>&1 ; then return 0 ; fi
    if grep -q "^PasswordAuthentication\s*no" /etc/ssh/sshd_config ; then return 0 ; fi
-   SHADOW="$(sudo -n grep -E '^xsce-admin:' /etc/shadow 2>/dev/null)"
+   SHADOW="$(sudo -n grep -E '^iiab-admin:' /etc/shadow 2>/dev/null)"
    test -n "${SHADOW}" || return 0
-   if echo $SHADOW | grep -q "xsce-admin:!" ; then return 0 ; fi
+   if echo $SHADOW | grep -q "iiab-admin:!" ; then return 0 ; fi
    SHADOW_PW=$(echo $SHADOW | cut -d: -f2)
-   if [ "$SHADOW_PW" != "\$6\$xsce51\$D.IrrEeLBYIuJkGDmi27pZUGOwPFp98qpl3hxMwWV4hXigFGmdSvy3s/j7tn6OnyTTLmlV7SsN0lCUAFzxSop." ]; then return 0 ; fi
+   if [ "$SHADOW_PW" != "\$6\$iiab51\$D.IrrEeLBYIuJkGDmi27pZUGOwPFp98qpl3hxMwWV4hXigFGmdSvy3s/j7tn6OnyTTLmlV7SsN0lCUAFzxSop." ]; then return 0 ; fi
 
 		echo
-		echo "SSH is enabled and the default password for the 'xsce-admin' user is unchanged."
-		echo "This is a security risk - please login as the 'xsce-admin' user and type 'passwd' to change password."
+		echo "SSH is enabled and the default password for the 'iiab-admin' user is unchanged."
+		echo "This is a security risk - please login as the 'iiab-admin' user and type 'passwd' to change password."
 		echo
 }