Skip to content

Commit 1e88ba1

Browse files
committed
Fix missing apt path for z-push installation.
1 parent 68d7233 commit 1e88ba1

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

install/upgrade/0.9.8-29.sh

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ case $(head -n1 /etc/issue | cut -f 1 -d ' ') in
2525
esac
2626

2727
# Detect release for Debian
28-
if [ "$type" = "debian" ]; then
28+
if [ "$os" = "debian" ]; then
2929
release=$(cat /etc/debian_version|grep -o [0-9]|head -n1)
3030
VERSION='debian'
31-
elif [ "$type" = "ubuntu" ]; then
31+
elif [ "$os" = "ubuntu" ]; then
3232
release="$(lsb_release -s -r)"
3333
VERSION='ubuntu'
3434
fi
@@ -86,6 +86,7 @@ fi
8686
# Install and configure z-push
8787
if [ ! -z "$MAIL_SYSTEM" ]; then
8888
echo "(*) Installing Z-Push..."
89+
apt="/etc/apt/sources.list.d"
8990
if [ "$os" = 'ubuntu' ]; then
9091
echo "deb http://repo.z-hub.io/z-push:/final/Ubuntu_$release/ /" > $apt/z-push.list
9192
wget --quiet http://repo.z-hub.io/z-push:/final/Ubuntu_$release/Release.key -O /tmp/z-push_signing.key
@@ -125,7 +126,7 @@ if [ -d $HESTIA/data/templates/ ]; then
125126
fi
126127

127128
# Remove old Office 365 template as there is a newer version with an updated name
128-
if [ -f $HESTIA/data/templates/dns/o365.tpl ]; then
129+
if [ -f $HESTIA/data/templates/dns/o365.tpl ]; then
129130
rm -f $HESTIA/data/templates/dns/o365.tpl
130131
fi
131132

@@ -231,7 +232,7 @@ fi
231232
# Fix exim configuration
232233
if [ -f /etc/exim4/exim4.conf.template ]; then
233234
echo "(*) Updating exim SMTP server configuration..."
234-
cp -f $HESTIA/install/deb/exim/exim4.conf.template /etc/exim4/exim4.conf.template
235+
cp -f $HESTIA/install/deb/exim/exim4.conf.template /etc/exim4/exim4.conf.template
235236
# Reconfigure spam filter and virus scanning
236237
if [ ! -z "$ANTISPAM_SYSTEM" ]; then
237238
sed -i "s/#SPAM/SPAM/g" /etc/exim4/exim4.conf.template
@@ -242,7 +243,7 @@ if [ -f /etc/exim4/exim4.conf.template ]; then
242243
fi
243244

244245
# Add IMAP system variable to configuration if dovecot is installed
245-
if [ -z "$IMAP_SYSTEM" ]; then
246+
if [ -z "$IMAP_SYSTEM" ]; then
246247
if [ -f /usr/bin/dovecot ]; then
247248
echo "(*) Adding missing IMAP_SYSTEM variable to hestia.conf..."
248249
echo "IMAP_SYSTEM = 'dovecot'" >> $HESTIA/conf/hestia.conf
@@ -256,7 +257,7 @@ if [ -f /etc/apache2/conf.d/roundcube.conf ]; then
256257
fi
257258
if [ -f /etc/nginx/conf.d/webmail.inc ]; then
258259
echo "(*) Removing global webmail configuration files for nginx..."
259-
rm -f /etc/nginx/conf.d/webmail.inc
260+
rm -f /etc/nginx/conf.d/webmail.inc
260261
fi
261262
if [ -f /etc/nginx/conf.d/webmail.conf ]; then
262263
echo "(*) Removing global webmail configuration files for nginx..."

0 commit comments

Comments
 (0)