diff --git a/.env.sample b/.env.sample index 2e93eee..5fcef63 100644 --- a/.env.sample +++ b/.env.sample @@ -11,6 +11,8 @@ COMPOSE_FILE="compose.yml" COMPOSE_FILE="$COMPOSE_FILE:compose.mariadb.yml" #COMPOSE_FILE="$COMPOSE_FILE:compose.postgres.yml" +#MAX_DB_CONNECTIONS=500 + ADMIN_USER=admin SECRET_DB_ROOT_PASSWORD_VERSION=v1 diff --git a/abra.sh b/abra.sh index 3738133..b13e4e2 100644 --- a/abra.sh +++ b/abra.sh @@ -2,7 +2,7 @@ export FPM_TUNE_VERSION=v5 export NGINX_CONF_VERSION=v4 -export MY_CNF_VERSION=v4 +export MY_CNF_VERSION=v5 export ENTRYPOINT_VERSION=v3 run_occ() { diff --git a/compose.mariadb.yml b/compose.mariadb.yml index 361e390..789a21a 100644 --- a/compose.mariadb.yml +++ b/compose.mariadb.yml @@ -15,6 +15,7 @@ services: - MYSQL_USER=nextcloud - MYSQL_PASSWORD_FILE=/run/secrets/db_password - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password + - MAX_DB_CONNECTIONS=${MAX_DB_CONNECTIONS:-100} configs: - source: my_tune target: /etc/mysql/conf.d/my-tune.cnf @@ -41,6 +42,7 @@ configs: my_tune: name: ${STACK_NAME}_my_cnf_${MY_CNF_VERSION} file: my-tune.cnf + template_driver: golang volumes: mariadb: diff --git a/compose.postgres.yml b/compose.postgres.yml index 398e5d3..2e24f15 100644 --- a/compose.postgres.yml +++ b/compose.postgres.yml @@ -11,6 +11,7 @@ services: db: image: "postgres:12" + command: -c "max_connections=${MAX_DB_CONNECTIONS:-100}" volumes: - "postgres:/var/lib/postgresql/data" networks: diff --git a/my-tune.cnf b/my-tune.cnf index 843dfd1..9d38e6d 100644 --- a/my-tune.cnf +++ b/my-tune.cnf @@ -13,7 +13,7 @@ key_buffer_size = 16M innodb_log_file_size = 256M long_query_time = 1 max_allowed_packet = 256M -max_connections = 100 +max_connections = {{ env "MAX_DB_CONNECTIONS" }} max_heap_table_size = 64M max_user_connections = 0 myisam_recover_options = BACKUP