Skip to content

Commit be807d5

Browse files
authored
Merge pull request #40 from linuxserver/base64
2 parents a229bb5 + fcf6b03 commit be807d5

1 file changed

Lines changed: 11 additions & 3 deletions

File tree

  • root/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config

root/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config/run

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,26 @@ mkdir -p \
55
/config/phpmyadmin \
66
/app/www/public/tmp
77

8-
if [ ! -f /config/phpmyadmin/config.secret.inc.php ]; then
8+
if [[ ! -f /config/phpmyadmin/config.secret.inc.php ]]; then
99
cat >/config/phpmyadmin/config.secret.inc.php <<EOT
1010
<?php
1111
\$cfg['blowfish_secret'] = '$(tr -dc 'a-zA-Z0-9~!@#$%^&*_()+}{?></";.,[]=-' </dev/urandom | fold -w 32 | head -n 1)';
1212
EOT
1313
fi
1414

15-
if [ ! -f /config/phpmyadmin/config.user.inc.php ]; then
15+
if [[ -n "${PMA_CONFIG_BASE64}" ]]; then
16+
echo "${PMA_CONFIG_BASE64}" | base64 -d > /config/phpmyadmin/config.inc.php
17+
fi
18+
19+
if [[ -n "${PMA_USER_CONFIG_BASE64}" ]]; then
20+
echo "${PMA_USER_CONFIG_BASE64}" | base64 -d > /config/phpmyadmin/config.user.inc.php
21+
fi
22+
23+
if [[ ! -f /config/phpmyadmin/config.user.inc.php ]]; then
1624
touch /config/phpmyadmin/config.user.inc.php
1725
fi
1826

19-
if [ ! -f /config/phpmyadmin/config.inc.php ]; then
27+
if [[ ! -f /config/phpmyadmin/config.inc.php ]]; then
2028
cp /defaults/config.inc.php /config/phpmyadmin/config.inc.php
2129
fi
2230

0 commit comments

Comments
 (0)