Skip to content

Commit 619d70b

Browse files
committed
Set NLS_LANG=Japanese_Japan.UTF8 for oracle.
1 parent c9926ce commit 619d70b

2 files changed

Lines changed: 15 additions & 0 deletions

File tree

mt/common.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ services:
55
restart: always
66
working_dir: /var/www/cgi-bin/mt
77
entrypoint: /usr/local/bin/docker-entrypoint.sh
8+
environment:
9+
NLS_LANG: ${NLS_LANG:-Japanese_Japan.UTF8}
810
volumes:
911
- "..:/mt-dev"
1012
- "${MT_HOME_PATH:-../../movabletype}:/var/www/cgi-bin/mt"

mt/docker-entrypoint.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,19 @@ CONF
5757
exec /usr/sbin/httpd -D FOREGROUND
5858
fi
5959
else
60+
httpd_conf_d=`ls -d /etc/httpd/conf.d /etc/apache2/conf-enabled /etc/httpd/conf/extra 2>/dev/null | head -1`
61+
cat > $httpd_conf_d/mt.conf <<CONF
62+
Timeout 3600
63+
CONF
64+
65+
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`
66+
if [ -n "$mod_env_so" ]; then
67+
cat > $httpd_conf_d/mt-env.conf <<CONF
68+
LoadModule env_module $mod_env_so
69+
PassEnv NLS_LANG
70+
CONF
71+
fi
72+
6073
if [ -e "/var/www/cgi-bin/mt/Makefile" ]; then
6174
make -C /var/www/cgi-bin/mt clean me
6275
fi

0 commit comments

Comments
 (0)