Skip to content

Commit 9ee4fb6

Browse files
author
Kristan Kenney
committed
Merge branch 'backport-1.0.3' into prerelease
2 parents 1992d6c + e44bfab commit 9ee4fb6

16 files changed

+62
-96
lines changed

‎bin/v-add-mail-domain‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ fi
132132
# Add webmail configuration to mail domain
133133
if [ ! -z "$WEB_SYSTEM" ] || [ ! -z "$PROXY_SYSTEM" ]; then
134134
if [ ! -z "$IMAP_SYSTEM" ]; then
135-
$BIN/v-add-webmail $user $domain ''
135+
$BIN/v-add-sys-webmail $user $domain ''
136136
fi
137137
fi
138138

bin/v-add-webmail renamed to bin/v-add-sys-webmail

File renamed without changes.

‎bin/v-change-sys-webmail‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ NEW_ALIAS=$1
2727
# Delete old webmail configuration
2828
for user in `ls /usr/local/hestia/data/users/`; do
2929
for domain in $($BIN/v-list-web-domains $user plain |cut -f 1); do
30-
$BIN/v-delete-webmail $user $domain
30+
$BIN/v-delete-sys-webmail $user $domain
3131
done
3232
done
3333

@@ -36,7 +36,7 @@ $BIN/v-change-sys-config-value 'WEBMAIL_ALIAS' $NEW_ALIAS
3636

3737
for user in `ls /usr/local/hestia/data/users/`; do
3838
for domain in $($BIN/v-list-web-domains $user plain |cut -f 1); do
39-
$BIN/v-add-webmail $user $domain
39+
$BIN/v-add-sys-webmail $user $domain
4040
done
4141
done
4242

‎bin/v-delete-mail-domain‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ fi
6969

7070
# Delete webmail configuration if it exists
7171
if [ ! -z "$WEB_SYSTEM" ] || [ ! -z "$PROXY_SYSTEM" ]; then
72-
$BIN/v-delete-webmail $user $domain 'yes'
72+
$BIN/v-delete-sys-webmail $user $domain 'yes'
7373
fi
7474

7575
#----------------------------------------------------------#

bin/v-delete-webmail renamed to bin/v-delete-sys-webmail

File renamed without changes.

‎bin/v-list-sys-hestia-updates‎

Lines changed: 34 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ format=${1-shell}
1515
# Includes
1616
source $HESTIA/func/main.sh
1717
source $HESTIA/conf/hestia.conf
18-
fields="\$NAME \$VERSION \$RELEASE \$ARCH \$UPDATED \$DESCR \$TIME \$DATE"
18+
fields="\$NAME \$VERSION \$ARCH \$UPDATED \$DESCR \$TIME \$DATE"
1919

