Skip to content

Commit c53bf1a

Browse files
jaapmarcusjaapmarcus
authored
Merge branch 'main' into fix/1767-web-alias-limit-broken
2 parents 7efc500 + e8a962b commit c53bf1a

File tree

16 files changed

+82
-122
lines changed

16 files changed

+82
-122
lines changed

‎bin/v-add-sys-rainloop‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ if [ "$UPDATE" == "no" ]; then
7979
mkdir $RL_CONFIG_DIR
8080

8181
cd "$RL_INSTALL_DIR"
82-
[ ! -f "${RC_INSTALL_DIR}/${RC_FILE}" ] && wget "$RL_URL" --quiet -O "${RL_INSTALL_DIR}/${RL_FILE}"
82+
[ ! -f "${RC_INSTALL_DIR}/${RC_FILE}" ] && wget "$RL_URL" --retry-connrefused --quiet -O "${RL_INSTALL_DIR}/${RL_FILE}"
8383

8484
key=$(openssl rand -hex 4);
8585

‎bin/v-add-sys-roundcube‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ if [ "$UPDATE" == "no" ]; then
8686
mkdir -p $RC_CONFIG_DIR/
8787

8888
cd "$RC_INSTALL_DIR"
89-
[ ! -f "${RC_INSTALL_DIR}/${RC_FILE}" ] && wget "$RC_URL" --quiet -O "${RC_INSTALL_DIR}/${RC_FILE}"
89+
[ ! -f "${RC_INSTALL_DIR}/${RC_FILE}" ] && wget "$RC_URL" --retry-connrefused --quiet -O "${RC_INSTALL_DIR}/${RC_FILE}"
9090

9191
tar xzf $RC_FILE
9292
cp -rf $RC_EXTRACT/* $RC_INSTALL_DIR

‎bin/v-add-web-domain‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,7 @@ check_args '2' "$#" 'USER DOMAIN [IP] [RESTART] [ALIASES] [PROXY_EXTENSIONS]'
5252
is_format_valid 'user' 'domain' 'aliases' 'ip' 'proxy_ext'
5353
is_object_valid 'user' 'USER' "$user"
5454
is_object_unsuspended 'user' 'USER' "$user"
55-
# Make the new aliases are also counted for when creating a new domain.
56-
ALIAS=$aliases
57-
is_package_full 'WEB_DOMAINS'
58-
is_package_full 'WEB_ALIASES'
55+
is_package_full 'WEB_DOMAINS' 'WEB_ALIASES'
5956

6057
if [ "$($BIN/v-list-web-domain $user $domain_utf plain |cut -f 1) " != "$domain" ]; then
6158
is_domain_new 'web' "$domain_utf,$aliases"

‎bin/v-add-web-domain-alias‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ format_aliases
4141
# Verifications #
4242
#----------------------------------------------------------#
4343

44-
# Parsing domain values as they are used to get the current alias usage
45-
46-
4744
if [ -z "$aliases" ]; then
4845
check_result $E_INVALID "invalid alias format: empty"
4946
fi

‎bin/v-delete-mail-domain‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,9 @@ fi
7575

7676
# Delete webmail configuration if it exists
7777
if [ ! -z "$WEB_SYSTEM" ] || [ ! -z "$PROXY_SYSTEM" ]; then
78-
$BIN/v-delete-mail-domain-webmail $user $domain 'yes'
78+
if [ ! -z "$IMAP_SYSTEM" ]; then
79+
$BIN/v-delete-mail-domain-webmail $user $domain 'yes'
80+
fi
7981
fi
8082

8183
#----------------------------------------------------------#

‎func/domain.sh‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -268,10 +268,6 @@ add_web_config() {
268268
rm -f /etc/$1/conf.d/domains/$domain.ssl.conf
269269
ln -s $conf /etc/$1/conf.d/domains/$domain.ssl.conf
270270

271-
# Clear old configurations
272-
rm -f $HOMEDIR/$user/conf/web/$domain.*
273-
rm -f $HOMEDIR/$user/conf/web/ssl.$domain.*
274-
275271
# Rename/Move extra SSL config files
276272
for f in $(ls $HOMEDIR/$user/conf/web/*.$domain.conf* 2>/dev/null); do
277273
if [[ $f =~ .*/s(nginx|apache2)\.$domain\.conf(.*) ]]; then
@@ -287,10 +283,6 @@ add_web_config() {
287283
else
288284
rm -f /etc/$1/conf.d/domains/$domain.conf
289285
ln -s $conf /etc/$1/conf.d/domains/$domain.conf
290-
291-
# Clear old configurations
292-
rm -f $HOMEDIR/$user/conf/web/$domain.*
293-
294286
# Rename/Move extra config files
295287
for f in $(ls $HOMEDIR/$user/conf/web/*.$domain.conf* 2>/dev/null); do
296288
if [[ $f =~ .*/(nginx|apache2)\.$domain\.conf(.*) ]]; then

