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

install_update_dovecot.sh: change '/var/run/*' into '/run/*'.

Browse Source
This commit is contained in:
Christoph 2021-11-06 11:17:50 +01:00
parent 4994dba228
commit 6868898142
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
install_update_dovecot.sh
View File

@ -196,7 +196,7 @@ fi
[[ -n "$dbuser" ]] || dbuser="postfix" [[ -n "$dbuser" ]] || dbuser="postfix"
if [[ -z "$dbhost" ]] ; then if [[ -z "$dbhost" ]] ; then
[[ "$dbhost" = "mysql" ]] && dbhost="127.0.0.1" [[ "$dbhost" = "mysql" ]] && dbhost="127.0.0.1"
[[ "$dbhost" = "postgres" ]] && dbhost="/var/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"
@ -810,7 +810,7 @@ config_params="
--prefix=/usr/local/dovecot-${_version} \ --prefix=/usr/local/dovecot-${_version} \
--with-${db_driver} \ --with-${db_driver} \
--with-gssapi=yes --with-gssapi=yes
--with-rundir=/var/run/dovecot" --with-rundir=/run/dovecot"
if $systemd_support ; then if $systemd_support ; then
config_params="$config_params \ config_params="$config_params \
--with-systemdsystemunitdir=/etc/systemd/system/" --with-systemdsystemunitdir=/etc/systemd/system/"
@ -977,8 +977,8 @@ cp -r /usr/local/dovecot-${_version}/share/doc/dovecot/example-config/* \
## - ## -
## - protocols = imap pop3 sieve ## - protocols = imap pop3 sieve
## - listen = $ipv4 $ipv6 ## - listen = $ipv4 $ipv6
## - base_dir = /var/run/dovecot/ ## - base_dir =/run/dovecot/
## - state_dir = /var/run/dovecot ## - state_dir = /run/dovecot
## - shutdown_clients = no ## - shutdown_clients = no
## - ## -
## - dict { ## - dict {
@ -995,7 +995,7 @@ else
fi fi
perl -i -n -p -e "s#^([ ]*)\#?\ ?(protocols\ ?=.*)#\1\#\# \2\n\1protocols = imap pop3 sieve#g" \ perl -i -n -p -e "s#^([ ]*)\#?\ ?(protocols\ ?=.*)#\1\#\# \2\n\1protocols = imap pop3 sieve#g" \
/usr/local/dovecot-${_version}/etc/dovecot/dovecot.conf || _failed=true /usr/local/dovecot-${_version}/etc/dovecot/dovecot.conf || _failed=true
perl -i -n -p -e "s#^([ ]*)\#?\ ?(base_dir\ ?=.*)#\1\#\# \2\n\1base_dir = /var/run/dovecot/\n\nstate_dir = /var/run/dovecot#g" \ perl -i -n -p -e "s#^([ ]*)\#?\ ?(base_dir\ ?=.*)#\1\#\# \2\n\1base_dir = /run/dovecot/\n\nstate_dir = /run/dovecot#g" \
/usr/local/dovecot-${_version}/etc/dovecot/dovecot.conf || _failed=true /usr/local/dovecot-${_version}/etc/dovecot/dovecot.conf || _failed=true
perl -i -n -p -e "s#^([ ]*)\#?\ ?(shutdown_clients\ ?=.*)#\1\#\# \2\n\1shutdown_clients = no#g" \ perl -i -n -p -e "s#^([ ]*)\#?\ ?(shutdown_clients\ ?=.*)#\1\#\# \2\n\1shutdown_clients = no#g" \
/usr/local/dovecot-${_version}/etc/dovecot/dovecot.conf || _failed=true /usr/local/dovecot-${_version}/etc/dovecot/dovecot.conf || _failed=true
@ -1608,7 +1608,7 @@ fi
## - first_valid_gid = 5000 ## - first_valid_gid = 5000
## - last_valid_gid = 5000 ## - last_valid_gid = 5000
## - ## -
## - auth_socket_path = /var/run/dovecot/auth-userdb ## - auth_socket_path = /run/dovecot/auth-userdb
## - mail_plugins = quota | mail_plugins = quota expire ## - mail_plugins = quota | mail_plugins = quota expire
## - ## -
## - mailbox_list_index = yes ## - mailbox_list_index = yes
@ -1631,7 +1631,7 @@ perl -i -n -p -e "s#^([ ]*)\#?\ ?(first_valid_gid.*)#\1\#\# \2\n\1first_valid_gi
/usr/local/dovecot-${_version}/etc/dovecot/conf.d/10-mail.conf || _failed=true /usr/local/dovecot-${_version}/etc/dovecot/conf.d/10-mail.conf || _failed=true
perl -i -n -p -e "s#^([ ]*)\#?\ ?(last_valid_gid.*)#\1\#\# \2\n\1last_valid_gid = 5000#g" \ perl -i -n -p -e "s#^([ ]*)\#?\ ?(last_valid_gid.*)#\1\#\# \2\n\1last_valid_gid = 5000#g" \
/usr/local/dovecot-${_version}/etc/dovecot/conf.d/10-mail.conf || _failed=true /usr/local/dovecot-${_version}/etc/dovecot/conf.d/10-mail.conf || _failed=true
perl -i -n -p -e "s#^([ ]*)\#?\ ?(auth_socket_path\ +=.*)#\1\#\# \2\n\1auth_socket_path = /var/run/dovecot/auth-userdb#g" \ perl -i -n -p -e "s#^([ ]*)\#?\ ?(auth_socket_path\ +=.*)#\1\#\# \2\n\1auth_socket_path = /run/dovecot/auth-userdb#g" \
/usr/local/dovecot-${_version}/etc/dovecot/conf.d/10-mail.conf || _failed=true /usr/local/dovecot-${_version}/etc/dovecot/conf.d/10-mail.conf || _failed=true
if $plugin_expire ; then if $plugin_expire ; then
@ -1942,7 +1942,7 @@ if [ "$db_driver" = "pgsql" ]; then
cat <<EOF > /usr/local/dovecot-${_version}/etc/dovecot/sql-connect.conf.ext cat <<EOF > /usr/local/dovecot-${_version}/etc/dovecot/sql-connect.conf.ext
driver = $db_driver driver = $db_driver
## - if using unix-socket (host=/var/run/postgresql) ensure that ## - if using unix-socket (host=/run/postgresql) ensure that
## - coresponding entries in pg_hba.cof fits ## - coresponding entries in pg_hba.cof fits
## - for example ## - for example
## - local all all md5 ## - local all all md5
@ -2096,7 +2096,7 @@ EOF
#sharedscripts #sharedscripts
#postrotate #postrotate
#/etc/init.d/dovecot reload > /dev/null #/etc/init.d/dovecot reload > /dev/null
#/bin/kill -usr1 'cat /var/run/dovecot/master.pid 2>/dev/null' 2>/dev/null || true #/bin/kill -usr1 'cat /run/dovecot/master.pid 2>/dev/null' 2>/dev/null || true
#endscript #endscript
} }
EOF EOF
@ -2425,7 +2425,7 @@ fi
# determine the location of the PID file # determine the location of the PID file
# overide by setting base_dir in conf file or PIDBASE in /etc/defaults/\$NAME # overide by setting base_dir in conf file or PIDBASE in /etc/defaults/\$NAME
PIDBASE=\${PIDBASE:-\`sed -r "s/^[ \t]*base_dir[ \t]*=[ \t]*([^ \t]*)/\1/;t;d" \${CONF}\`} PIDBASE=\${PIDBASE:-\`sed -r "s/^[ \t]*base_dir[ \t]*=[ \t]*([^ \t]*)/\1/;t;d" \${CONF}\`}
PIDFILE=\${PIDBASE:-/var/run/dovecot/}master.pid PIDFILE=\${PIDBASE:-/run/dovecot/}master.pid
# #
# Function that starts the daemon/service # Function that starts the daemon/service
@ -2595,7 +2595,7 @@ EOF
echononl "Adjust 'PIDFile' at file 'dovecot.service'.." echononl "Adjust 'PIDFile' at file 'dovecot.service'.."
if [[ -f "/etc/systemd/system/dovecot.service" ]] ; then if [[ -f "/etc/systemd/system/dovecot.service" ]] ; then
if $(grep -q -o -E "^\s*PIDFile\s*=\s*/var/run/" /etc/systemd/system/dovecot.service 2> /dev/null ) ; then if $(grep -q -o -E "^\s*PIDFile\s*=\s*/run/" /etc/systemd/system/dovecot.service 2> /dev/null ) ; then
perl -i -n -p -e "s/^(PIDFile\s*=\/var(\/run\/.+))/#\1\nPIDFile=\2/" /etc/systemd/system/dovecot.service perl -i -n -p -e "s/^(PIDFile\s*=\/var(\/run\/.+))/#\1\nPIDFile=\2/" /etc/systemd/system/dovecot.service
if [[ $? -eq 0 ]]; then if [[ $? -eq 0 ]]; then
echo -e "$rc_done" echo -e "$rc_done"
@ -3081,7 +3081,7 @@ echononl "\tRenew file sql-dict.conf.ext"
if [ "$db_driver" = "pgsql" ]; then if [ "$db_driver" = "pgsql" ]; then
cat <<EOF >/usr/local/dovecot-${_version}/etc/dovecot/sql-dict.conf.ext cat <<EOF >/usr/local/dovecot-${_version}/etc/dovecot/sql-dict.conf.ext
## - if using unix-socket (host=/var/run/postgresql) ensure that ## - if using unix-socket (host=/run/postgresql) ensure that
## - coresponding entries in pg_hba.cof fits ## - coresponding entries in pg_hba.cof fits
## - for example ## - for example
## - local all all md5 ## - local all all md5
@ -3224,7 +3224,7 @@ EOF
echononl "\tRenew file sql-connect.conf.ext" echononl "\tRenew file sql-connect.conf.ext"
cat <<EOF > /usr/local/dovecot-${_version}/etc/dovecot/sql-connect.conf.ext cat <<EOF > /usr/local/dovecot-${_version}/etc/dovecot/sql-connect.conf.ext
driver = $db_driver driver = $db_driver
## - if using unix-socket (host=/var/run/postgresql) ensure that ## - if using unix-socket (host=/run/postgresql) ensure that
## - coresponding entries in pg_hba.cof fits ## - coresponding entries in pg_hba.cof fits
## - for example ## - for example
## - local all all md5 ## - local all all md5
@ -3684,7 +3684,7 @@ fi
## - } ## - }
## - ## -
## - plugin { ## - plugin {
## - #acl_shared_dict = file:/var/run/dovecot/shared-mailboxes.db ## - #acl_shared_dict = file:/run/dovecot/shared-mailboxes.db
## - acl_shared_dict = file:/var/vmail/shared-mailboxes.db ## - acl_shared_dict = file:/var/vmail/shared-mailboxes.db
## - } ## - }
## - ## -
@ -3829,7 +3829,7 @@ if [ "$db_driver" = "pgsql" ]; then
## - adjust/renew file /usr/local/dovecot/etc/dovecot/sql-dict.conf.ext ## - adjust/renew file /usr/local/dovecot/etc/dovecot/sql-dict.conf.ext
## - ## -
cat <<EOF >/usr/local/dovecot-${_version}/etc/dovecot/sql-dict.conf.ext cat <<EOF >/usr/local/dovecot-${_version}/etc/dovecot/sql-dict.conf.ext
## - if using unix-socket (host=/var/run/postgresql) ensure that ## - if using unix-socket (host=/run/postgresql) ensure that
## - coresponding entries in pg_hba.cof fits ## - coresponding entries in pg_hba.cof fits
## - for example ## - for example
## - local all all md5 ## - local all all md5