2020
# JSON list function
2121
json_list() {
@@ -27,7 +27,6 @@ json_list() {
2727
eval $str
2828
echo -n ' "'$NAME'": {
2929
"VERSION": "'$VERSION'",
30-
"RELEASE": "'$RELEASE'",
3130
"ARCH": "'$ARCH'",
3231
"UPDATED": "'$UPDATED'",
3332
"DESCR": "'$DESCR'",
@@ -47,11 +46,11 @@ json_list() {
4746
# SHELL list function
4847
shell_list() {
4948
IFS=$'\n'
50-
echo "PKG VER REL ARCH UPDT DATE"
51-
echo "--- --- --- ---- ---- ----"
49+
echo "PKG VER ARCH UPDT DATE"
50+
echo "--- --- ---- ---- ----"
5251
for str in $(echo -e "$data"); do
5352
eval $str
54-
echo "$NAME $VERSION $RELEASE $ARCH $UPDATED $DATE"
53+
echo "$NAME $VERSION $ARCH $UPDATED $DATE"
5554
done
5655
}
5756

@@ -66,71 +65,52 @@ nginx_v=$(apt-cache policy hestia-nginx | grep Candidate | cut -d ':' -f 2 | xar
6665
php_v=$(apt-cache policy hestia-php | grep Candidate | cut -d ':' -f 2 | xargs)
6766

6867
# Checking installed hestia version
69-
if [ -d "/etc/sysconfig" ]; then
70-
rpm_format="VERSION='%{VERSION}'"
71-
rpm_format="$rpm_format RELEASE='%{RELEASE}'"
72-
rpm_format="$rpm_format ARCH='%{ARCH}'"
73-
rpm_format="$rpm_format UTIME='%{INSTALLTIME}'\n"
74-
eval $(rpm --queryformat="$rpm_format" -q hestia)
75-
DATE=$(date -d @$UTIME +%F)
76-
TIME=$(date -d @$UTIME +%T)
77-
else
78-
dpkg_data=$(dpkg-query -s hestia)
79-
pkg_date=$(stat -c "%Y" /var/lib/dpkg/info/hestia.list)
80-
ARCH=$(echo "$dpkg_data"|grep Architecture |cut -f 2 -d ' ')
81-
VERSION=$(echo "$dpkg_data"|grep ^Version |cut -f 2 -d ' '|cut -f 1 -d \-)
82-
RELEASE=$(echo "$dpkg_data"|grep ^Version |cut -f 2 -d ' '|cut -f 2 -d \-)
83-
DATE=$(date -d @$pkg_date +"%F")
84-
TIME=$(date -d @$pkg_date +"%T")
85-
fi
68+
dpkg_data=$(dpkg-query -s hestia)
69+
pkg_date=$(stat -c "%Y" /var/lib/dpkg/info/hestia.list)
70+
ARCH=$(echo "$dpkg_data"|grep Architecture |cut -f 2 -d ' ')
71+
VERSION=$(echo "$dpkg_data"|grep ^Version |cut -f 2 -d ' '|cut -f 1 -d \-)
72+
DATE=$(date -d @$pkg_date +"%F")
73+
TIME=$(date -d @$pkg_date +"%T")
74+
8675
UPDATED='yes'
87-
if [ ! -z "$hesta_v" ] && [ "$hestia_v" \> "$VERSION-$RELEASE" ]; then
76+
if [ ! -z "$hesta_v" ] && [ "$hestia_v" \> "$VERSION" ]; then
8877
UPDATED='no'
8978
fi
90-
data="NAME='hestia' VERSION='$VERSION' RELEASE='$RELEASE' ARCH='$ARCH'"
79+
80+
data="NAME='hestia' VERSION='$VERSION' ARCH='$ARCH'"
9181
data="$data UPDATED='$UPDATED' DESCR='core package' TIME='$TIME' DATE='$DATE'"
9282

9383
# Checking installed hestia-php version
94-
if [ -d "/etc/sysconfig" ]; then
95-
eval $(rpm --queryformat="$rpm_format" -q hestia-php)
96-
DATE=$(date -d @$UTIME +%F)
97-
TIME=$(date -d @$UTIME +%T)
98-
else
99-
dpkg_data=$(dpkg-query -s hestia-php)
100-
pkg_date=$(stat -c "%Y" /var/lib/dpkg/info/hestia-php.list)
101-
ARCH=$(echo "$dpkg_data"|grep Architecture | cut -f 2 -d ' ')
102-
VERSION=$(echo "$dpkg_data"|grep ^Version |cut -f 2 -d ' '|cut -f 1 -d \-)
103-
RELEASE=$(echo "$dpkg_data"|grep ^Version |cut -f 2 -d ' '|cut -f 2 -d \-)
104-
DATE=$(date -d @$pkg_date +"%F")
105-
TIME=$(date -d @$pkg_date +"%T")
106-
fi
84+
dpkg_data=$(dpkg-query -s hestia-php)
85+
pkg_date=$(stat -c "%Y" /var/lib/dpkg/info/hestia-php.list)
86+
ARCH=$(echo "$dpkg_data"|grep Architecture | cut -f 2 -d ' ')
87+
VERSION=$(echo "$dpkg_data"|grep ^Version |cut -f 2 -d ' '|cut -f 1 -d \-)
88+
DATE=$(date -d @$pkg_date +"%F")
89+
TIME=$(date -d @$pkg_date +"%T")
90+
10791
UPDATED='yes'
108-
if [ ! -z "$php_v" ] && [ "$php_v" \> "$VERSION-$RELEASE" ]; then
92+
if [ ! -z "$php_v" ] && [ "$php_v" \> "$VERSION" ]; then
10993
UPDATED='no'
11094
fi
111-
data="$data\nNAME='hestia-php' VERSION='$VERSION' RELEASE='$RELEASE'"
95+
96+
data="$data\nNAME='hestia-php' VERSION='$VERSION'"
11297
data="$data ARCH='$ARCH' UPDATED='$UPDATED' DESCR='php interpreter'"
11398
data="$data TIME='$TIME' DATE='$DATE'"
11499

115100
# Checking installed hestia-nginx version
116-
if [ -d "/etc/sysconfig" ]; then
117-
eval $(rpm --queryformat="$rpm_format" -q hestia-nginx)
118-
DATE=$(date -d @$UTIME +%F)
119-
TIME=$(date -d @$UTIME +%T)
120-
else
121-
dpkg_data=$(dpkg-query -s hestia-nginx)
122-
pkg_date=$(stat -c "%Y" /var/lib/dpkg/info/hestia-nginx.list)
123-
ARCH=$(echo "$dpkg_data"|grep Architecture | cut -f 2 -d ' ')
124-
VERSION=$(echo "$dpkg_data"|grep ^Version |cut -f 2 -d ' '|cut -f 1 -d \-)
125-
RELEASE=$(echo "$dpkg_data"|grep ^Version |cut -f 2 -d ' '|cut -f 2 -d \-)
126-
DATE=$(date -d @$pkg_date +"%F")
127-
TIME=$(date -d @$pkg_date +"%T")
128-
fi
101+
dpkg_data=$(dpkg-query -s hestia-nginx)
102+
pkg_date=$(stat -c "%Y" /var/lib/dpkg/info/hestia-nginx.list)
103+
ARCH=$(echo "$dpkg_data"|grep Architecture | cut -f 2 -d ' ')
104+
VERSION=$(echo "$dpkg_data"|grep ^Version |cut -f 2 -d ' '|cut -f 1 -d \-)
105+
DATE=$(date -d @$pkg_date +"%F")
106+
TIME=$(date -d @$pkg_date +"%T")
107+
129108
UPDATED='yes'
130-
if [ ! -z "$nginx_v" ] && [ "$nginx_v" \> "$VERSION-$RELEASE" ]; then
109+
if [ ! -z "$nginx_v" ] && [ "$nginx_v" \> "$VERSION" ]; then
131110
UPDATED='no'
132111
fi
133-
data="$data\nNAME='hestia-nginx' VERSION='$VERSION' RELEASE='$RELEASE'"
112+
113+
data="$data\nNAME='hestia-nginx' VERSION='$VERSION'"
134114
data="$data ARCH='$ARCH' UPDATED='$UPDATED' DESCR='internal web server'"
135115
data="$data TIME='$TIME' DATE='$DATE'"
136116

‎bin/v-rebuild-mail-domain‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ rebuild_mail_domain_conf
4646
# Rebuild webmail configuration
4747
if [ ! -z "$WEB_SYSTEM" ] || [ ! -z "$PROXY_SYSTEM" ]; then
4848
if [ ! -z "$IMAP_SYSTEM" ]; then
49-
$BIN/v-delete-webmail $user $domain ''
50-
$BIN/v-add-webmail $user $domain ''
49+
$BIN/v-delete-sys-webmail $user $domain ''
50+
$BIN/v-add-sys-webmail $user $domain ''
5151
fi
5252
fi
5353

‎bin/v-rebuild-mail-domains‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ for domain in $(search_objects 'mail' 'SUSPENDED' "*" 'DOMAIN'); do
5050
rebuild_mail_domain_conf
5151
if [ ! -z "$WEB_SYSTEM" ] || [ ! -z "$PROXY_SYSTEM" ]; then
5252
if [ ! -z "$IMAP_SYSTEM" ]; then
53-
$BIN/v-delete-webmail $user $domain ''
54-
$BIN/v-add-webmail $user $domain ''
53+
$BIN/v-delete-sys-webmail $user $domain ''
54+
$BIN/v-add-sys-webmail $user $domain ''
5555
fi
5656
fi
5757
done

‎bin/v-suspend-mail-domain‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ if [[ "$MAIL_SYSTEM" =~ exim ]]; then
4848
fi
4949

5050
# Removing webmail configuration
51-
$BIN/v-delete-webmail $user $domain 'yes'
51+
$BIN/v-delete-sys-webmail $user $domain 'yes'
5252

5353
#----------------------------------------------------------#
5454
# Hestia #

‎bin/v-unsuspend-mail-domain‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ decrease_user_value "$user" '$SUSPENDED_MAIL'
5757

5858
# Enable webmail access
5959
if [ ! -z "$IMAP_SYSTEM" ]; then
60-
$BIN/v-add-webmail $user $domain 'yes'
60+
$BIN/v-add-sys-webmail $user $domain 'yes'
6161
fi
6262
# Logging
6363
log_event "$OK" "$ARGUMENTS"

0 commit comments

Comments
 (0)