diff --git a/5.0/apache/entrypoint.sh b/5.0/apache/entrypoint.sh index 10a945a..f6cab90 100755 --- a/5.0/apache/entrypoint.sh +++ b/5.0/apache/entrypoint.sh @@ -15,6 +15,8 @@ DB_MYSQL_ENGINE=${DB_MYSQL_ENGINE:-'MyISAM'} ENCRYPT_KEYPAIR=${ENCRYPT_KEYPAIR:-} ENCRYPT_PUBLIC_KEY=${ENCRYPT_PUBLIC_KEY:-} ENCRYPT_SECRET_KEY=${ENCRYPT_SECRET_KEY:-} +ENCRYPT_NONCE=${ENCRYPT_NONCE:-} +ENCRYPT_SECRET_BOX_KEY=${ENCRYPT_SECRET_BOX_KEY:-} ADMIN_USER=${ADMIN_USER:-'admin'} ADMIN_NAME=${ADMIN_NAME:-'admin'} @@ -142,6 +144,8 @@ else \$config['encryptionkeypair'] = '$ENCRYPT_KEYPAIR'; \$config['encryptionpublickey'] = '$ENCRYPT_PUBLIC_KEY'; \$config['encryptionsecretkey'] = '$ENCRYPT_SECRET_KEY'; +\$config['encryptionnonce'] = '$ENCRYPT_NONCE'; +\$config['encryptionsecretboxkey'] = '$ENCRYPT_SECRET_BOX_KEY'; return \$config; EOF else diff --git a/5.0/fpm-alpine/entrypoint.sh b/5.0/fpm-alpine/entrypoint.sh index 7a2ebf1..d55c7f9 100755 --- a/5.0/fpm-alpine/entrypoint.sh +++ b/5.0/fpm-alpine/entrypoint.sh @@ -15,6 +15,8 @@ DB_MYSQL_ENGINE=${DB_MYSQL_ENGINE:-'MyISAM'} ENCRYPT_KEYPAIR=${ENCRYPT_KEYPAIR:-} ENCRYPT_PUBLIC_KEY=${ENCRYPT_PUBLIC_KEY:-} ENCRYPT_SECRET_KEY=${ENCRYPT_SECRET_KEY:-} +ENCRYPT_NONCE=${ENCRYPT_NONCE:-} +ENCRYPT_SECRET_BOX_KEY=${ENCRYPT_SECRET_BOX_KEY:-} ADMIN_USER=${ADMIN_USER:-'admin'} ADMIN_NAME=${ADMIN_NAME:-'admin'} @@ -135,6 +137,8 @@ else \$config['encryptionkeypair'] = '$ENCRYPT_KEYPAIR'; \$config['encryptionpublickey'] = '$ENCRYPT_PUBLIC_KEY'; \$config['encryptionsecretkey'] = '$ENCRYPT_SECRET_KEY'; +\$config['encryptionnonce'] = '$ENCRYPT_NONCE'; +\$config['encryptionsecretboxkey'] = '$ENCRYPT_SECRET_BOX_KEY'; return \$config; EOF else diff --git a/5.0/fpm/entrypoint.sh b/5.0/fpm/entrypoint.sh index a414f46..d01607d 100755 --- a/5.0/fpm/entrypoint.sh +++ b/5.0/fpm/entrypoint.sh @@ -15,6 +15,8 @@ DB_MYSQL_ENGINE=${DB_MYSQL_ENGINE:-'MyISAM'} ENCRYPT_KEYPAIR=${ENCRYPT_KEYPAIR:-} ENCRYPT_PUBLIC_KEY=${ENCRYPT_PUBLIC_KEY:-} ENCRYPT_SECRET_KEY=${ENCRYPT_SECRET_KEY:-} +ENCRYPT_NONCE=${ENCRYPT_NONCE:-} +ENCRYPT_SECRET_BOX_KEY=${ENCRYPT_SECRET_BOX_KEY:-} ADMIN_USER=${ADMIN_USER:-'admin'} ADMIN_NAME=${ADMIN_NAME:-'admin'} @@ -135,6 +137,8 @@ else \$config['encryptionkeypair'] = '$ENCRYPT_KEYPAIR'; \$config['encryptionpublickey'] = '$ENCRYPT_PUBLIC_KEY'; \$config['encryptionsecretkey'] = '$ENCRYPT_SECRET_KEY'; +\$config['encryptionnonce'] = '$ENCRYPT_NONCE'; +\$config['encryptionsecretboxkey'] = '$ENCRYPT_SECRET_BOX_KEY'; return \$config; EOF else diff --git a/README.md b/README.md index fdb2228..26a8ec3 100644 --- a/README.md +++ b/README.md @@ -121,6 +121,8 @@ For further details on the settings see: https://manual.limesurvey.org/Data_encr | ENCRYPT_KEYPAIR | Data encryption keypair | | ENCRYPT_PUBLIC_KEY | Data encryption public key | | ENCRYPT_SECRET_KEY | Data encryption secret key | +| ENCRYPT_NONCE | Data encryption nonce (used in 5.0) | +| ENCRYPT_SECRET_BOX_KEY | Data encryption secret box key (used in 5.0) | | LISTEN_PORT | Apache: Listen port. Default: 8080 | For further details on the settings see: https://manual.limesurvey.org/Optional_settings#Advanced_Path_Settings