Skip to content

Commit 6589ec2

Browse files
committed
Rename variables
1 parent 96b716b commit 6589ec2

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

config/easyengine/ee.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
ip-address =
77

88
[mysql]
9-
client-host = localhost
9+
grant-host = localhost
1010
db-name = false
1111
db-user = false
1212

src/lib/ee_lib_variables.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ else
4646
fi
4747

4848
# Find out MySQL client-host to setup grants
49-
if [ -z $($EE_CONFIG_GET mysql.client-host) ]; then
50-
readonly EE_MYSQL_CLIENT_HOST=localhost
49+
if [ -z $($EE_CONFIG_GET mysql.grant-host) ]; then
50+
readonly EE_MYSQL_GRANT_HOST=localhost
5151
else
52-
readonly EE_MYSQL_CLIENT_HOST=$($EE_CONFIG_GET mysql.client-host)
52+
readonly EE_MYSQL_GRANT_HOST=$($EE_CONFIG_GET mysql.grant-host)
5353
fi

src/modules/site/create/ee_mod_setup_database.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,16 @@ function ee_mod_setup_database()
5151
fi
5252

5353
# Create MySQL database
54-
echo -e "EE_DB_NAME = $EE_DB_NAME \nEE_DB_USER = $EE_DB_USER \nEE_DB_PASS = $EE_DB_PASS \nEE_MYSQL_HOST = $EE_MYSQL_HOST \nEE_MYSQL_CLIENT_HOST = $EE_MYSQL_CLIENT_HOST" &>> $EE_COMMAND_LOG
54+
echo -e "EE_DB_NAME = $EE_DB_NAME \nEE_DB_USER = $EE_DB_USER \nEE_DB_PASS = $EE_DB_PASS \nEE_MYSQL_HOST = $EE_MYSQL_HOST \nEE_MYSQL_GRANT_HOST = $EE_MYSQL_GRANT_HOST" &>> $EE_COMMAND_LOG
5555
mysql -e "create database \`$EE_DB_NAME\`" \
5656
|| ee_lib_error "Unable to create $EE_DB_NAME database, exit status = " $?
5757

5858
# Create MySQL User
59-
mysql -e "create user '$EE_DB_USER'@'$EE_MYSQL_CLIENT_HOST' identified by '$EE_DB_PASS'" \
59+
mysql -e "create user '$EE_DB_USER'@'$EE_MYSQL_GRANT_HOST' identified by '$EE_DB_PASS'" \
6060
|| ee_lib_error "Unable to create $EE_DB_USER database user, exit status = " $?
6161

6262
# Grant permission
63-
mysql -e "grant all privileges on \`$EE_DB_NAME\`.* to '$EE_DB_USER'@'$EE_MYSQL_CLIENT_HOST'" \
63+
mysql -e "grant all privileges on \`$EE_DB_NAME\`.* to '$EE_DB_USER'@'$EE_MYSQL_GRANT_HOST'" \
6464
|| ee_lib_error "Unable to grant privileges for $EE_DB_USER database user, exit status = " $?
6565
mysql -e "flush privileges"
6666
}

0 commit comments

Comments
 (0)