mirror of
https://github.com/myvesta/vesta
synced 2025-07-16 10:03:23 -07:00
Merge pull request #1841 from lukapaunovic/patch-1
Fixing blowfish_secret length (too short) [phpMyAdmin]
This commit is contained in:
commit
2bde9c6e47
2 changed files with 8 additions and 2 deletions
|
@ -74,6 +74,9 @@ gen_pass() {
|
|||
echo "$PASS"
|
||||
}
|
||||
|
||||
# Defining 32 char blowfish_secret
|
||||
blowfish_secret=`openssl rand -base64 32`;
|
||||
|
||||
# Defining return code check function
|
||||
check_result() {
|
||||
if [ $1 -ne 0 ]; then
|
||||
|
@ -1023,7 +1026,7 @@ if [ "$mysql" = 'yes' ]; then
|
|||
cp -f $vestacp/pma/phpMyAdmin.conf /etc/httpd/conf.d/
|
||||
fi
|
||||
cp -f $vestacp/pma/config.inc.conf /etc/phpMyAdmin/config.inc.php
|
||||
sed -i "s/%blowfish_secret%/$(gen_pass)/g" /etc/phpMyAdmin/config.inc.php
|
||||
sed -i "s#%blowfish_secret#$blowfish_secret#g" /etc/phpMyAdmin/config.inc.php
|
||||
fi
|
||||
|
||||
|
||||
|
|
|
@ -83,6 +83,9 @@ gen_pass() {
|
|||
echo "$PASS"
|
||||
}
|
||||
|
||||
# Defining 32 char blowfish_secret
|
||||
blowfish_secret=`openssl rand -base64 32`;
|
||||
|
||||
# Defining return code check function
|
||||
check_result() {
|
||||
if [ $1 -ne 0 ]; then
|
||||
|
@ -1043,7 +1046,7 @@ if [ "$mysql" = 'yes' ]; then
|
|||
cp -f $vestacp/pma/phpMyAdmin.conf /etc/httpd/conf.d/
|
||||
fi
|
||||
cp -f $vestacp/pma/config.inc.conf /etc/phpMyAdmin/config.inc.php
|
||||
sed -i "s/%blowfish_secret%/$(gen_pass)/g" /etc/phpMyAdmin/config.inc.php
|
||||
sed -i "s#%blowfish_secret#$blowfish_secret#g" /etc/phpMyAdmin/config.inc.php
|
||||
fi
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue