Skip to content

feat(configure): select crypto strategy #470

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
kojiromike wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

feat(configure): select crypto strategy #470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions docker/openemr/flex/auto_configure.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
$installSettings['clone_database'] = 'BLANK';
$installSettings['no_root_db_access'] = 'BLANK';
$installSettings['development_translations'] = 'BLANK';
$installSettings['encryption_strategy'] = 'cryptogen';

// Collect parameters(if exist) for installation configuration settings
for ($i=1; $i < count($argv); $i++) {
if ($argv[$i] == '-f' && isset($argv[$i+1])) {
Expand Down
13 changes: 8 additions & 5 deletions docker/openemr/flex/openemr.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ set -e
# shellcheck source=SCRIPTDIR/utilities/devtoolsLibrary.source
. /root/devtoolsLibrary.source

# required
: "${PHP_VERSION_ABBR?}"

# defaults
: "${DEMO_MODE:=no}" \
"${DEVELOPER_TOOLS:=no}" \
Expand Down Expand Up @@ -492,8 +495,8 @@ if [ "${REDIS_SERVER}" != "" ] &&
echo "redis setup"
fi

sed -i "s@session.save_handler = files@session.save_handler = redis@" /etc/php${PHP_VERSION_ABBR}/php.ini
sed -i 's@;session.save_path = "/tmp"@session.save_path = "'"${REDIS_PATH}"'"@"' /etc/php${PHP_VERSION_ABBR}/php.ini
sed -i "s@session.save_handler = files@session.save_handler = redis@" "/etc/php${PHP_VERSION_ABBR}/php.ini"
sed -i 's@;session.save_path = "/tmp"@session.save_path = "'"${REDIS_PATH}"'"@"' "/etc/php${PHP_VERSION_ABBR}/php.ini"
# Ensure only configure this one time
touch /etc/php-redis-configured
fi
Expand All @@ -503,14 +506,14 @@ if [ "${XDEBUG_IDE_KEY}" != "" ] ||
sh xdebug.sh
#also need to turn off opcache since it can not be turned on with xdebug
if [ ! -f /etc/php-opcache-jit-configured ]; then
echo "opcache.enable=0" >> /etc/php${PHP_VERSION_ABBR}/php.ini
echo "opcache.enable=0" >> "/etc/php${PHP_VERSION_ABBR}/php.ini"
touch /etc/php-opcache-jit-configured
fi
else
# Configure opcache jit if Xdebug is not being used (note opcache is already on, so just need to add setting(s) to php.ini that are different from the default setting(s))
if [ ! -f /etc/php-opcache-jit-configured ]; then
echo "opcache.jit=tracing" >> /etc/php${PHP_VERSION_ABBR}/php.ini
echo "opcache.jit_buffer_size=100M" >> /etc/php${PHP_VERSION_ABBR}/php.ini
echo "opcache.jit=tracing" >> "/etc/php${PHP_VERSION_ABBR}/php.ini"
echo "opcache.jit_buffer_size=100M" >> "/etc/php${PHP_VERSION_ABBR}/php.ini"
touch /etc/php-opcache-jit-configured
fi
fi
Expand Down
3 changes: 3 additions & 0 deletions docker/openemr/flex/utilities/devtoolsLibrary.source
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ prepareVariables() {
if [ -n "${OE_PASS:-}" ]; then
CONFIGURATION="${CONFIGURATION} iuserpass=${OE_PASS}"
fi
if [ -n "${ENCRYPTION_STRATEGY:-}" ]; then
CONFIGURATION="${CONFIGURATION} encryption_strategy=${ENCRYPTION_STRATEGY}"
fi
}

setGlobalSettings() {
Expand Down
Loading