diff --git a/conf/install_postfixadmin.conf.sample b/conf/install_postfixadmin.conf.sample index 4e9846f..c18c0f1 100644 --- a/conf/install_postfixadmin.conf.sample +++ b/conf/install_postfixadmin.conf.sample @@ -42,7 +42,7 @@ IPV6="" # - #WEBMASTER_EMAIL="" -# - Base Directory of Roundcube Website +# - Base Directory of postfixadmin Website # - # - Note: it's not the 'DocumentRoot' directory, but the directory where # - the 'DocumentRoot' Directory lives. @@ -69,7 +69,7 @@ IPV6="" # - APACHE_CERT_DIR="" -# - Certificate for the Rounfcube Website +# - Certificate for the postfixadmin Website # - # - Example: # - APACHE_SERVER_CERT="fullchain.pem" @@ -142,8 +142,8 @@ APACHE_SERVER_KEY="" # - mysql_credential_args="--defaults-file=/usr/local/mysql/sys-maint.cnf" # - # - Defaults to: -# - '/etc/mysql/debian.cnf' if MySQL is installed from debian package system -# - '/usr/local/mysql/sys-maint.cnf' otherwise +# - '--defaults-file=//etc/mysql/debian.cnf' if MySQL is installed from debian package system +# - '--defaults-file=//usr/local/mysql/sys-maint.cnf' otherwise # - #MYSQL_CREDENTIALS="" diff --git a/install_postfixadmin.sh b/install_postfixadmin.sh index ee239ca..adfc8c1 100755 --- a/install_postfixadmin.sh +++ b/install_postfixadmin.sh @@ -224,8 +224,8 @@ DEFAULT_POSTFIX_DB_HOST="localhost" DEFAULT_POSTFIX_DB_NAME="postfix" DEFAULT_POSTFIX_DB_USER="postfix" DEFAULT_POSTFIX_DB_SOCKET_PG="/var/run/postgresql" -DEFAULT_DEBIAN_MYSQL_CREDENTIALS="/etc/mysql/debian.cnf" -DEFAULT_MYSQL_CREDENTIALS="/usr/local/mysql/sys-maint.cnf" +DEFAULT_DEBIAN_MYSQL_CREDENTIALS="--defaults-file=/etc/mysql/debian.cnf" +DEFAULT_MYSQL_CREDENTIALS="--defaults-file=/usr/local/mysql/sys-maint.cnf" DEFAULT_DOVEADM_PW="/usr/local/dovecot/bin/doveadm pw" DEFAULT_DELETED_MAILBOX_DIR="/var/deleted-maildirs"