You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2021/10/06 17:40:21 UTC
[airavata] branch develop updated (99901ed -> 5a932a2)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git.
from 99901ed Ansible: turn off SELinux on amp dev server for now
add f33fef9 Merge branch 'openjdk-java-security'
new a087a0b AIRAVATA-3525 Fix the OPTIONS setting for MySQL/MariaDB
new 5a932a2 Merge branch 'airavata-3525' into develop
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
dev-tools/ansible/roles/django/templates/settings_local.py.j2 | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
[airavata] 02/02: Merge branch 'airavata-3525' into develop
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 5a932a29911f123a3e5e3529af4951809861d93e
Merge: 99901ed a087a0b
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Oct 6 13:39:18 2021 -0400
Merge branch 'airavata-3525' into develop
dev-tools/ansible/roles/django/templates/settings_local.py.j2 | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
[airavata] 01/02: AIRAVATA-3525 Fix the OPTIONS setting for
MySQL/MariaDB
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit a087a0bbefed65ad971b7a84f7dff2c14107111c
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Oct 6 13:37:24 2021 -0400
AIRAVATA-3525 Fix the OPTIONS setting for MySQL/MariaDB
---
dev-tools/ansible/roles/django/templates/settings_local.py.j2 | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-tools/ansible/roles/django/templates/settings_local.py.j2 b/dev-tools/ansible/roles/django/templates/settings_local.py.j2
index 5fc1d1f..5be05e0 100644
--- a/dev-tools/ansible/roles/django/templates/settings_local.py.j2
+++ b/dev-tools/ansible/roles/django/templates/settings_local.py.j2
@@ -45,10 +45,10 @@ DATABASES = {
'NAME': '{{ django_database_name }}',
'HOST': '{{ django_database_host_ip_address }}',
'USER': '{{ django_db_username }}',
- 'PASSWORD': '{{ django_db_password }}'
- },
- 'OPTIONS': {
- 'init_command': 'SET default_storage_engine=INNODB,collation_connection=utf8_bin',
+ 'PASSWORD': '{{ django_db_password }}',
+ 'OPTIONS': {
+ 'init_command': 'SET default_storage_engine=INNODB,collation_connection=utf8_bin',
+ }
}
}
{% endif %}