From ab3c9250d19ef7c81df28cf98a4dabc6a03aa9f9 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 6 Aug 2018 20:16:20 -0400 Subject: [PATCH 1/7] Update main.yml --- roles/elgg/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/elgg/defaults/main.yml b/roles/elgg/defaults/main.yml index a3c91ab2f..16764c15a 100644 --- a/roles/elgg/defaults/main.yml +++ b/roles/elgg/defaults/main.yml @@ -7,7 +7,7 @@ elgg_upload_path: /library/elgg elgg_install: True elgg_enabled: False -# following variables used in elgg engine/settings.php template +# Variables by template to create /opt/elgg/elgg-config/settings.php dbuser: Admin dbpassword: changeme dbname: elggdb From ccc6346267a733f7d4fdc3d9f838c4b34823c69c Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 6 Aug 2018 20:18:33 -0400 Subject: [PATCH 2/7] Update main.yml --- roles/elgg/tasks/main.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/roles/elgg/tasks/main.yml b/roles/elgg/tasks/main.yml index 54a257f4b..555850615 100644 --- a/roles/elgg/tasks/main.yml +++ b/roles/elgg/tasks/main.yml @@ -29,10 +29,9 @@ state: link force: true -# use template to fix up settings in engine/settings.php with our variables substituted -# into engine/settings.example.php -# note this will overwrite any manual settings -- name: Substitute our parameters in engine/settings.example.php +# Use template to fix up settings in elgg-config/settings.php with our variables substituted. +# Note this will overwrite any manual settings. +- name: Substitute our parameters in /opt/elgg/elgg-config/settings.php template: src: "settings.php.j2" dest: "/opt/{{ elgg_xx }}/elgg-config/settings.php" @@ -90,9 +89,9 @@ password: "{{ dbpassword }}" priv: "{{ dbname }}.*:ALL" with_items: - - 127.0.0.1 - - ::1 - - localhost + - 127.0.0.1 + - ::1 + - localhost - name: Create file to load database template: From 9828f5b6f621fc43be0d9ad9e41b1c101f36a4ee Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 6 Aug 2018 20:23:21 -0400 Subject: [PATCH 3/7] Update README.rst --- roles/elgg/README.rst | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/roles/elgg/README.rst b/roles/elgg/README.rst index 1dadfb4b5..6d908d3e2 100644 --- a/roles/elgg/README.rst +++ b/roles/elgg/README.rst @@ -6,24 +6,25 @@ Elgg is an award-winning social networking engine, delivering the building block that enable businesses, schools, universities and associations to create their own fully-featured social networks and applications. -http://elgg.org/ +https://elgg.org After Installation ------------------ -Go to http://box.lan/elgg and log on as Admin with password changeme. +Go to http://box/elgg or http://box.lan/elgg and log on as Admin with password changeme. Change the following: * Administrator password -* Title to appear on elgg screens and any other settings as desired. +* Title to appear on Elgg screens and any other settings as desired. Locations --------- - The uploaded files are expected to be in /library/elgg -- The URL is /elgg +- The software is in /opt/elgg -> /opt/elgg-x.y.z +- The URL is http://box/elgg Parameters ---------- @@ -34,16 +35,16 @@ some constraints. Users and Passwords ------------------- -There are a number of seemilingly similar user names and passwords in this installation: +There are a number of seemingly similar user names and passwords in this installation: -* dbuser - the mysql user that elgg uses to access the database. This is a local variable - the name of which corresponds to that in the elgg settings.php file. +* dbuser - the MySQL user that Elgg uses to access the database. This is a local variable + the name of which corresponds to that in /opt/elgg/elgg-config/settings.php -* dbpassword - password for dbuser. This is also a local variable - the name of which corresponds to that in the elgg settings.php file. +* dbpassword - password for dbuser. This is also a local variable, the name of + which corresponds to that in /opt/elgg/elgg-config/settings.php -* elgg_mysql_password - this is the global name for dbpassword in default_vars.yml. +* elgg_mysql_password - this is the global name for dbpassword in default_vars.yml -* elgg_admin_user - the elgg (not mysql) user that is the administrator. +* elgg_admin_user - the Elgg (not MySQL) user that is the administrator -* elgg_admin_password - the password for elgg_admin_user. +* elgg_admin_password - the password for elgg_admin_user From 9c3b0ffc52d37888f0e430f2c90680c2a87f224a Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 6 Aug 2018 20:26:34 -0400 Subject: [PATCH 4/7] Update README.rst --- roles/elgg/README.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/elgg/README.rst b/roles/elgg/README.rst index 6d908d3e2..94a96219f 100644 --- a/roles/elgg/README.rst +++ b/roles/elgg/README.rst @@ -37,11 +37,11 @@ Users and Passwords There are a number of seemingly similar user names and passwords in this installation: -* dbuser - the MySQL user that Elgg uses to access the database. This is a local variable - the name of which corresponds to that in /opt/elgg/elgg-config/settings.php +* dbuser - the MySQL user that Elgg uses to access the database + This is a local variable, the name of which corresponds to that in /opt/elgg/elgg-config/settings.php -* dbpassword - password for dbuser. This is also a local variable, the name of - which corresponds to that in /opt/elgg/elgg-config/settings.php +* dbpassword - password for dbuser + This is also a local variable, the name of which corresponds to that in /opt/elgg/elgg-config/settings.php * elgg_mysql_password - this is the global name for dbpassword in default_vars.yml From 8c2ece8c6a598b1bc40774caa803ed3ffc6fede4 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 6 Aug 2018 20:27:57 -0400 Subject: [PATCH 5/7] Update README.rst --- roles/elgg/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/elgg/README.rst b/roles/elgg/README.rst index 94a96219f..85258c2a8 100644 --- a/roles/elgg/README.rst +++ b/roles/elgg/README.rst @@ -23,7 +23,7 @@ Locations --------- - The uploaded files are expected to be in /library/elgg -- The software is in /opt/elgg -> /opt/elgg-x.y.z +- The software is in /opt/elgg -> /opt/elgg-x.y.z (i.e. actual version number) - The URL is http://box/elgg Parameters From 6eae14504c4491958f912ee4df767adf68d34e81 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 6 Aug 2018 20:29:23 -0400 Subject: [PATCH 6/7] Update README.rst --- roles/elgg/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/elgg/README.rst b/roles/elgg/README.rst index 85258c2a8..c0b756242 100644 --- a/roles/elgg/README.rst +++ b/roles/elgg/README.rst @@ -35,7 +35,7 @@ some constraints. Users and Passwords ------------------- -There are a number of seemingly similar user names and passwords in this installation: +There are a number of seemingly similar usernames and passwords in this installation: * dbuser - the MySQL user that Elgg uses to access the database This is a local variable, the name of which corresponds to that in /opt/elgg/elgg-config/settings.php From 20d266575eb1ef68ebd7a345367d493093a0e49f Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 6 Aug 2018 20:31:46 -0400 Subject: [PATCH 7/7] Update main.yml --- roles/elgg/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/elgg/defaults/main.yml b/roles/elgg/defaults/main.yml index 16764c15a..2607f3ad7 100644 --- a/roles/elgg/defaults/main.yml +++ b/roles/elgg/defaults/main.yml @@ -7,7 +7,7 @@ elgg_upload_path: /library/elgg elgg_install: True elgg_enabled: False -# Variables by template to create /opt/elgg/elgg-config/settings.php +# Variables used by template to create /opt/elgg/elgg-config/settings.php dbuser: Admin dbpassword: changeme dbname: elggdb