rest of patches

roles/moodle/tasks/main.yml

@@ -15,6 +15,10 @@
   with_items:
     - python-psycopg2
     - php{{ php_version }}-pgsql
+    - php{{ php_version }}-curl
+#    - php-zip debian has php-pclzip
+    - php{{ php_version }}-gd
+#    - php-mbstring --perhaps debian libapache2-mod-php
   when: is_debuntu
   tags:
     - download

roles/network/tasks/restart.yml

@@ -16,7 +16,8 @@
   when: named_enabled
   register: dns_started
 
-- name: add a reference to name server in resolv.conf
+# decide if resolvconf will ever be used FIXME
+- name: Configure resolvconf -- put localhost in resolv.conf
   lineinfile: line="nameserver 127.0.0.1"
               dest=/etc/resolvconf/resolv.conf.d/head
   when: named_enabled and is_debuntu and dns_started.changed

roles/owncloud/tasks/main.yml

@@ -1,6 +1,11 @@
 # we need to install the rpm in order to get the dependencies
 # but we only need to do this the first time
 
+- name: add a repo def for ubuntu
+  template: dest=/etc/apt/sources.list.d/
+            src=owncloud.list
+  when: is_ubuntu
+
 - name: See if the owncloud startup page exists
   stat: path={{ owncloud_prefix }}/owncloud/index.php
   register: owncloud_page

roles/xsce-admin/tasks/cmdsrv.yml

@@ -5,6 +5,7 @@
     - apache2
     - php{{ php_version }}
     - php{{ php_version }}-mysql
+    - php{{ php_version }}-dev
     - build-essential
     - php-pear
     - python-dev
@@ -17,7 +18,7 @@
   when: is_debuntu
 
 - name: install ubuntu connector apache to php
-  package: libapache2-mod-php
+  package: name=libapache2-mod-php
            state=present
   tags:
     - download
@@ -42,7 +43,7 @@
     - cracklib-python
   tags:
     - download
-  when: not is_debuntu
+  when: is_redhat
 
 - name: check the config_vars.yml file
   stat: path=/etc/xsce/config_vars.yml
@@ -211,7 +212,7 @@
   when: is_ubuntu
 
 - name: Enable the ubuntu php config file
-  command: phpenmod 20-zmq.ini
+  command: phpenmod 20-zmq
   when: is_ubuntu 
 
 - name: Create xsce-cmdsrv service

roles/xsce-admin/tasks/console.yml

@@ -67,6 +67,12 @@
             owner=root
             group=root
             mode=0644
+  when: not adm_cons_force_ssl
+
+- name: Delete admin-console config file
+  file: dest=/etc/{{ apache_config_dir }}/xs-console.conf
+        state=absent
+  when: adm_cons_force_ssl
 
 - name: Install admin-console ssl config file
   template: src=console/xs-console-ssl.conf.j2

vars/CentOS.yml

@@ -19,3 +19,5 @@ systemctl_program: /usr/bin/systemctl
 mysql_service: mariadb
 apache_log: /var/log/httpd/access_log
 sshd_service: sshd
++php_version: 7.0
++postgresql_version: 9.5

vars/Debian.yml

@@ -1,6 +1,7 @@
 is_debian: true
 is_debuntu: true
 is_redhat: false
+is_fedora: False
 is_centos: false
 dns_service: bind9
 dns_user: bind
@@ -21,3 +22,5 @@ apache_log: /var/log/apache2/access.log
 # which in turn cause netfilter-persistent to fail, which is essential
 cups_install: True
 sshd_service: ssh
+php_version: 5
+postgresql_version: 9.4

vars/debian.localvars

@@ -17,7 +17,7 @@ idmgr_install: False
 debian_schooltool_install: False
 # 6-generic-aps
 # 7-edu-aps
-pathagar_install: True
+pathagar_install: False
 # 8-mgmat-tools
 sugar_stats_install: False
 ajenti_install: False