Do not hardcode mysql service name when we have a variable for it
This is useful in case a different service name will be used (when
porting to another distribution, for instance).
Change-Id: I5b66ada02f3c4424384c728f1dadb4872bf4d490
diff --git a/stack.sh b/stack.sh
index d05de6a..118c2ef 100755
--- a/stack.sh
+++ b/stack.sh
@@ -975,17 +975,6 @@
if is_service_enabled mysql; then
echo_summary "Configuring and starting MySQL"
- # Start mysql-server
- if [[ "$os_PACKAGE" = "rpm" ]]; then
- # RPM doesn't start the service
- start_service mysqld
- # Set the root password - only works the first time
- sudo mysqladmin -u root password $MYSQL_PASSWORD || true
- fi
- # Update the DB to give user ‘$MYSQL_USER’@’%’ full control of the all databases:
- sudo mysql -uroot -p$MYSQL_PASSWORD -h127.0.0.1 -e "GRANT ALL PRIVILEGES ON *.* TO '$MYSQL_USER'@'%' identified by '$MYSQL_PASSWORD';"
-
- # Update ``my.cnf`` for some local needs and restart the mysql service
if [[ "$os_PACKAGE" = "deb" ]]; then
MY_CONF=/etc/mysql/my.cnf
MYSQL=mysql
@@ -994,6 +983,18 @@
MYSQL=mysqld
fi
+ # Start mysql-server
+ if [[ "$os_PACKAGE" = "rpm" ]]; then
+ # RPM doesn't start the service
+ start_service $MYSQL
+ # Set the root password - only works the first time
+ sudo mysqladmin -u root password $MYSQL_PASSWORD || true
+ fi
+ # Update the DB to give user ‘$MYSQL_USER’@’%’ full control of the all databases:
+ sudo mysql -uroot -p$MYSQL_PASSWORD -h127.0.0.1 -e "GRANT ALL PRIVILEGES ON *.* TO '$MYSQL_USER'@'%' identified by '$MYSQL_PASSWORD';"
+
+ # Now update ``my.cnf`` for some local needs and restart the mysql service
+
# Change ‘bind-address’ from localhost (127.0.0.1) to any (0.0.0.0)
sudo sed -i '/^bind-address/s/127.0.0.1/0.0.0.0/g' $MY_CONF