From de7582913c8a04c424a6874b882a83a966cc83fb Mon Sep 17 00:00:00 2001
From: Evangelos Foutras <evangelos@foutrelis.com>
Date: Wed, 18 Aug 2021 02:57:42 +0300
Subject: [PATCH] mariadb: Move two common variables out of playbooks
Default query_cache_type to 0 and innodb_file_per_table to true.
---
playbooks/aur-dev.archlinux.org.yml | 2 +-
playbooks/aur.archlinux.org.yml | 2 +-
playbooks/bbs.archlinux.org.yml | 2 +-
playbooks/bugs.archlinux.org.yml | 2 +-
playbooks/wiki.archlinux.org.yml | 2 +-
roles/mariadb/defaults/main.yml | 4 ++--
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/playbooks/aur-dev.archlinux.org.yml b/playbooks/aur-dev.archlinux.org.yml
index b8ce7befc..968ca0aec 100644
--- a/playbooks/aur-dev.archlinux.org.yml
+++ b/playbooks/aur-dev.archlinux.org.yml
@@ -10,7 +10,7 @@
- { role: root_ssh }
- { role: certbot }
- { role: nginx }
- - { role: mariadb, mariadb_query_cache_type: '0', mariadb_innodb_file_per_table: true }
+ - { role: mariadb }
- { role: sudo }
- { role: php_fpm, php_extensions: ['iconv', 'memcached', 'mysqli', 'pdo_mysql'], zend_extensions: ['opcache'] }
- { role: memcached }
diff --git a/playbooks/aur.archlinux.org.yml b/playbooks/aur.archlinux.org.yml
index bcac51249..804297b14 100644
--- a/playbooks/aur.archlinux.org.yml
+++ b/playbooks/aur.archlinux.org.yml
@@ -12,7 +12,7 @@
- { role: promtail }
- { role: certbot }
- { role: nginx }
- - { role: mariadb, mariadb_query_cache_type: '0', mariadb_innodb_file_per_table: true, mariadb_innodb_buffer_pool_size: '1G' }
+ - { role: mariadb, mariadb_innodb_buffer_pool_size: '1G' }
- { role: sudo }
- { role: php_fpm, php_extensions: ['iconv', 'memcached', 'mysqli', 'pdo_mysql'], zend_extensions: ['opcache'] }
- { role: memcached }
diff --git a/playbooks/bbs.archlinux.org.yml b/playbooks/bbs.archlinux.org.yml
index a33071752..c345169e0 100644
--- a/playbooks/bbs.archlinux.org.yml
+++ b/playbooks/bbs.archlinux.org.yml
@@ -10,7 +10,7 @@
- { role: root_ssh }
- { role: certbot }
- { role: nginx }
- - { role: mariadb, mariadb_query_cache_type: '0', mariadb_innodb_file_per_table: true }
+ - { role: mariadb }
- { role: sudo }
- { role: php_fpm, php_extensions: ['apcu', 'iconv', 'intl', 'mysqli'], zend_extensions: ['opcache'] }
- { role: fluxbb }
diff --git a/playbooks/bugs.archlinux.org.yml b/playbooks/bugs.archlinux.org.yml
index fc82b29b7..faa377abd 100644
--- a/playbooks/bugs.archlinux.org.yml
+++ b/playbooks/bugs.archlinux.org.yml
@@ -10,7 +10,7 @@
- { role: root_ssh }
- { role: certbot }
- { role: nginx }
- - { role: mariadb, mariadb_query_cache_type: '0', mariadb_innodb_file_per_table: true }
+ - { role: mariadb }
- { role: sudo }
- { role: php7_fpm, php_extensions: ['mysqli'], zend_extensions: ['opcache'] }
- { role: flyspray }
diff --git a/playbooks/wiki.archlinux.org.yml b/playbooks/wiki.archlinux.org.yml
index 00ac565e9..543d3f2d0 100644
--- a/playbooks/wiki.archlinux.org.yml
+++ b/playbooks/wiki.archlinux.org.yml
@@ -14,7 +14,7 @@
- { role: certbot }
- { role: nginx }
- { role: postfix_null }
- - { role: mariadb, mariadb_query_cache_type: '0', mariadb_innodb_file_per_table: true }
+ - { role: mariadb }
- { role: sudo }
- { role: php7_fpm, php_extensions: ['bcmath', 'curl', 'gd', 'iconv', 'intl', 'mysqli', 'sockets', 'zip'], zend_extensions: ['opcache'] }
- { role: memcached }
diff --git a/roles/mariadb/defaults/main.yml b/roles/mariadb/defaults/main.yml
index f77b810ca..2568778d9 100644
--- a/roles/mariadb/defaults/main.yml
+++ b/roles/mariadb/defaults/main.yml
@@ -9,7 +9,7 @@ mariadb_net_buffer_length: '8K'
mariadb_read_buffer_size: '256K'
mariadb_read_rnd_buffer_size: '512K'
mariadb_myisam_sort_buffer_size: '8M'
-mariadb_query_cache_type: '1'
+mariadb_query_cache_type: '0'
mariadb_query_cache_limit: '16M'
mariadb_query_cache_size: '32M'
mariadb_max_connections: '400'
@@ -22,7 +22,7 @@ mariadb_innodb_log_buffer_size: '16M'
mariadb_innodb_flush_log_at_trx_commit: '1'
mariadb_innodb_stats_sample_pages: '32'
mariadb_innodb_thread_concurrency: '8'
-mariadb_innodb_file_per_table: false
+mariadb_innodb_file_per_table: true
mysql_backup_dir: '/root/backup-mysql'
mysql_backup_defaults: '/root/.backup-my.cnf'
--
GitLab