Skip to content

Commit 262eda8

Browse files
mblaschkemblaschke
committed
Improved mysql variables in web/php
Fixes #58
1 parent 6221383 commit 262eda8

File tree

4 files changed

+60
-37
lines changed

4 files changed

+60
-37
lines changed

‎docker/httpd/conf/vhost.conf‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,11 @@ SetEnv TYPO3_CONTEXT "<TYPO3_CONTEXT>"
2929
SetEnv FLOW_CONTEXT "<FLOW_CONTEXT>"
3030
SetEnv FLOW_REWRITEURLS "<FLOW_REWRITEURLS>"
3131

32-
SetEnv MYSQL_PASSWORD "<MYSQL_PASSWORD>"
33-
SetEnv MYSQL_USER "<MYSQL_USER>"
34-
SetEnv MYSQL_DATABASE "<MYSQL_DATABASE>"
32+
SetEnv MYSQL_USER "<MYSQL_USER>"
33+
SetEnv MYSQL_PASSWORD "<MYSQL_PASSWORD>"
34+
SetEnv MYSQL_ROOT_USER "root"
35+
SetEnv MYSQL_ROOT_PASSWORD "<MYSQL_ROOT_PASSWORD>"
36+
SetEnv MYSQL_DATABASE "<MYSQL_DATABASE>"
3537

3638
DirectoryIndex <DOCUMENT_INDEX> index.html index.htm
3739

‎docker/httpd/entrypoint.sh‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,22 @@ for DOMAIN in $DNS_DOMAIN; do
3737
ALIAS_DOMAIN="${ALIAS_DOMAIN} *.${DOMAIN}"
3838
done
3939

40-
cp /usr/local/apache2/conf/.docker-vhost.conf.original /usr/local/apache2/conf/docker-vhost.conf
41-
/bin/sed -i "s@<DOCUMENT_ROOT>@${DOCUMENT_ROOT}@" /usr/local/apache2/conf/docker-vhost.conf
42-
/bin/sed -i "s@<DOCUMENT_INDEX>@${DOCUMENT_INDEX}@" /usr/local/apache2/conf/docker-vhost.conf
43-
/bin/sed -i "s@<TYPO3_CONTEXT>@${TYPO3_CONTEXT}@" /usr/local/apache2/conf/docker-vhost.conf
44-
/bin/sed -i "s@<FLOW_CONTEXT>@${FLOW_CONTEXT}@" /usr/local/apache2/conf/docker-vhost.conf
45-
/bin/sed -i "s@<FLOW_REWRITEURLS>@${FLOW_REWRITEURLS}@" /usr/local/apache2/conf/docker-vhost.conf
46-
/bin/sed -i "s@<FPM_HOST>@${MAIN_PORT_9000_TCP_ADDR}@" /usr/local/apache2/conf/docker-vhost.conf
47-
/bin/sed -i "s@<FPM_PORT>@${MAIN_PORT_9000_TCP_PORT}@" /usr/local/apache2/conf/docker-vhost.conf
48-
/bin/sed -i "s@<ALIAS_DOMAIN>@${ALIAS_DOMAIN}@" /usr/local/apache2/conf/docker-vhost.conf
49-
/bin/sed -i "s@<MYSQL_PASSWORD>@${MYSQL_PASSWORD}@" /usr/local/apache2/conf/docker-vhost.conf
50-
/bin/sed -i "s@<MYSQL_USER>@${MYSQL_USER}@" /usr/local/apache2/conf/docker-vhost.conf
51-
/bin/sed -i "s@<MYSQL_DATABASE>@${MYSQL_DATABASE}@" /usr/local/apache2/conf/docker-vhost.conf
40+
cp /usr/local/apache2/conf/.docker-vhost.conf.original /usr/local/apache2/conf/docker-vhost.conf
41+
/bin/sed -i "s@<DOCUMENT_ROOT>@${DOCUMENT_ROOT}@" /usr/local/apache2/conf/docker-vhost.conf
42+
/bin/sed -i "s@<DOCUMENT_INDEX>@${DOCUMENT_INDEX}@" /usr/local/apache2/conf/docker-vhost.conf
43+
/bin/sed -i "s@<ALIAS_DOMAIN>@${ALIAS_DOMAIN}@" /usr/local/apache2/conf/docker-vhost.conf
44+
45+
/bin/sed -i "s@<TYPO3_CONTEXT>@${TYPO3_CONTEXT}@" /usr/local/apache2/conf/docker-vhost.conf
46+
/bin/sed -i "s@<FLOW_CONTEXT>@${FLOW_CONTEXT}@" /usr/local/apache2/conf/docker-vhost.conf
47+
/bin/sed -i "s@<FLOW_REWRITEURLS>@${FLOW_REWRITEURLS}@" /usr/local/apache2/conf/docker-vhost.conf
48+
49+
/bin/sed -i "s@<FPM_HOST>@${MAIN_PORT_9000_TCP_ADDR}@" /usr/local/apache2/conf/docker-vhost.conf
50+
/bin/sed -i "s@<FPM_PORT>@${MAIN_PORT_9000_TCP_PORT}@" /usr/local/apache2/conf/docker-vhost.conf
51+
52+
/bin/sed -i "s@<MYSQL_USER>@${MYSQL_USER}@" /usr/local/apache2/conf/docker-vhost.conf
53+
/bin/sed -i "s@<MYSQL_PASSWORD>@${MYSQL_PASSWORD}@" /usr/local/apache2/conf/docker-vhost.conf
54+
/bin/sed -i "s@<MYSQL_ROOT_PASSWORD>@${MYSQL_ROOT_PASSWORD}@" /usr/local/apache2/conf/docker-vhost.conf
55+
/bin/sed -i "s@<MYSQL_DATABASE>@${MYSQL_DATABASE}@" /usr/local/apache2/conf/docker-vhost.conf
5256

