Skip to content
This repository was archived by the owner on Mar 15, 2019. It is now read-only.

Commit 8d3364e

Browse files
author
Julien Neuhart
committed
small refactoring of conf files
1 parent 57bfa79 commit 8d3364e

File tree

8 files changed

+14
-69
lines changed

8 files changed

+14
-69
lines changed

_bin/_reverse_proxy_down

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ source ${ROOT}/.env;
99
down()
1010
{
1111
if [ -f ${ROOT}/docker-compose-reverse-proxy.yml ]; then
12-
if docker-compose -p ${REVERSE_PROXY_PROXY_NAME} -f docker-compose-reverse-proxy.yml down; then
12+
if docker-compose -p ${REVERSE_PROXY_NAME} -f ${ROOT}/docker-compose-reverse-proxy.yml down; then
1313
/bin/bash ${DIR}/misc/_whalesay --say "Reverse proxy (${REVERSE_PROXY_CONTAINER_NAME}) container has been stopped!";
1414
else
1515
/bin/bash ${DIR}/misc/_whalesay --say "Failed to stop reverse proxy (${REVERSE_PROXY_CONTAINER_NAME}) container.";

_bin/_reverse_proxy_up

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ up()
1212

1313
if [ $? -eq 1 ]; then
1414
if [ -f ${ROOT}/docker-compose-reverse-proxy.yml ]; then
15-
if docker-compose -p ${REVERSE_PROXY_NAME} -f docker-compose-reverse-proxy.yml up -d; then
15+
if docker-compose -p ${REVERSE_PROXY_NAME} -f ${ROOT}/docker-compose-reverse-proxy.yml up -d; then
1616
/bin/bash ${DIR}/misc/_whalesay --say "Reverse proxy container (${REVERSE_PROXY_CONTAINER_NAME}) is running!";
1717
else
1818
/bin/bash ${DIR}/misc/_whalesay --say "Failed to run the reverse proxy container (${REVERSE_PROXY_CONTAINER_NAME}).";

apache/conf.d/custom.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
; Customize this ini file at your convinience
1+
; Customize this ini file at your conviniance

docker-compose-reverse-proxy.yml.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ services:
88
- 80:80
99
- 443:443
1010
volumes:
11-
#- ./nginx/nginx-custom.conf:/etc/nginx/conf.d/nginx_custom.conf:ro
11+
- ./reverse-proxy/conf.d/nginx-custom.conf:/etc/nginx/conf.d/nginx-custom.conf:ro
1212
- ${REVERSE_PROXY_CERTS_PATH}:/etc/nginx/certs:ro
1313
- /var/run/docker.sock:/tmp/docker.sock:ro
1414
restart: unless-stopped

docker-compose.yml.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ services:
2424
- ${MYSQL_HOST_PORT_TO_MAP}:3306
2525
volumes:
2626
- ./mysql/volume:/var/lib/mysql:rw
27-
#- ./mysql/custom-my.cnf:/etc/mysql/my.cnf:ro
27+
- ./mysql/conf.d/custom.cnf:/etc/mysql/conf.d/custom.cnf:ro
2828
restart: unless-stopped
2929
container_name: ${MYSQL_CONTAINER_NAME}
3030
environment:

mysql/conf.d/custom.cnf

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Customize this ini file at your conviniance
2+
3+
# Example with innodb
4+
#innodb_buffer_pool_size = 1G
5+
#innodb_log_buffer_size = 64M
6+
#innodb_log_file_size = 64M
7+
#innodb_write_io_threads = 16
8+
#innodb_flush_log_at_trx_commit = 0
9+
#innodb_thread_concurrency = 0

mysql/custom-my.cnf

Lines changed: 0 additions & 64 deletions
This file was deleted.

0 commit comments

Comments
 (0)