From 68f42078f0fa2ecbee713470889db1b451e815a6 Mon Sep 17 00:00:00 2001 From: Ivan Grynenko Date: Sun, 12 Jun 2016 12:53:59 +1000 Subject: [PATCH] Updated from subtree. --- lemp-rhel7/roles/ansible-role-mysql/README.md | 0 lemp-rhel7/roles/ansible-role-mysql/defaults/main.yml | 0 lemp-rhel7/roles/ansible-role-mysql/handlers/main.yml | 0 lemp-rhel7/roles/ansible-role-mysql/meta/main.yml | 0 lemp-rhel7/roles/ansible-role-mysql/tasks/databases.yml | 0 lemp-rhel7/roles/ansible-role-mysql/tasks/main.yml | 0 lemp-rhel7/roles/ansible-role-mysql/tasks/replication.yml | 0 .../roles/ansible-role-mysql/tasks/secure-installation.yml | 0 lemp-rhel7/roles/ansible-role-mysql/tasks/setup-Debian.yml | 0 lemp-rhel7/roles/ansible-role-mysql/tasks/setup-RedHat.yml | 0 lemp-rhel7/roles/ansible-role-mysql/tasks/users.yml | 0 lemp-rhel7/roles/ansible-role-mysql/templates/my.cnf.j2 | 5 +++++ lemp-rhel7/roles/ansible-role-mysql/templates/user-my.cnf.j2 | 0 .../roles/ansible-role-mysql/tests/Dockerfile.centos-6 | 0 .../roles/ansible-role-mysql/tests/Dockerfile.centos-7 | 0 .../roles/ansible-role-mysql/tests/Dockerfile.ubuntu-12.04 | 0 .../roles/ansible-role-mysql/tests/Dockerfile.ubuntu-14.04 | 0 lemp-rhel7/roles/ansible-role-mysql/tests/centos-7-test.yml | 0 lemp-rhel7/roles/ansible-role-mysql/tests/initctl_faker | 0 lemp-rhel7/roles/ansible-role-mysql/tests/inventory | 0 lemp-rhel7/roles/ansible-role-mysql/tests/test.yml | 0 lemp-rhel7/roles/ansible-role-mysql/vars/Debian.yml | 0 lemp-rhel7/roles/ansible-role-mysql/vars/RedHat-6.yml | 0 lemp-rhel7/roles/ansible-role-mysql/vars/RedHat-7.yml | 2 +- 24 files changed, 6 insertions(+), 1 deletion(-) mode change 100644 => 100755 lemp-rhel7/roles/ansible-role-mysql/README.md mode change 100644 => 100755 lemp-rhel7/roles/ansible-role-mysql/defaults/main.yml mode change 100644 => 100755 lemp-rhel7/roles/ansible-role-mysql/handlers/main.yml mode change 100644 => 100755 lemp-rhel7/roles/ansible-role-mysql/meta/main.yml mode change 100644 => 100755 lemp-rhel7/roles/ansible-role-mysql/tasks/databases.yml mode change 100644 => 100755 lemp-rhel7/roles/ansible-role-mysql/tasks/main.yml mode change 100644 => 100755 lemp-rhel7/roles/ansible-role-mysql/tasks/replication.yml mode change 100644 => 100755 lemp-rhel7/roles/ansible-role-mysql/tasks/secure-installation.yml mode change 100644 => 100755 lemp-rhel7/roles/ansible-role-mysql/tasks/setup-Debian.yml mode change 100644 => 100755 lemp-rhel7/roles/ansible-role-mysql/tasks/setup-RedHat.yml mode change 100644 => 100755 lemp-rhel7/roles/ansible-role-mysql/tasks/users.yml mode change 100644 => 100755 lemp-rhel7/roles/ansible-role-mysql/templates/my.cnf.j2 mode change 100644 => 100755 lemp-rhel7/roles/ansible-role-mysql/templates/user-my.cnf.j2 mode change 100644 => 100755 lemp-rhel7/roles/ansible-role-mysql/tests/Dockerfile.centos-6 mode change 100644 => 100755 lemp-rhel7/roles/ansible-role-mysql/tests/Dockerfile.centos-7 mode change 100644 => 100755 lemp-rhel7/roles/ansible-role-mysql/tests/Dockerfile.ubuntu-12.04 mode change 100644 => 100755 lemp-rhel7/roles/ansible-role-mysql/tests/Dockerfile.ubuntu-14.04 mode change 100644 => 100755 lemp-rhel7/roles/ansible-role-mysql/tests/centos-7-test.yml mode change 100644 => 100755 lemp-rhel7/roles/ansible-role-mysql/tests/initctl_faker mode change 100644 => 100755 lemp-rhel7/roles/ansible-role-mysql/tests/inventory mode change 100644 => 100755 lemp-rhel7/roles/ansible-role-mysql/tests/test.yml mode change 100644 => 100755 lemp-rhel7/roles/ansible-role-mysql/vars/Debian.yml mode change 100644 => 100755 lemp-rhel7/roles/ansible-role-mysql/vars/RedHat-6.yml mode change 100644 => 100755 lemp-rhel7/roles/ansible-role-mysql/vars/RedHat-7.yml diff --git a/lemp-rhel7/roles/ansible-role-mysql/README.md b/lemp-rhel7/roles/ansible-role-mysql/README.md old mode 100644 new mode 100755 diff --git a/lemp-rhel7/roles/ansible-role-mysql/defaults/main.yml b/lemp-rhel7/roles/ansible-role-mysql/defaults/main.yml old mode 100644 new mode 100755 diff --git a/lemp-rhel7/roles/ansible-role-mysql/handlers/main.yml b/lemp-rhel7/roles/ansible-role-mysql/handlers/main.yml old mode 100644 new mode 100755 diff --git a/lemp-rhel7/roles/ansible-role-mysql/meta/main.yml b/lemp-rhel7/roles/ansible-role-mysql/meta/main.yml old mode 100644 new mode 100755 diff --git a/lemp-rhel7/roles/ansible-role-mysql/tasks/databases.yml b/lemp-rhel7/roles/ansible-role-mysql/tasks/databases.yml old mode 100644 new mode 100755 diff --git a/lemp-rhel7/roles/ansible-role-mysql/tasks/main.yml b/lemp-rhel7/roles/ansible-role-mysql/tasks/main.yml old mode 100644 new mode 100755 diff --git a/lemp-rhel7/roles/ansible-role-mysql/tasks/replication.yml b/lemp-rhel7/roles/ansible-role-mysql/tasks/replication.yml old mode 100644 new mode 100755 diff --git a/lemp-rhel7/roles/ansible-role-mysql/tasks/secure-installation.yml b/lemp-rhel7/roles/ansible-role-mysql/tasks/secure-installation.yml old mode 100644 new mode 100755 diff --git a/lemp-rhel7/roles/ansible-role-mysql/tasks/setup-Debian.yml b/lemp-rhel7/roles/ansible-role-mysql/tasks/setup-Debian.yml old mode 100644 new mode 100755 diff --git a/lemp-rhel7/roles/ansible-role-mysql/tasks/setup-RedHat.yml b/lemp-rhel7/roles/ansible-role-mysql/tasks/setup-RedHat.yml old mode 100644 new mode 100755 diff --git a/lemp-rhel7/roles/ansible-role-mysql/tasks/users.yml b/lemp-rhel7/roles/ansible-role-mysql/tasks/users.yml old mode 100644 new mode 100755 diff --git a/lemp-rhel7/roles/ansible-role-mysql/templates/my.cnf.j2 b/lemp-rhel7/roles/ansible-role-mysql/templates/my.cnf.j2 old mode 100644 new mode 100755 index 3923720..c4abb34 --- a/lemp-rhel7/roles/ansible-role-mysql/templates/my.cnf.j2 +++ b/lemp-rhel7/roles/ansible-role-mysql/templates/my.cnf.j2 @@ -82,12 +82,17 @@ max_connections = {{ mysql_max_connections }} wait_timeout = {{ mysql_wait_timeout }} # InnoDB settings. +default-storage-engine = innodb innodb_file_per_table = {{ mysql_innodb_file_per_table }} innodb_buffer_pool_size = {{ mysql_innodb_buffer_pool_size }} innodb_log_file_size = {{ mysql_innodb_log_file_size }} innodb_log_buffer_size = {{ mysql_innodb_log_buffer_size }} innodb_flush_log_at_trx_commit = {{ mysql_innodb_flush_log_at_trx_commit }} innodb_lock_wait_timeout = {{ mysql_innodb_lock_wait_timeout }} +innodb_flush_method = O_DIRECT +innodb_open_files = 600 +innodb_additional_mem_pool_size = 8M +innodb_thread_concurrency = 0 [mysqldump] quick diff --git a/lemp-rhel7/roles/ansible-role-mysql/templates/user-my.cnf.j2 b/lemp-rhel7/roles/ansible-role-mysql/templates/user-my.cnf.j2 old mode 100644 new mode 100755 diff --git a/lemp-rhel7/roles/ansible-role-mysql/tests/Dockerfile.centos-6 b/lemp-rhel7/roles/ansible-role-mysql/tests/Dockerfile.centos-6 old mode 100644 new mode 100755 diff --git a/lemp-rhel7/roles/ansible-role-mysql/tests/Dockerfile.centos-7 b/lemp-rhel7/roles/ansible-role-mysql/tests/Dockerfile.centos-7 old mode 100644 new mode 100755 diff --git a/lemp-rhel7/roles/ansible-role-mysql/tests/Dockerfile.ubuntu-12.04 b/lemp-rhel7/roles/ansible-role-mysql/tests/Dockerfile.ubuntu-12.04 old mode 100644 new mode 100755 diff --git a/lemp-rhel7/roles/ansible-role-mysql/tests/Dockerfile.ubuntu-14.04 b/lemp-rhel7/roles/ansible-role-mysql/tests/Dockerfile.ubuntu-14.04 old mode 100644 new mode 100755 diff --git a/lemp-rhel7/roles/ansible-role-mysql/tests/centos-7-test.yml b/lemp-rhel7/roles/ansible-role-mysql/tests/centos-7-test.yml old mode 100644 new mode 100755 diff --git a/lemp-rhel7/roles/ansible-role-mysql/tests/initctl_faker b/lemp-rhel7/roles/ansible-role-mysql/tests/initctl_faker old mode 100644 new mode 100755 diff --git a/lemp-rhel7/roles/ansible-role-mysql/tests/inventory b/lemp-rhel7/roles/ansible-role-mysql/tests/inventory old mode 100644 new mode 100755 diff --git a/lemp-rhel7/roles/ansible-role-mysql/tests/test.yml b/lemp-rhel7/roles/ansible-role-mysql/tests/test.yml old mode 100644 new mode 100755 diff --git a/lemp-rhel7/roles/ansible-role-mysql/vars/Debian.yml b/lemp-rhel7/roles/ansible-role-mysql/vars/Debian.yml old mode 100644 new mode 100755 diff --git a/lemp-rhel7/roles/ansible-role-mysql/vars/RedHat-6.yml b/lemp-rhel7/roles/ansible-role-mysql/vars/RedHat-6.yml old mode 100644 new mode 100755 diff --git a/lemp-rhel7/roles/ansible-role-mysql/vars/RedHat-7.yml b/lemp-rhel7/roles/ansible-role-mysql/vars/RedHat-7.yml old mode 100644 new mode 100755 index 0cf3922..d692e00 --- a/lemp-rhel7/roles/ansible-role-mysql/vars/RedHat-7.yml +++ b/lemp-rhel7/roles/ansible-role-mysql/vars/RedHat-7.yml @@ -9,7 +9,7 @@ __mysql_packages: __mysql_slow_query_log_file: /var/log/mysql-slow.log mysql_log_error: /var/log/mariadb/mariadb.log mysql_syslog_tag: mariadb -mysql_pid_file: /var/run/mariadb/mariadb.pid +mysql_pid_file: /var/lib/mysql/mariadb.pid mysql_config_file: /etc/my.cnf mysql_config_include_dir: /etc/my.cnf.d mysql_socket: /var/lib/mysql/mysql.sock