From f20f1f308d51c92b3fe9289037b173068bbe5419 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 30 Apr 2018 16:55:41 -0400 Subject: [PATCH 01/14] --adminuser=admin -> Admin --- roles/moodle/templates/moodle_installer | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/moodle/templates/moodle_installer b/roles/moodle/templates/moodle_installer index efbeb1859..5818f7a8f 100755 --- a/roles/moodle/templates/moodle_installer +++ b/roles/moodle/templates/moodle_installer @@ -3,6 +3,6 @@ sudo -u {{ apache_user }} /usr/bin/php {{ moodle_base }}/admin/cli/install.php \ --wwwroot=http://{{ iiab_hostname }}.{{ iiab_domain }}/moodle --dataroot={{ moodle_data }} \ --dbtype=pgsql --dbname={{ moodle_database_name }} --dbuser=Admin --dbpass=changeme \ --fullname=Your_School --shortname=School \ ---adminuser=admin --adminpass=changeme \ +--adminuser=Admin --adminpass=changeme \ --non-interactive --agree-license -chown {{ apache_user }}:{{ apache_user }} {{ moodle_base }}/config.php \ No newline at end of file +chown {{ apache_user }}:{{ apache_user }} {{ moodle_base }}/config.php From 930823ae151c71a69fa6a36cb1f03b264dd2d949 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 30 Apr 2018 16:58:33 -0400 Subject: [PATCH 02/14] moodle_version: 31 -> 35 --- roles/moodle/defaults/main.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/roles/moodle/defaults/main.yml b/roles/moodle/defaults/main.yml index 3f19aab8d..17def8bfc 100644 --- a/roles/moodle/defaults/main.yml +++ b/roles/moodle/defaults/main.yml @@ -1,9 +1,8 @@ -moodle_version: 31 +moodle_version: 35 moodle_repo_url: "https://github.com/moodle/moodle.git" moodle_base: "{{ iiab_base }}/moodle" moodle_user: moodle -moodle_install: True -moodle_enabled: False +#moodle_install: True +#moodle_enabled: False moodle_data: '{{ content_base }}/moodle' moodle_database_name: moodle - From f7a16070a540b4343ee7585aa382d2ffa3b45f9e Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 30 Apr 2018 17:01:26 -0400 Subject: [PATCH 03/14] Update main.yml --- roles/moodle/tasks/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/moodle/tasks/main.yml b/roles/moodle/tasks/main.yml index 374d9fbd1..40b5a9ff8 100644 --- a/roles/moodle/tasks/main.yml +++ b/roles/moodle/tasks/main.yml @@ -44,7 +44,8 @@ dest: "{{ moodle_base }}" depth: 1 force: yes - version: "MOODLE_{{ moodle_version }}_STABLE" + #version: "MOODLE_{{ moodle_version }}_STABLE" + version: master #TEMPORARY DURING MAY 2018 TESTING # ignore_errors: yes when: internet_available and moodle.stat.exists is defined and not moodle.stat.exists From 3d6ebc90befcf863d008438c422d18f9bf79b11f Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 30 Apr 2018 17:05:30 -0400 Subject: [PATCH 04/14] Update main.yml --- roles/moodle/tasks/main.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/roles/moodle/tasks/main.yml b/roles/moodle/tasks/main.yml index 40b5a9ff8..80c9b304b 100644 --- a/roles/moodle/tasks/main.yml +++ b/roles/moodle/tasks/main.yml @@ -1,5 +1,4 @@ ---- -- name: Install Moodle required packages (OS's other than debunt) +- name: Install Moodle required packages (OS's other than debuntu) package: name: "{{ item }}" state: present @@ -107,7 +106,7 @@ postgresql_user: name: Admin password: changeme - encrypted: yes # Required by PostgresSQL 10.3+ e.g. on Ubuntu 18.04, see https://github.com/iiab/iiab/issues/759 + encrypted: yes # Required by PostgreSQL 10+ e.g. Ubuntu 18.04's PostgreSQL 10.3+, see https://github.com/iiab/iiab/issues/759 role_attr_flags: NOSUPERUSER,NOCREATEROLE,NOCREATEDB state: present become: yes From a98ad8f4c6ca085e151ee4a6ed9619925e0f4b9a Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 30 Apr 2018 17:56:25 -0400 Subject: [PATCH 05/14] experiment: revert to --adminuser=admin (from Admin) --- roles/moodle/templates/moodle_installer | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/roles/moodle/templates/moodle_installer b/roles/moodle/templates/moodle_installer index 5818f7a8f..34c9c0fbe 100755 --- a/roles/moodle/templates/moodle_installer +++ b/roles/moodle/templates/moodle_installer @@ -1,8 +1,17 @@ #!/bin/bash -x -sudo -u {{ apache_user }} /usr/bin/php {{ moodle_base }}/admin/cli/install.php \ ---wwwroot=http://{{ iiab_hostname }}.{{ iiab_domain }}/moodle --dataroot={{ moodle_data }} \ ---dbtype=pgsql --dbname={{ moodle_database_name }} --dbuser=Admin --dbpass=changeme \ ---fullname=Your_School --shortname=School \ ---adminuser=Admin --adminpass=changeme \ ---non-interactive --agree-license + +sudo -u {{ apache_user }} \ + /usr/bin/php {{ moodle_base }}/admin/cli/install.php \ + --wwwroot=http://{{ iiab_hostname }}.{{ iiab_domain }}/moodle \ + --dataroot={{ moodle_data }} \ + --dbtype=pgsql \ + --dbname={{ moodle_database_name }} \ + --dbuser=Admin --dbpass=changeme \ + --fullname=Your_School \ + --shortname=School \ + --adminuser=admin --adminpass=changeme \ + --non-interactive \ + --agree-license \ + --allow-unstable #TEMPORARY DURING MAY 2018 TESTING + chown {{ apache_user }}:{{ apache_user }} {{ moodle_base }}/config.php From 34bb55d172be1a9e4e0178168fb280c7f131c60f Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 30 Apr 2018 18:22:31 -0400 Subject: [PATCH 06/14] Update main.yml --- roles/moodle/tasks/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/moodle/tasks/main.yml b/roles/moodle/tasks/main.yml index 80c9b304b..7dee936c2 100644 --- a/roles/moodle/tasks/main.yml +++ b/roles/moodle/tasks/main.yml @@ -70,7 +70,7 @@ mode: 0770 state: directory -- name: Remove stock Moodle conf +- name: Remove stock Moodle config file file: path: "/etc/{{ apache_config_dir }}/moodle.conf" state: absent @@ -114,7 +114,7 @@ - name: Create database postgresql_db: - name: moodle + name: {{ moodle_database_name }} encoding: utf8 owner: Admin template: template1 @@ -140,7 +140,7 @@ name: "{{ apache_service }}" state: restarted -- name: See if the config.php file exists +- name: See if config.php exists stat: path: "{{ moodle_base }}/config.php" register: config From 72b3b3760d6e10f0223aa0614ac50ee7ab979df7 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 30 Apr 2018 18:44:30 -0400 Subject: [PATCH 07/14] Update main.yml --- roles/moodle/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/moodle/tasks/main.yml b/roles/moodle/tasks/main.yml index 7dee936c2..f04ed7723 100644 --- a/roles/moodle/tasks/main.yml +++ b/roles/moodle/tasks/main.yml @@ -114,7 +114,7 @@ - name: Create database postgresql_db: - name: {{ moodle_database_name }} + name: "{{ moodle_database_name }}" encoding: utf8 owner: Admin template: template1 From 49c97b1b00a80ac6ceee6cad7d1616eed548fa04 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 30 Apr 2018 18:50:09 -0400 Subject: [PATCH 08/14] Update moodle_installer --- roles/moodle/templates/moodle_installer | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/moodle/templates/moodle_installer b/roles/moodle/templates/moodle_installer index 34c9c0fbe..2f988125e 100755 --- a/roles/moodle/templates/moodle_installer +++ b/roles/moodle/templates/moodle_installer @@ -9,9 +9,9 @@ sudo -u {{ apache_user }} \ --dbuser=Admin --dbpass=changeme \ --fullname=Your_School \ --shortname=School \ - --adminuser=admin --adminpass=changeme \ + --adminuser=admin --adminpass=changeme \ # May 2018: lowercase "admin" is still required, otherwise Admin/changeme fails at http://box.lan/moodle --non-interactive \ --agree-license \ - --allow-unstable #TEMPORARY DURING MAY 2018 TESTING + --allow-unstable # TEMPORARY DURING MAY 2018 TESTING chown {{ apache_user }}:{{ apache_user }} {{ moodle_base }}/config.php From 780a846d51ca4116e9083a2f1f6ee6ac0cf8f52a Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 30 Apr 2018 18:51:01 -0400 Subject: [PATCH 09/14] Update main.yml --- roles/moodle/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/moodle/tasks/main.yml b/roles/moodle/tasks/main.yml index f04ed7723..07a05ed2d 100644 --- a/roles/moodle/tasks/main.yml +++ b/roles/moodle/tasks/main.yml @@ -44,7 +44,7 @@ depth: 1 force: yes #version: "MOODLE_{{ moodle_version }}_STABLE" - version: master #TEMPORARY DURING MAY 2018 TESTING + version: master # TEMPORARY DURING MAY 2018 TESTING # ignore_errors: yes when: internet_available and moodle.stat.exists is defined and not moodle.stat.exists From f264b60172fa08093eceb8b72106c2f9300b9d27 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 30 Apr 2018 19:19:23 -0400 Subject: [PATCH 10/14] Update main.yml --- roles/moodle/defaults/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/moodle/defaults/main.yml b/roles/moodle/defaults/main.yml index 17def8bfc..a1462d53a 100644 --- a/roles/moodle/defaults/main.yml +++ b/roles/moodle/defaults/main.yml @@ -1,5 +1,6 @@ moodle_version: 35 -moodle_repo_url: "https://github.com/moodle/moodle.git" +#moodle_repo_url: "https://github.com/moodle/moodle.git" +moodle_repo_url: "git://git.moodle.org/moodle.git" moodle_base: "{{ iiab_base }}/moodle" moodle_user: moodle #moodle_install: True From 638eedd3769c1abd0d20ddc73673a2f31e04a327 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 30 Apr 2018 19:33:24 -0400 Subject: [PATCH 11/14] Update moodle_installer --- roles/moodle/templates/moodle_installer | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/roles/moodle/templates/moodle_installer b/roles/moodle/templates/moodle_installer index 2f988125e..38f729816 100755 --- a/roles/moodle/templates/moodle_installer +++ b/roles/moodle/templates/moodle_installer @@ -1,5 +1,10 @@ #!/bin/bash -x +# May 2018: lowercase "--adminuser=admin" is still required for some odd +# reason, otherwise one cannot login to http://box.lan/moodle +# (with Admin/changeme). At the same time --dbuser=Admin still begins with +# a capital letter, in keeping with Internet-in-a-Box's other server apps. + sudo -u {{ apache_user }} \ /usr/bin/php {{ moodle_base }}/admin/cli/install.php \ --wwwroot=http://{{ iiab_hostname }}.{{ iiab_domain }}/moodle \ @@ -9,7 +14,7 @@ sudo -u {{ apache_user }} \ --dbuser=Admin --dbpass=changeme \ --fullname=Your_School \ --shortname=School \ - --adminuser=admin --adminpass=changeme \ # May 2018: lowercase "admin" is still required, otherwise Admin/changeme fails at http://box.lan/moodle + --adminuser=admin --adminpass=changeme \ --non-interactive \ --agree-license \ --allow-unstable # TEMPORARY DURING MAY 2018 TESTING From 36462bffffdcb67cf6ff7ddeb122145af7a266e9 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 30 Apr 2018 19:35:22 -0400 Subject: [PATCH 12/14] Update moodle_installer --- roles/moodle/templates/moodle_installer | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/moodle/templates/moodle_installer b/roles/moodle/templates/moodle_installer index 38f729816..d28808161 100755 --- a/roles/moodle/templates/moodle_installer +++ b/roles/moodle/templates/moodle_installer @@ -1,9 +1,9 @@ #!/bin/bash -x # May 2018: lowercase "--adminuser=admin" is still required for some odd -# reason, otherwise one cannot login to http://box.lan/moodle -# (with Admin/changeme). At the same time --dbuser=Admin still begins with -# a capital letter, in keeping with Internet-in-a-Box's other server apps. +# reason, otherwise one cannot login to http://box.lan/moodle (with +# Admin/changeme). At the same time --dbuser=Admin still begins with +# a capital letter, in keeping with Internet-in-a-Box's other server apps? sudo -u {{ apache_user }} \ /usr/bin/php {{ moodle_base }}/admin/cli/install.php \ From fbdb19718e316bf22aeb4cf8cec15f63a3fec4ef Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 30 Apr 2018 19:37:33 -0400 Subject: [PATCH 13/14] Update main.yml --- roles/moodle/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/moodle/defaults/main.yml b/roles/moodle/defaults/main.yml index a1462d53a..045496194 100644 --- a/roles/moodle/defaults/main.yml +++ b/roles/moodle/defaults/main.yml @@ -2,7 +2,7 @@ moodle_version: 35 #moodle_repo_url: "https://github.com/moodle/moodle.git" moodle_repo_url: "git://git.moodle.org/moodle.git" moodle_base: "{{ iiab_base }}/moodle" -moodle_user: moodle +#moodle_user: moodle #moodle_install: True #moodle_enabled: False moodle_data: '{{ content_base }}/moodle' From ef903488c97097535b15b7f1d18ee887efb73a8d Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 1 May 2018 10:50:00 -0400 Subject: [PATCH 14/14] indentation cleanup --- roles/moodle/tasks/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/moodle/tasks/main.yml b/roles/moodle/tasks/main.yml index 07a05ed2d..8e512abab 100644 --- a/roles/moodle/tasks/main.yml +++ b/roles/moodle/tasks/main.yml @@ -15,10 +15,10 @@ - python-psycopg2 - php{{ php_version }}-pgsql - php{{ php_version }}-curl -# - php{{ php_version }}-zip + #- php{{ php_version }}-zip - php{{ php_version }}-gd -# - php{{ php_version }}-mbstring -# mbstring is now included in php-cli + #- php{{ php_version }}-mbstring + # mbstring is now included in php-cli - php{{ php_version }}-cli when: is_debuntu @@ -45,7 +45,7 @@ force: yes #version: "MOODLE_{{ moodle_version }}_STABLE" version: master # TEMPORARY DURING MAY 2018 TESTING -# ignore_errors: yes + #ignore_errors: yes when: internet_available and moodle.stat.exists is defined and not moodle.stat.exists - name: Prepare the downloaded directory so Apache can install config file @@ -150,7 +150,7 @@ when: config.stat.exists is defined and not config.stat.exists - name: Give Apache permission to read config file -# command: chown -R {{ apache_user }} {{ moodle_base }} + #command: chown -R {{ apache_user }} {{ moodle_base }} file: path: "{{ moodle_base }}/config.php" mode: 0644