ensl/ensl.org
0
0
Fork 0
mirror of https://github.com/ENSL/ensl.org.git synced 2025-02-04 23:41:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix MariaDB issues

Browse source 
Use different root password
Use correct database for setup
Change precedence for setup SQL scripts
Remove deprececated options from my.cnf
This commit is contained in:
Ari Timonen 2020-04-12 13:39:10 +03:00
parent 5e9c725ab5
commit 88a6c697cc
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
db/initdb.d/99_ensl.setup.sql → db/initdb.d/10_ensl.setup.sql
View file

@ -1,9 +1,9 @@
-- FIXME: this should be somewhere else probably -- FIXME: this should be somewhere else probably
CREATE DATABASE ensl_development; CREATE DATABASE IF NOT EXISTS ensl_development;
GRANT ALL PRIVILEGES ON ensl_development.* TO 'ensl'@'%' WITH GRANT OPTION; GRANT ALL PRIVILEGES ON ensl_development.* TO 'ensl'@'%' WITH GRANT OPTION;
CREATE DATABASE ensl_test; CREATE DATABASE IF NOT EXISTS ensl_test;
GRANT ALL PRIVILEGES ON ensl_test.* TO 'ensl'@'%' WITH GRANT OPTION; GRANT ALL PRIVILEGES ON ensl_test.* TO 'ensl'@'%' WITH GRANT OPTION;
CREATE DATABASE ensl_staging; CREATE DATABASE IF NOT EXISTS ensl_staging;
GRANT ALL PRIVILEGES ON ensl_staging.* TO 'ensl'@'%' WITH GRANT OPTION; GRANT ALL PRIVILEGES ON ensl_staging.* TO 'ensl'@'%' WITH GRANT OPTION;

2
docker-compose.yml
View file

@ -136,7 +136,7 @@ services:
- MYSQL_DATABASE=$MYSQL_DATABASE - MYSQL_DATABASE=$MYSQL_DATABASE
- MYSQL_USER=$MYSQL_USER - MYSQL_USER=$MYSQL_USER
- MYSQL_PASSWORD=$MYSQL_PASSWORD - MYSQL_PASSWORD=$MYSQL_PASSWORD
- MYSQL_ROOT_PASSWORD=$MYSQL_PASSWORD - MYSQL_ROOT_PASSWORD=$MYSQL_ROOT_PASSWORD
- MYSQL_ROOT_HOST=$MYSQL_ROOT_HOST - MYSQL_ROOT_HOST=$MYSQL_ROOT_HOST
smtp: smtp:

5
ext/mysql.conf.d/opt.cnf
View file

@ -3,7 +3,7 @@
skip-host-cache skip-host-cache
skip-name-resolve skip-name-resolve
key_buffer = 150M key_buffer_size = 150M
max_allowed_packet = 20M max_allowed_packet = 20M
thread_stack = 196K thread_stack = 196K
thread_cache_size = 16 thread_cache_size = 16
@ -11,7 +11,7 @@ thread_cache_size = 16
max_connections = 96 max_connections = 96
table_cache = 2000 table_cache = 2000
table_definition_cache = 800 table_definition_cache = 800
thread_concurrency = 128 ; thread_concurrency = 128
query_cache_limit = 30M query_cache_limit = 30M
query_cache_size = 150M query_cache_size = 150M
@ -31,4 +31,3 @@ innodb_file_per_table = 1
transaction-isolation = READ-COMMITTED transaction-isolation = READ-COMMITTED
innodb_file_per_table=1 innodb_file_per_table=1
innodb_file_format = Barracuda