kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity

use string templating instead of sed for creating/updating mysql configuration during install

This commit is contained in:
Kienan Stewart 2018-06-13 18:02:10 -04:00
parent eca8d7ccdf
commit 1b08ae2638
1 changed files with 18 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
install/mysql.sh
View File

@ -117,87 +117,39 @@ if [ -f $MYSQL_CONFIG ]; then
echo "Updating mysql configuration in $MYSQL_CONFIG" echo "Updating mysql configuration in $MYSQL_CONFIG"
else else
echo "Creating mysql configuration in $MYSQL_CONFIG" echo "Creating mysql configuration in $MYSQL_CONFIG"
cat > $MYSQL_CONFIG <<EOF
# AlternC - Web Hosting System - MySQL Configuration
# Automatically generated by AlternC configuration, do not edit
# This file will be modified on package configuration
# (e.g. upgrade or dpkg-reconfigure alternc)
[mysql]
database=
[client]
EOF
chown root:www-data $MYSQL_CONFIG
chmod 640 $MYSQL_CONFIG
fi fi
if [ -f $MYSQL_MAIL_CONFIG ]; then if [ -f $MYSQL_MAIL_CONFIG ]; then
echo "Updating mysql configuration in $MYSQL_MAIL_CONFIG" echo "Updating mysql configuration in $MYSQL_MAIL_CONFIG"
else else
echo "Creating mysql configuration in $MYSQL_MAIL_CONFIG" echo "Creating mysql configuration in $MYSQL_MAIL_CONFIG"
cat > $MYSQL_MAIL_CONFIG <<EOF fi
write_mysql_cnf() {
local filename="$1"
local host=$(echo "$2" | sed -e 's/["]/\\&/g')
local db=$(echo "$3" | sed -e 's/["]/\\&/g')
local user=$(echo "$4" | sed -e 's/["]/\\&/g')
local password=$(echo "$5" | sed -e 's/["]/\\&/g')
cat > "$filename" <<EOF
# AlternC - Web Hosting System - MySQL mail user Configuration # AlternC - Web Hosting System - MySQL mail user Configuration
# Automatically generated by AlternC configuration, do not edit # Automatically generated by AlternC configuration, do not edit
# This file will be modified on package configuration # This file will be modified on package configuration
# (e.g. upgrade or dpkg-reconfigure alternc) # (e.g. upgrade or dpkg-reconfigure alternc)
[mysql] [mysql]
database= database="$db"
[client] [client]
host="$host"
user="$user"
password="$password"
EOF EOF
chown root:www-data $MYSQL_MAIL_CONFIG chown root:www-data "$filename"
chmod 640 $MYSQL_MAIL_CONFIG chmod 640 "$filename"
fi
# create a sed script to create/update the file
set_value() {
var=$1
RET=$2
file=$3
grep -Eq "^ *$var=" $file || echo "$var=" >> $file
if [ $file = $MYSQL_CONFIG ]; then
SED_SCRIPT_USR="$SED_SCRIPT_USR;s\\^ *$var=.*\\$var=\"$RET\"\\"
else
SED_SCRIPT_MAIL="$SED_SCRIPT_MAIL;s\\^ *$var=.*\\$var=\"$RET\"\\"
fi
} }
SED_SCRIPT_USR="" write_mysql_cnf "$MYSQL_CONFIG" "$host" "$database" "$user" "$password"
SED_SCRIPT_MAIL="" write_mysql_cnf "$MYSQL_MAIL_CONFIG" "$host" "$database" "$alternc_mail_user" "$alternc_mail_password"
# hostname was empty in older (pre-0.9.6?) versions
if [ -z "$host" ]; then
host="localhost"
fi
#filling the config file for the sysusr
set_value host $host $MYSQL_CONFIG
set_value database $database $MYSQL_CONFIG
set_value user $user $MYSQL_CONFIG
set_value password $password $MYSQL_CONFIG
#filling the config file for the mailuser
set_value host $host $MYSQL_MAIL_CONFIG
set_value database $database $MYSQL_MAIL_CONFIG
set_value user $alternc_mail_user $MYSQL_MAIL_CONFIG
set_value password $alternc_mail_password $MYSQL_MAIL_CONFIG
# take extra precautions here with the mysql password:
# put the sed script in a temporary file
SED_SCRIPT_NAME=`mktemp`
cat > $SED_SCRIPT_NAME <<EOF
$SED_SCRIPT_USR
EOF
sed -f "$SED_SCRIPT_NAME" < $MYSQL_CONFIG > $MYSQL_CONFIG.$$
mv -f $MYSQL_CONFIG.$$ $MYSQL_CONFIG
rm -f $SED_SCRIPT_NAME
SED_SCRIPT_NAME_MAIL=`mktemp`
cat > $SED_SCRIPT_NAME_MAIL <<EOF
$SED_SCRIPT_MAIL
EOF
sed -f "$SED_SCRIPT_NAME_MAIL" < $MYSQL_MAIL_CONFIG > $MYSQL_MAIL_CONFIG.$$
mv -f $MYSQL_MAIL_CONFIG.$$ $MYSQL_MAIL_CONFIG
rm -f $SED_SCRIPT_NAME_MAIL
# Now we should be able to use the mysql configuration # Now we should be able to use the mysql configuration
mysql="/usr/bin/mysql --defaults-file=$MYSQL_CONFIG" mysql="/usr/bin/mysql --defaults-file=$MYSQL_CONFIG"