install/mailsystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: install:d46c65afa73c1aa7c78b05ef58f20a2bbc1e6599
Branches Tags
install:master
..
compare: install:077b54753bd23024b65c161f7e712bce8aad1aa3
Branches Tags
install:master

No commits in common. "d46c65afa73c1aa7c78b05ef58f20a2bbc1e6599" and "077b54753bd23024b65c161f7e712bce8aad1aa3" have entirely different histories.
d46c65afa7 ... 077b54753b

2 changed files with 45 additions and 101 deletions
Show Stats Expand all files Collapse all files

6
install_postfixadmin.sh
View File

@ -221,11 +221,7 @@ DEFAULT_APACHE_SERVER_KEY="server.key"
DEFAULT_DEBIAN_APACHE_VHOST_DIR="/etc/apache2/sites-available" DEFAULT_DEBIAN_APACHE_VHOST_DIR="/etc/apache2/sites-available"
DEFAULT_APACHE_VHOST_DIR="/usr/local/apache2/conf/vhosts" DEFAULT_APACHE_VHOST_DIR="/usr/local/apache2/conf/vhosts"
DEFAULT_POSTFIX_DB_HOST_PGSQL="/run/postgresql" DEFAULT_POSTFIX_DB_HOST_PGSQL="/run/postgresql"
if [[ -S "/tmp/mysql.sock" ]] ; then DEFAULT_POSTFIX_DB_HOST_MYSQL="unix:/tmp/mysql.sock"
DEFAULT_POSTFIX_DB_HOST_MYSQL="unix:/tmp/mysql.sock"
else
DEFAULT_POSTFIX_DB_HOST_MYSQL="unix:/run/mysqld/mysqld.sock"
fi
DEFAULT_POSTFIX_DB_NAME="postfix" DEFAULT_POSTFIX_DB_NAME="postfix"
DEFAULT_POSTFIX_DB_USER="postfix" DEFAULT_POSTFIX_DB_USER="postfix"
if [[ -f "/usr/local/mysql/sys-maint.cnf" ]] ; then if [[ -f "/usr/local/mysql/sys-maint.cnf" ]] ; then

140
install_update_dovecot.sh
View File

