diff --git a/roles/1-prep/tasks/computed_vars.yml b/roles/1-prep/tasks/computed_vars.yml index 8a0257fd5..24b0e59b2 100644 --- a/roles/1-prep/tasks/computed_vars.yml +++ b/roles/1-prep/tasks/computed_vars.yml @@ -53,6 +53,10 @@ value: '{{ ansible_product_uuid }}' # Put all computed vars here so derive properly from any prior var file +- name: If the TZ is not set in env, set it to UTC + set_fact: local_tz='UTC' + when: local_tz == "" + - name: Set port 80 for Admin Console set_fact: gui_port: 80 diff --git a/roles/elgg/defaults/main.yml b/roles/elgg/defaults/main.yml index 8a617ccb4..933f6fc6e 100644 --- a/roles/elgg/defaults/main.yml +++ b/roles/elgg/defaults/main.yml @@ -8,7 +8,6 @@ elgg_install: True elgg_enabled: False # following variables used in elgg engine/settings.php template -timezone: America/New_York dbuser: Admin dbpassword: changeme dbname: elggdb diff --git a/roles/elgg/tasks/main.yml b/roles/elgg/tasks/main.yml index 3628742b9..ffce75615 100644 --- a/roles/elgg/tasks/main.yml +++ b/roles/elgg/tasks/main.yml @@ -53,10 +53,6 @@ - localhost when: mysql_enabled and elgg_enabled -- name: If the TZ is not set in env, set it to UTC - set_fact: local_tz='UTC' - when: local_tz == "" - # The name of this file changed from 1.9 to 1.10. - name: Copy default .htaccess to the root directory of elgg tree copy: src="/opt/{{ elgg_xx }}/install/config/htaccess.dist" diff --git a/roles/elgg/templates/settings.php.j2 b/roles/elgg/templates/settings.php.j2 index a9124440e..b063be31a 100644 --- a/roles/elgg/templates/settings.php.j2 +++ b/roles/elgg/templates/settings.php.j2 @@ -1,5 +1,5 @@