Skip to content

Commit 0fe8cd3

Browse files
committed
Refactor docker-entrypoint.sh
1 parent d23ec5c commit 0fe8cd3

1 file changed

Lines changed: 10 additions & 7 deletions

File tree

mt/docker-entrypoint.sh

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,41 +4,44 @@ chmod 777 /var/www/html
44
chmod 777 /var/www/cgi-bin/mt/mt-static/support
55
chmod 777 /var/www/cgi-bin/mt/themes
66

7+
conf_dirs="/etc/httpd/conf.d /etc/apache2/conf-enabled /etc/httpd/conf/extra"
8+
module_dirs="/usr/lib/apache2/modules /usr/lib64/httpd/modules /usr/lib/httpd/modules"
9+
710
if [ "$1" = "apache2-foreground" ]; then
811
rm -f /var/log/apache2/access.log # disable access logging
912

10-
httpd_conf_d=`ls -d /etc/httpd/conf.d /etc/apache2/conf-enabled /etc/httpd/conf/extra 2>/dev/null | head -1`
13+
httpd_conf_d=`ls -d $conf_dirs 2>/dev/null | head -1`
1114
cat > $httpd_conf_d/mt.conf <<CONF
1215
Timeout 3600
1316
1417
# mt-static
1518
Alias /mt-static/ /var/www/cgi-bin/mt/mt-static/
1619
CONF
1720

18-
mod_rewrite_so=`find /usr/lib/apache2/modules /usr/lib64/httpd/modules /usr/lib/httpd/modules -name 'mod_rewrite.so' 2>/dev/null | head -1`
21+
mod_rewrite_so=`find $module_dirs -name 'mod_rewrite.so' 2>/dev/null | head -1`
1922
if [ -n "$mod_rewrite_so" ]; then
2023
cat > $httpd_conf_d/mt-rewrite.conf <<CONF
2124
LoadModule rewrite_module $mod_rewrite_so
2225
CONF
2326
fi
2427

25-
mod_proxy_so=`find /usr/lib/apache2/modules /usr/lib64/httpd/modules /usr/lib/httpd/modules -name 'mod_proxy.so' 2>/dev/null | head -1`
28+
mod_proxy_so=`find $module_dirs -name 'mod_proxy.so' 2>/dev/null | head -1`
2629
if [ -n "$mod_proxy_so" ]; then
2730
cat > $httpd_conf_d/mt-proxy.conf <<CONF
2831
LoadModule proxy_module $mod_proxy_so
2932
ProxyPassReverse / http://mt/
3033
CONF
3134
fi
3235

33-
mod_proxy_http_so=`find /usr/lib/apache2/modules /usr/lib64/httpd/modules /usr/lib/httpd/modules -name 'mod_proxy_http.so' 2>/dev/null | head -1`
36+
mod_proxy_http_so=`find $module_dirs -name 'mod_proxy_http.so' 2>/dev/null | head -1`
3437
if [ -n "$mod_proxy_http_so" ]; then
3538
cat > $httpd_conf_d/mt-proxy_http.conf <<CONF
3639
LoadModule proxy_http_module $mod_proxy_http_so
3740
ProxyPassReverse / http://mt/
3841
CONF
3942
fi
4043

41-
mod_include_so=`find /usr/lib/apache2/modules /usr/lib64/httpd/modules /usr/lib/httpd/modules -name 'mod_include.so' 2>/dev/null | head -1`
44+
mod_include_so=`find $module_dirs -name 'mod_include.so' 2>/dev/null | head -1`
4245
if [ -n "$mod_include_so" ]; then
4346
cat > $httpd_conf_d/mt-include.conf <<CONF
4447
LoadModule include_module /usr/lib/apache2/modules/mod_include.so
@@ -70,12 +73,12 @@ CONF
7073
exec /usr/sbin/httpd -D FOREGROUND
7174
fi
7275
else
73-
httpd_conf_d=`ls -d /etc/httpd/conf.d /etc/apache2/conf-enabled /etc/httpd/conf/extra 2>/dev/null | head -1`
76+
httpd_conf_d=`ls -d $conf_dirs 2>/dev/null | head -1`
7477
cat > $httpd_conf_d/mt.conf <<CONF
7578
Timeout 3600
7679
CONF
7780

78-
mod_env_so=`find /usr/lib/apache2/modules /usr/lib64/httpd/modules /usr/lib/httpd/modules -name 'mod_env.so' 2>/dev/null | head -1`
81+
mod_env_so=`find $module_dirs -name 'mod_env.so' 2>/dev/null | head -1`
7982
if [ -n "$mod_env_so" ]; then
8083
cat > $httpd_conf_d/mt-env.conf <<CONF
8184
LoadModule env_module $mod_env_so

0 commit comments

Comments
 (0)