‎func/main.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ is_system_enabled() {
169169
is_package_full() {
170170
case "$1" in
171171
WEB_DOMAINS) used=$(wc -l $USER_DATA/web.conf);;
172-
WEB_ALIASES) used=$(echo $ALIAS |tr ',' '\n' | wc -l );;
172+
WEB_ALIASES) used=$(echo $aliases |tr ',' '\n' |wc -l);;
173173
DNS_DOMAINS) used=$(wc -l $USER_DATA/dns.conf);;
174174
DNS_RECORDS) used=$(wc -l $USER_DATA/dns/$domain.conf);;
175175
MAIL_DOMAINS) used=$(wc -l $USER_DATA/mail.conf);;

‎install/hst-install-debian.sh‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1201,6 +1201,31 @@ rm /tmp/hst.pem
12011201
# Install dhparam.pem
12021202
cp -f $HESTIA_INSTALL_DIR/ssl/dhparam.pem /etc/ssl
12031203

1204+
# Deleting old admin user
1205+
if [ ! -z "$(grep ^admin: /etc/passwd)" ] && [ "$force" = 'yes' ]; then
1206+
chattr -i /home/admin/conf > /dev/null 2>&1
1207+
userdel -f admin > /dev/null 2>&1
1208+
chattr -i /home/admin/conf > /dev/null 2>&1
1209+
mv -f /home/admin $hst_backups/home/ > /dev/null 2>&1
1210+
rm -f /tmp/sess_* > /dev/null 2>&1
1211+
fi
1212+
if [ ! -z "$(grep ^admin: /etc/group)" ] && [ "$force" = 'yes' ]; then
1213+
groupdel admin > /dev/null 2>&1
1214+
fi
1215+
1216+
# Enable sftp jail
1217+
echo "[ * ] Enable SFTP jail..."
1218+
$HESTIA/bin/v-add-sys-sftp-jail > /dev/null 2>&1
1219+
check_result $? "can't enable sftp jail"
1220+
1221+
# Adding Hestia admin account
1222+
$HESTIA/bin/v-add-user admin $vpass $email default "System Administrator"
1223+
check_result $? "can't create admin user"
1224+
$HESTIA/bin/v-change-user-shell admin nologin
1225+
$HESTIA/bin/v-change-user-role admin admin
1226+
$HESTIA/bin/v-change-user-language admin $lang
1227+
$HESTIA/bin/v-change-sys-config-value 'POLICY_SYSTEM_PROTECTED_ADMIN' 'yes'
1228+
12041229
#----------------------------------------------------------#
12051230
# Configure Nginx #
12061231
#----------------------------------------------------------#
@@ -1422,7 +1447,7 @@ if [ "$mysql" = 'yes' ]; then
14221447
echo "[ * ] Installing phpMyAdmin version v$pma_v..."
14231448

14241449
# Download latest phpmyadmin release
1425-
wget --quiet https://files.phpmyadmin.net/phpMyAdmin/$pma_v/phpMyAdmin-$pma_v-all-languages.tar.gz
1450+
wget --quiet --retry-connrefused https://files.phpmyadmin.net/phpMyAdmin/$pma_v/phpMyAdmin-$pma_v-all-languages.tar.gz
14261451

14271452
# Unpack files
14281453
tar xzf phpMyAdmin-$pma_v-all-languages.tar.gz
@@ -1695,34 +1720,9 @@ else
16951720
fi
16961721

16971722
#----------------------------------------------------------#
1698-
# Configure Admin User #
1723+
# Configure IP #
16991724
#----------------------------------------------------------#
17001725

1701-
# Deleting old admin user
1702-
if [ ! -z "$(grep ^admin: /etc/passwd)" ] && [ "$force" = 'yes' ]; then
1703-
chattr -i /home/admin/conf > /dev/null 2>&1
1704-
userdel -f admin > /dev/null 2>&1
1705-
chattr -i /home/admin/conf > /dev/null 2>&1
1706-
mv -f /home/admin $hst_backups/home/ > /dev/null 2>&1
1707-
rm -f /tmp/sess_* > /dev/null 2>&1
1708-
fi
1709-
if [ ! -z "$(grep ^admin: /etc/group)" ] && [ "$force" = 'yes' ]; then
1710-
groupdel admin > /dev/null 2>&1
1711-
fi
1712-
1713-
# Enable sftp jail
1714-
echo "[ * ] Enable SFTP jail..."
1715-
$HESTIA/bin/v-add-sys-sftp-jail > /dev/null 2>&1
1716-
check_result $? "can't enable sftp jail"
1717-
1718-
# Adding Hestia admin account
1719-
$HESTIA/bin/v-add-user admin $vpass $email default "System Administrator"
1720-
check_result $? "can't create admin user"
1721-
$HESTIA/bin/v-change-user-shell admin nologin
1722-
$HESTIA/bin/v-change-user-role admin admin
1723-
$HESTIA/bin/v-change-user-language admin $lang
1724-
$HESTIA/bin/v-change-sys-config-value 'POLICY_SYSTEM_PROTECTED_ADMIN' 'yes'
1725-
17261726
# Roundcube permissions fix
17271727
if [ "$exim" = 'yes' ] && [ "$mysql" = 'yes' ]; then
17281728
if [ ! -d "/var/log/roundcube" ]; then

‎install/hst-install-ubuntu.sh‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1235,6 +1235,32 @@ fi
12351235
# Install dhparam.pem
12361236
cp -f $HESTIA_INSTALL_DIR/ssl/dhparam.pem /etc/ssl
12371237

1238+
# Deleting old admin user
1239+
if [ ! -z "$(grep ^admin: /etc/passwd)" ] && [ "$force" = 'yes' ]; then
1240+
chattr -i /home/admin/conf > /dev/null 2>&1
1241+
userdel -f admin > /dev/null 2>&1
1242+
chattr -i /home/admin/conf > /dev/null 2>&1
1243+
mv -f /home/admin $hst_backups/home/ > /dev/null 2>&1
1244+
rm -f /tmp/sess_* > /dev/null 2>&1
1245+
fi
1246+
if [ ! -z "$(grep ^admin: /etc/group)" ] && [ "$force" = 'yes' ]; then
1247+
groupdel admin > /dev/null 2>&1
1248+
fi
1249+
1250+
# Enable sftp jail
1251+
echo "[ * ] Enable SFTP jail..."
1252+
$HESTIA/bin/v-add-sys-sftp-jail > /dev/null 2>&1
1253+
check_result $? "can't enable sftp jail"
1254+
1255+
# Adding Hestia admin account
1256+
echo "[ * ] Create admin account..."
1257+
$HESTIA/bin/v-add-user admin $vpass $email default "System Administrator"
1258+
check_result $? "can't create admin user"
1259+
$HESTIA/bin/v-change-user-shell admin nologin
1260+
$HESTIA/bin/v-change-user-role admin admin
1261+
$HESTIA/bin/v-change-user-language admin $lang
1262+
$HESTIA/bin/v-change-sys-config-value 'POLICY_SYSTEM_PROTECTED_ADMIN' 'yes'
1263+
12381264

12391265
#----------------------------------------------------------#
12401266
# Configure Nginx #
@@ -1451,7 +1477,7 @@ if [ "$mysql" = 'yes' ]; then
14511477
echo "[ * ] Installing phpMyAdmin version v$pma_v..."
14521478

14531479
# Download latest phpmyadmin release
1454-
wget --quiet https://files.phpmyadmin.net/phpMyAdmin/$pma_v/phpMyAdmin-$pma_v-all-languages.tar.gz
1480+
wget --retry-connrefused --quiet https://files.phpmyadmin.net/phpMyAdmin/$pma_v/phpMyAdmin-$pma_v-all-languages.tar.gz
14551481

14561482
# Unpack files
14571483
tar xzf phpMyAdmin-$pma_v-all-languages.tar.gz
@@ -1716,35 +1742,9 @@ fi
17161742

17171743

17181744
#----------------------------------------------------------#
1719-
# Configure Admin User #
1745+
# Configure IP #
17201746
#----------------------------------------------------------#
17211747

1722-
# Deleting old admin user
1723-
if [ ! -z "$(grep ^admin: /etc/passwd)" ] && [ "$force" = 'yes' ]; then
1724-
chattr -i /home/admin/conf > /dev/null 2>&1
1725-
userdel -f admin > /dev/null 2>&1
1726-
chattr -i /home/admin/conf > /dev/null 2>&1
1727-
mv -f /home/admin $hst_backups/home/ > /dev/null 2>&1
1728-
rm -f /tmp/sess_* > /dev/null 2>&1
1729-
fi
1730-
if [ ! -z "$(grep ^admin: /etc/group)" ] && [ "$force" = 'yes' ]; then
1731-
groupdel admin > /dev/null 2>&1
1732-
fi
1733-
1734-
# Enable sftp jail
1735-
echo "[ * ] Enable SFTP jail..."
1736-
$HESTIA/bin/v-add-sys-sftp-jail > /dev/null 2>&1
1737-
check_result $? "can't enable sftp jail"
1738-
1739-
# Adding Hestia admin account
1740-
echo "[ * ] Create admin account..."
1741-
$HESTIA/bin/v-add-user admin $vpass $email default "System Administrator"
1742-
check_result $? "can't create admin user"
1743-
$HESTIA/bin/v-change-user-shell admin nologin
1744-
$HESTIA/bin/v-change-user-role admin admin
1745-
$HESTIA/bin/v-change-user-language admin $lang
1746-
$HESTIA/bin/v-change-sys-config-value 'POLICY_SYSTEM_PROTECTED_ADMIN' 'yes'
1747-
17481748
# Configuring system IPs
17491749
$HESTIA/bin/v-update-sys-ip > /dev/null 2>&1
17501750

‎install/upgrade/versions/1.4.0.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ if [ -e "/etc/nginx/nginx.conf" ]; then
1212
if [ -z "$check" ]; then
1313
echo "[ * ] Enabling nginx FastCGI cache support..."
1414
sed -i 's/# Cache bypass/# FastCGI cache\n fastcgi_cache_path \/var\/cache\/nginx\/micro levels=1:2 keys_zone=microcache:10m max_size=1024m inactive=30m;\n fastcgi_cache_key \"$scheme$request_method$host$request_uri\";\n fastcgi_cache_methods GET HEAD;\n fastcgi_cache_use_stale updating error timeout invalid_header http_500 http_503;\n fastcgi_ignore_headers Cache-Control Expires Set-Cookie;\n add_header X-FastCGI-Cache \$upstream_cache_status;\n\n # Cache bypass/g' /etc/nginx/nginx.conf
15-
sed -i 's/ fastcgi_cache_lock_timeout 5s;/ fastcgi_cache_lock_timeout 5s;\n fastcgi_cache_background_update on;\n fastcgi_cache_revalidate on;/g' /root/nginx.conf
16-
15+
sed -i 's/ fastcgi_cache_lock_timeout 5s;/ fastcgi_cache_lock_timeout 5s;\n fastcgi_cache_background_update on;\n fastcgi_cache_revalidate on;/g' /etc/nginx/nginx.conf
1716
fi
1817
fi
1918

@@ -167,6 +166,7 @@ if [ -d "$HESTIA/web/images/webapps/" ]; then
167166
rm -rf $HESTIA/web/src/app/WebApp/Installers/PrestashopSetup.php
168167
rm -rf $HESTIA/web/src/app/WebApp/Installers/SymfonySetup.php
169168
rm -rf $HESTIA/web/src/app/WebApp/Installers/WordpressSetup.php
169+
rm -rf $HESTIA/web/src/app/WebApp/Installers/Joomla
170170
fi
171171

172172

0 commit comments

Comments
 (0)