Cleanup

diff --git a/templates/setmysqlpass.sh.erb b/templates/setmysqlpass.sh.erb
index 902336ae73e67a09b8c7069b16a0086833b3d54e..9cb3d399cf0ef408fd373e703e19a859f3b8d407 100644 (file)
--- a/templates/setmysqlpass.sh.erb
+++ b/templates/setmysqlpass.sh.erb
@@ -1,36 +1,12 @@
 #!/bin/bash
 #
-# Set MySQL password.
+# Change MySQL root password.
 #
 
 # Config
-SERVICE="/etc/init.d/mysql"
 PASSWORD="<%= mysql_rootpw %>"
-DATADIR="/var/lib/mysql/data"
-LOGBIN="/var/lib/mysql/mysql-bin"
-USER="mysql"
-GROUP="mysql"
 DEFAULTS="/etc/mysql/debian.cnf"
 
-# Stop service
-#$SERVICE stop
-
-# Start without grant tables
-# This seems unsafe as opens a race condition.
-#/usr/libexec/mysqld --skip-grant-tables --user=root --datadir=$DATADIR log-bin=$LOGBIN &
-
-# Wait
-#sleep 5
-
-# Change root password
+# Run
 echo "USE mysql; UPDATE user SET Password=PASSWORD('$PASSWORD') WHERE User='root' AND Host='localhost';" | \
   /usr/bin/mysql --defaults-file=$DEFAULTS
-
-# Kill the daemon
-#killall mysqld
-
-# Chown to be on the safe side 
-#chown $USER.$GROUP $LOGBIN*
-
-# Start service
-#$SERVICE start