mirrors/roundcubemail-docker
1
0
Fork 0
mirror of https://github.com/roundcube/roundcubemail-docker.git synced 2026-05-05 02:46:14 +02:00
Code Issues Projects Releases Wiki Activity

Allow to define des_key as env variable

Browse Source 
This avoids writing it to a shared volume and supports
using secrets in a Kubenetes setup.
This commit is contained in:
Thomas Bruederli 2021-01-28 21:56:41 +01:00
parent a8b213cef1
commit b6107d4cce
4 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apache/docker-entrypoint.sh
View File

@ -72,7 +72,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
: "${ROUNDCUBEMAIL_TEMP_DIR:=/tmp/roundcube-temp}"
if [ ! -e config/config.inc.php ]; then
ROUNDCUBEMAIL_DES_KEY=`head /dev/urandom | base64 | head -c 24`
GENERATED_DES_KEY=`head /dev/urandom | base64 | head -c 24`
touch config/config.inc.php
echo "Write root config to $PWD/config/config.inc.php"
@ -80,7 +80,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
\$config['plugins'] = [];
\$config['log_driver'] = 'stdout';
\$config['zipdownload_selection'] = true;
\$config['des_key'] = '${ROUNDCUBEMAIL_DES_KEY}';
\$config['des_key'] = '${GENERATED_DES_KEY}';
include(__DIR__ . '/config.docker.inc.php');
" > config/config.inc.php
@ -103,8 +103,9 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
" > config/config.docker.inc.php
if [ -e /run/secrets/roundcube_des_key ]; then
ROUNDCUBEMAIL_DES_KEY=`cat /run/secrets/roundcube_des_key`
echo "\$config['des_key'] = '${ROUNDCUBEMAIL_DES_KEY}';" >> config/config.docker.inc.php
echo "\$config['des_key'] = file_get_contents('/run/secrets/roundcube_des_key');" >> config/config.docker.inc.php
elif [ ! -z "${ROUNDCUBEMAIL_DES_KEY}" ]; then
echo "\$config['des_key'] = getenv('ROUNDCUBEMAIL_DES_KEY');" >> config/config.docker.inc.php
fi
# include custom config files

9
fpm-alpine/docker-entrypoint.sh
View File

@ -72,7 +72,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
: "${ROUNDCUBEMAIL_TEMP_DIR:=/tmp/roundcube-temp}"
if [ ! -e config/config.inc.php ]; then
ROUNDCUBEMAIL_DES_KEY=`head /dev/urandom | base64 | head -c 24`
GENERATED_DES_KEY=`head /dev/urandom | base64 | head -c 24`
touch config/config.inc.php
echo "Write root config to $PWD/config/config.inc.php"
@ -80,7 +80,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
\$config['plugins'] = [];
\$config['log_driver'] = 'stdout';
\$config['zipdownload_selection'] = true;
\$config['des_key'] = '${ROUNDCUBEMAIL_DES_KEY}';
\$config['des_key'] = '${GENERATED_DES_KEY}';
include(__DIR__ . '/config.docker.inc.php');
" > config/config.inc.php
@ -103,8 +103,9 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
" > config/config.docker.inc.php
if [ -e /run/secrets/roundcube_des_key ]; then
ROUNDCUBEMAIL_DES_KEY=`cat /run/secrets/roundcube_des_key`
echo "\$config['des_key'] = '${ROUNDCUBEMAIL_DES_KEY}';" >> config/config.docker.inc.php
echo "\$config['des_key'] = file_get_contents('/run/secrets/roundcube_des_key');" >> config/config.docker.inc.php
elif [ ! -z "${ROUNDCUBEMAIL_DES_KEY}" ]; then
echo "\$config['des_key'] = getenv('ROUNDCUBEMAIL_DES_KEY');" >> config/config.docker.inc.php
fi
# include custom config files

9
fpm/docker-entrypoint.sh
View File

@ -72,7 +72,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
: "${ROUNDCUBEMAIL_TEMP_DIR:=/tmp/roundcube-temp}"
if [ ! -e config/config.inc.php ]; then
ROUNDCUBEMAIL_DES_KEY=`head /dev/urandom | base64 | head -c 24`
GENERATED_DES_KEY=`head /dev/urandom | base64 | head -c 24`
touch config/config.inc.php
echo "Write root config to $PWD/config/config.inc.php"
@ -80,7 +80,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
\$config['plugins'] = [];
\$config['log_driver'] = 'stdout';
\$config['zipdownload_selection'] = true;
\$config['des_key'] = '${ROUNDCUBEMAIL_DES_KEY}';
\$config['des_key'] = '${GENERATED_DES_KEY}';
include(__DIR__ . '/config.docker.inc.php');
" > config/config.inc.php
@ -103,8 +103,9 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
" > config/config.docker.inc.php
if [ -e /run/secrets/roundcube_des_key ]; then
ROUNDCUBEMAIL_DES_KEY=`cat /run/secrets/roundcube_des_key`
echo "\$config['des_key'] = '${ROUNDCUBEMAIL_DES_KEY}';" >> config/config.docker.inc.php
echo "\$config['des_key'] = file_get_contents('/run/secrets/roundcube_des_key');" >> config/config.docker.inc.php
elif [ ! -z "${ROUNDCUBEMAIL_DES_KEY}" ]; then
echo "\$config['des_key'] = getenv('ROUNDCUBEMAIL_DES_KEY');" >> config/config.docker.inc.php
fi
# include custom config files

9
templates/docker-entrypoint.sh
View File

@ -72,7 +72,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
: "${ROUNDCUBEMAIL_TEMP_DIR:=/tmp/roundcube-temp}"
if [ ! -e config/config.inc.php ]; then
ROUNDCUBEMAIL_DES_KEY=`head /dev/urandom | base64 | head -c 24`
GENERATED_DES_KEY=`head /dev/urandom | base64 | head -c 24`
touch config/config.inc.php
echo "Write root config to $PWD/config/config.inc.php"
@ -80,7 +80,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
\$config['plugins'] = [];
\$config['log_driver'] = 'stdout';
\$config['zipdownload_selection'] = true;
\$config['des_key'] = '${ROUNDCUBEMAIL_DES_KEY}';
\$config['des_key'] = '${GENERATED_DES_KEY}';
include(__DIR__ . '/config.docker.inc.php');
" > config/config.inc.php
@ -103,8 +103,9 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
" > config/config.docker.inc.php
if [ -e /run/secrets/roundcube_des_key ]; then
ROUNDCUBEMAIL_DES_KEY=`cat /run/secrets/roundcube_des_key`
echo "\$config['des_key'] = '${ROUNDCUBEMAIL_DES_KEY}';" >> config/config.docker.inc.php
echo "\$config['des_key'] = file_get_contents('/run/secrets/roundcube_des_key');" >> config/config.docker.inc.php
elif [ ! -z "${ROUNDCUBEMAIL_DES_KEY}" ]; then
echo "\$config['des_key'] = getenv('ROUNDCUBEMAIL_DES_KEY');" >> config/config.docker.inc.php
fi
# include custom config files