From 5431b7ee731a59b0fe4a6b5df6645135b82e539c Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Tue, 19 Jan 2010 14:30:43 -0200
Subject: Cleanup

---
 templates/setmysqlpass.sh.erb | 28 ++--------------------------
 1 file changed, 2 insertions(+), 26 deletions(-)

diff --git a/templates/setmysqlpass.sh.erb b/templates/setmysqlpass.sh.erb
index 902336a..9cb3d39 100644
--- 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
-- 
cgit v1.2.3