5357
#############################
5458
## COMMAND

‎docker/nginx/conf/vhost.conf‎

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,18 @@ server {
2020
fastcgi_pass main:<FPM_PORT>;
2121
include fastcgi_params;
2222

23-
fastcgi_param SCRIPT_FILENAME $request_filename;
24-
fastcgi_param TYPO3_CONTEXT "<TYPO3_CONTEXT>";
25-
fastcgi_param FLOW_CONTEXT "<FLOW_CONTEXT>";
26-
fastcgi_param FLOW_REWRITEURLS "<FLOW_REWRITEURLS>";
27-
fastcgi_param MYSQL_PASSWORD "<MYSQL_PASSWORD>";
28-
fastcgi_param MYSQL_USER "<MYSQL_USER>";
29-
fastcgi_param MYSQL_DATABASE "<MYSQL_DATABASE>";
23+
fastcgi_param SCRIPT_FILENAME $request_filename;
24+
25+
fastcgi_param TYPO3_CONTEXT "<TYPO3_CONTEXT>";
26+
fastcgi_param FLOW_CONTEXT "<FLOW_CONTEXT>";
27+
fastcgi_param FLOW_REWRITEURLS "<FLOW_REWRITEURLS>";
28+
29+
fastcgi_param MYSQL_USER "<MYSQL_USER>";
30+
fastcgi_param MYSQL_PASSWORD "<MYSQL_PASSWORD>";
31+
fastcgi_param MYSQL_ROOT_USER "root";
32+
fastcgi_param MYSQL_ROOT_PASSWORD "<MYSQL_ROOT_PASSWORD>";
33+
fastcgi_param MYSQL_DATABASE "<MYSQL_DATABASE>";
34+
3035
fastcgi_read_timeout 1000;
3136
}
3237
}
@@ -61,10 +66,18 @@ server {
6166
fastcgi_pass main:<FPM_PORT>;
6267
include fastcgi_params;
6368

64-
fastcgi_param SCRIPT_FILENAME $request_filename;
65-
fastcgi_param TYPO3_CONTEXT "<TYPO3_CONTEXT>";
66-
fastcgi_param FLOW_CONTEXT "<FLOW_CONTEXT>";
67-
fastcgi_param FLOW_REWRITEURLS "<FLOW_REWRITEURLS>";
69+
fastcgi_param SCRIPT_FILENAME $request_filename;
70+
71+
fastcgi_param TYPO3_CONTEXT "<TYPO3_CONTEXT>";
72+
fastcgi_param FLOW_CONTEXT "<FLOW_CONTEXT>";
73+
fastcgi_param FLOW_REWRITEURLS "<FLOW_REWRITEURLS>";
74+
75+
fastcgi_param MYSQL_USER "<MYSQL_USER>";
76+
fastcgi_param MYSQL_PASSWORD "<MYSQL_PASSWORD>";
77+
fastcgi_param MYSQL_ROOT_USER "root";
78+
fastcgi_param MYSQL_ROOT_PASSWORD "<MYSQL_ROOT_PASSWORD>";
79+
fastcgi_param MYSQL_DATABASE "<MYSQL_DATABASE>";
80+
6881
fastcgi_read_timeout 1000;
6982
}
7083
}