@ -125,14 +125,6 @@ else
SYSTEMD_EXISTS=true SYSTEMD_EXISTS=true
fi fi
if [[ -f "/usr/local/mysql/sys-maint.cnf" ]] ; then
DEFAULT_MYSQL_CREDENTIALS="--defaults-file=/usr/local/mysql/sys-maint.cnf"
elif [[ -f "/etc/mysql/debian.cnf" ]] ; then
DEFAULT_MYSQL_CREDENTIALS="--defaults-file=/etc/mysql/debian.cnf"
else
DEFAULT_MYSQL_CREDENTIALS=""
fi
echo echo
echononl "\tInclude Configuration file.." echononl "\tInclude Configuration file.."
@ -203,8 +195,8 @@ fi
[[ -n "$dbname" ]] || dbname="postfix" [[ -n "$dbname" ]] || dbname="postfix"
[[ -n "$dbuser" ]] || dbuser="postfix" [[ -n "$dbuser" ]] || dbuser="postfix"
if [[ -z "$dbhost" ]] ; then if [[ -z "$dbhost" ]] ; then
[[ "$database" = "mysql" ]] && dbhost="unix:/run/mysqld/mysqld.sock" [[ "$dbhost" = "mysql" ]] && dbhost="127.0.0.1"
[[ "$database" = "postgres" ]] && dbhost="/run/postgresql" [[ "$dbhost" = "postgres" ]] && dbhost="/run/postgresql"
fi fi
[[ -n "$cert_base_dir" ]] || cert_base_dir="/etc/dovecot/ssl" [[ -n "$cert_base_dir" ]] || cert_base_dir="/etc/dovecot/ssl"
@ -479,93 +471,49 @@ if $_new ; then
echo "" echo ""
echo "--" echo "--"
echo "" echo ""
echo "Gib MySQL credentials für den root user an.." echo "Gib den Benutzernamen des/eines MySQL root user an.."
echo "" echo ""
echo "Possible values could be:" _MYSQL_ROOT_USER=root
echo " -u root -p<Passwort>" MYSQL_ROOT_USER=
echo " -u root -S /run/mysqld/mysqld.sock" while [ "X$MYSQL_ROOT_USER" = "X" ]
echo " --login-path=local" do
echo " --defaults-file=/usr/local/mysql/sys-maint.cnf" echononl "MySQL-User [${_MYSQL_ROOT_USER}]: "
echo " --defaults-file=/etc/mysql/debian.cnf" read MYSQL_ROOT_USER
echo " ..." if [ "X$MYSQL_ROOT_USER" = "X" ]; then
echo "" MYSQL_ROOT_USER=$_MYSQL_ROOT_USER
echo -e " Type \"\033[33mNone\033[m\" if no credentials are needed for root user (MariaDB)" fi
echo "" done
MYSQL_CREDENTIALS=""
if [[ -n "${DEFAULT_MYSQL_CREDENTIALS}" ]] ; then
while [[ -z "${MYSQL_CREDENTIALS}" ]] ; do
echononl "MySQL credentials [${DEFAULT_MYSQL_CREDENTIALS}]: "
read MYSQL_CREDENTIALS
if [[ -z "${MYSQL_CREDENTIALS}" ]] ;then
MYSQL_CREDENTIALS="${DEFAULT_MYSQL_CREDENTIALS}"
fi
done
else
while [[ -z "${MYSQL_CREDENTIALS}" ]] ; do
echononl "MySQL credentials: "
read MYSQL_CREDENTIALS
if "${MYSQL_CREDENTIALS}" ]] ; then
echo -e "\n\t\033[33m\033[1mMySQL credentials are required (or type\033[33mNone\033[m) : "
continue
fi
if [[ "$(trim ${MYSQL_CREDENTIALS,,})" = 'none' ]] ; then
MYSQL_CREDENTIALS=""
break
fi
done
fi
echo "" echo ""
echo "--" echo "--"
echo "" echo ""
echo "Gib ein Passwort für den root user an.."
echo "" echo ""
_MYSQL_ROOT_PW_1="X"
# echo "" _MYSQL_ROOT_PW_2="Y"
# echo "--" while [ "$_MYSQL_ROOT_PW_1" != "$_MYSQL_ROOT_PW_2" ]
# echo "" do
# echo "Gib den Benutzernamen des/eines MySQL root user an.." echononl "Passworteingabe: "
# echo "" read -s _MYSQL_ROOT_PW_1
# _MYSQL_ROOT_USER=root echo
# MYSQL_ROOT_USER= if [ "X$_MYSQL_ROOT_PW_1" = "X" ]; then
# while [ "X$MYSQL_ROOT_USER" = "X" ] echo -e "\n\t\033[33m\033[1mPassworteingabe erforderlich!\033[m\n"
# do continue
# echononl "MySQL-User [${_MYSQL_ROOT_USER}]: " fi
# read MYSQL_ROOT_USER echononl "Passwortwiederholung: "
# if [ "X$MYSQL_ROOT_USER" = "X" ]; then read -s _MYSQL_ROOT_PW_2
# MYSQL_ROOT_USER=$_MYSQL_ROOT_USER echo
# fi if [ "X$_MYSQL_ROOT_PW_2" = "X" ]; then
# done echo -e "\n\t\033[33m\033[1mPasswortwiederholung erforderlich!\033[m\n"
# continue
# fi
# echo "" if [ "$_MYSQL_ROOT_PW_1" != "$_MYSQL_ROOT_PW_2" ];then
# echo "--" echo -e "\n\t\033[33m\033[1mPassworteingaben sind nicht identisch!\033[m\n"
# echo "" else
# echo "Gib ein Passwort für den root user an.." MYSQL_ROOT_PW=$_MYSQL_ROOT_PW_1
# echo "" fi
# _MYSQL_ROOT_PW_1="X" done
# _MYSQL_ROOT_PW_2="Y"
# while [ "$_MYSQL_ROOT_PW_1" != "$_MYSQL_ROOT_PW_2" ]
# do
# echononl "Passworteingabe: "
# read -s _MYSQL_ROOT_PW_1
# echo
# if [ "X$_MYSQL_ROOT_PW_1" = "X" ]; then
# echo -e "\n\t\033[33m\033[1mPassworteingabe erforderlich!\033[m\n"
# continue
# fi
# echononl "Passwortwiederholung: "
# read -s _MYSQL_ROOT_PW_2
# echo
# if [ "X$_MYSQL_ROOT_PW_2" = "X" ]; then
# echo -e "\n\t\033[33m\033[1mPasswortwiederholung erforderlich!\033[m\n"
# continue
# fi
# if [ "$_MYSQL_ROOT_PW_1" != "$_MYSQL_ROOT_PW_2" ];then
# echo -e "\n\t\033[33m\033[1mPassworteingaben sind nicht identisch!\033[m\n"
# else
# MYSQL_ROOT_PW=$_MYSQL_ROOT_PW_1
# fi
# done
# MYSQL_CREDENTIALS="-u ${MYSQL_ROOT_USER} -p${MYSQL_ROOT_PW}"
fi fi
fi fi
@ -1236,12 +1184,12 @@ EOF
elif [ "$db_driver" = "mysql" ]; then elif [ "$db_driver" = "mysql" ]; then
if ! mysql ${MYSQL_CREDENTIALS} -N -s -e \ if ! mysql -u$MYSQL_ROOT_USER -p$MYSQL_ROOT_PW -N -s -e \
"SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = '$dbname'" 2>/dev/null \ "SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = '$dbname'" 2>/dev/null \
| grep $_db_name > /dev/null 2>&1 ; then | grep $_db_name > /dev/null 2>&1 ; then
echononl "\tCreate database ${dbname}.." echononl "\tCreate database ${dbname}.."
mysql ${MYSQL_CREDENTIALS} -N -s -e \ mysql -u$MYSQL_ROOT_USER -p$MYSQL_ROOT_PW -N -s -e \
"CREATE DATABASE IF NOT EXISTS $dbname CHARACTER SET utf8 COLLATE utf8_general_ci" > ${_log_dir}/error.log 2>&1 "CREATE DATABASE IF NOT EXISTS $dbname CHARACTER SET utf8 COLLATE utf8_general_ci" > ${_log_dir}/error.log 2>&1
if [ "$?" = 0 ]; then if [ "$?" = 0 ]; then
@ -1261,7 +1209,7 @@ EOF
fi fi
echononl "\tCreate database user ${dbuser}.." echononl "\tCreate database user ${dbuser}.."
mysql ${MYSQL_CREDENTIALS} -N -s -e \ mysql -u$MYSQL_ROOT_USER -p$MYSQL_ROOT_PW -N -s -e \
"GRANT ALL ON ${dbname}.* TO '${dbuser}'@'localhost' IDENTIFIED BY '$dbpassword'" > ${_log_dir}/error.log 2>&1 "GRANT ALL ON ${dbname}.* TO '${dbuser}'@'localhost' IDENTIFIED BY '$dbpassword'" > ${_log_dir}/error.log 2>&1
if [ "$?" = 0 ]; then if [ "$?" = 0 ]; then
@ -1281,7 +1229,7 @@ EOF
fi fi
echononl "\tFlushing database privileges.." echononl "\tFlushing database privileges.."
mysql ${MYSQL_CREDENTIALS} -N -s -e "FLUSH PRIVILEGES" > ${_log_dir}/error.log 2>&1 mysql -u$MYSQL_ROOT_USER -p$MYSQL_ROOT_PW -N -s -e "FLUSH PRIVILEGES" > ${_log_dir}/error.log 2>&1
if [ "$?" = 0 ]; then if [ "$?" = 0 ]; then
echo -e "$rc_done" echo -e "$rc_done"