‎docker/nginx/entrypoint.sh‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,21 @@ done
2222

2323
rm -f -- /etc/nginx/conf.d/*.conf
2424
cp /opt/docker/vhost.conf /etc/nginx/conf.d/vhost.conf
25-
/bin/sed -i "s@<DOCUMENT_ROOT>@${DOCUMENT_ROOT}@" /etc/nginx/conf.d/vhost.conf
26-
/bin/sed -i "s@<DOCUMENT_INDEX>@${DOCUMENT_INDEX}@" /etc/nginx/conf.d/vhost.conf
27-
/bin/sed -i "s@<TYPO3_CONTEXT>@${TYPO3_CONTEXT}@" /etc/nginx/conf.d/vhost.conf
28-
/bin/sed -i "s@<FLOW_CONTEXT>@${FLOW_CONTEXT}@" /etc/nginx/conf.d/vhost.conf
29-
/bin/sed -i "s@<FLOW_REWRITEURLS>@${FLOW_REWRITEURLS}@" /etc/nginx/conf.d/vhost.conf
30-
/bin/sed -i "s@<FPM_HOST>@${MAIN_PORT_9000_TCP_ADDR}@" /etc/nginx/conf.d/vhost.conf
31-
/bin/sed -i "s@<FPM_PORT>@${MAIN_PORT_9000_TCP_PORT}@" /etc/nginx/conf.d/vhost.conf
32-
/bin/sed -i "s@<ALIAS_DOMAIN>@${ALIAS_DOMAIN}@" /etc/nginx/conf.d/vhost.conf
33-
/bin/sed -i "s@<MYSQL_PASSWORD>@${MYSQL_PASSWORD}@" /etc/nginx/conf.d/vhost.conf
34-
/bin/sed -i "s@<MYSQL_USER>@${MYSQL_USER}@" /etc/nginx/conf.d/vhost.conf
35-
/bin/sed -i "s@<MYSQL_DATABASE>@${MYSQL_DATABASE}@" /etc/nginx/conf.d/vhost.conf
25+
/bin/sed -i "s@<DOCUMENT_ROOT>@${DOCUMENT_ROOT}@" /etc/nginx/conf.d/vhost.conf
26+
/bin/sed -i "s@<DOCUMENT_INDEX>@${DOCUMENT_INDEX}@" /etc/nginx/conf.d/vhost.conf
27+
/bin/sed -i "s@<ALIAS_DOMAIN>@${ALIAS_DOMAIN}@" /etc/nginx/conf.d/vhost.conf
28+
29+
/bin/sed -i "s@<TYPO3_CONTEXT>@${TYPO3_CONTEXT}@" /etc/nginx/conf.d/vhost.conf
30+
/bin/sed -i "s@<FLOW_CONTEXT>@${FLOW_CONTEXT}@" /etc/nginx/conf.d/vhost.conf
31+
/bin/sed -i "s@<FLOW_REWRITEURLS>@${FLOW_REWRITEURLS}@" /etc/nginx/conf.d/vhost.conf
32+
33+
/bin/sed -i "s@<FPM_HOST>@${MAIN_PORT_9000_TCP_ADDR}@" /etc/nginx/conf.d/vhost.conf
34+
/bin/sed -i "s@<FPM_PORT>@${MAIN_PORT_9000_TCP_PORT}@" /etc/nginx/conf.d/vhost.conf
35+
36+
/bin/sed -i "s@<MYSQL_USER>@${MYSQL_USER}@" /etc/nginx/conf.d/vhost.conf
37+
/bin/sed -i "s@<MYSQL_PASSWORD>@${MYSQL_PASSWORD}@" /etc/nginx/conf.d/vhost.conf
38+
/bin/sed -i "s@<MYSQL_ROOT_PASSWORD>@${MYSQL_ROOT_PASSWORD}@" /etc/nginx/conf.d/vhost.conf
39+
/bin/sed -i "s@<MYSQL_DATABASE>@${MYSQL_DATABASE}@" /etc/nginx/conf.d/vhost.conf
3640

3741
#############################
3842
## COMMAND

0 commit comments

Comments
 (0)