Skip to content

Commit 2835c1e

Browse files
jaapmarcusScIT-Raphael
jaapmarcus
and
ScIT-Raphael
authored
[Fix] Small changes (hestiacp#2646)
* idn2 convert all urls to lowercase It might be expected that a user want to redirect to https://discord.gg/InviteLink and expect uppercase * Exclude 22.04 from mariadb repo due to lack of support Fall back on OS repo * Remove duplicated code Checks are also ran in format_domain * Fix error when roundcube is missing * Adjust code format * Adjust code format Co-authored-by: Raphael <rs@scit.ch>
1 parent fa5e843 commit 2835c1e

4 files changed

Lines changed: 32 additions & 41 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# Argument definition
1919
user=$1
2020
domain=$2
21-
redirect=$(echo $3 | idn2);
21+
redirect=$3
2222
code=${4-301}
2323
restart=${5-no}
2424

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,6 @@ ssl_dir=$3
2222
ssl_home=${4-same}
2323
restart="$5"
2424

25-
# Additional argument formatting
26-
if [[ "$domain" =~ [[:upper:]] ]]; then
27-
domain=$(echo "$domain" |tr '[:upper:]' '[:lower:]')
28-
fi
29-
if [[ "$domain" =~ ^www\..* ]]; then
30-
domain=$(echo "$domain" |sed -e "s/^www.//")
31-
fi
32-
if [[ "$domain" =~ .*\.$ ]]; then
33-
domain=$(echo "$domain" |sed -e "s/\.$//")
34-
fi
35-
3625
domain=$domain
3726
domain_idn=$(idn2 --quiet "$domain")
3827

‎install/hst-install-debian.sh‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1828,26 +1828,23 @@ if [ "$sieve" = 'yes' ]; then
18281828

18291829
# exim4 install
18301830
sed -i "s/\stransport = local_delivery/ transport = dovecot_virtual_delivery/" /etc/exim4/exim4.conf.template
1831-
1832-
sed -i "s/address_pipe:/dovecot_virtual_delivery:\n driver = pipe\n command = \/usr\/lib\/dovecot\/dovecot-lda -e -d \$local_part@\$domain -f \$sender_address -a \$original_local_part@\$original_domain\n delivery_date_add\n envelope_to_add\n return_path_add\n log_output = true\n log_defer_output = true\n user = \${extract{2}{:}{\${lookup{\$local_part}lsearch{\/etc\/exim4\/domains\/\${lookup{\$domain}dsearch{\/etc\/exim4\/domains\/}}\/passwd}}}}\n group = mail\n return_output\n\naddress_pipe:/g" /etc/exim4/exim4.conf.template
1833-
1834-
1835-
# Modify Roundcube install
1836-
mkdir -p $RC_CONFIG_DIR/plugins/managesieve
1837-
1838-
cp -f $HESTIA_INSTALL_DIR/roundcube/plugins/config_managesieve.inc.php $RC_CONFIG_DIR/plugins/managesieve/config.inc.php
1839-
ln -s $RC_CONFIG_DIR/plugins/managesieve/config.inc.php $RC_INSTALL_DIR/plugins/managesieve/config.inc.php
1831+
sed -i "s/address_pipe:/dovecot_virtual_delivery:\n driver = pipe\n command = \/usr\/lib\/dovecot\/dovecot-lda -e -d \$local_part@\$domain -f \$sender_address -a \$original_local_part@\$original_domain\n delivery_date_add\n envelope_to_add\n return_path_add\n log_output = true\n log_defer_output = true\n user = \${extract{2}{:}{\${lookup{\$local_part}lsearch{\/etc\/exim4\/domains\/\${lookup{\$domain}dsearch{\/etc\/exim4\/domains\/}}\/passwd}}}}\n group = mail\n return_output\n\naddress_pipe:/g" /etc/exim4/exim4.conf.template
18401832

18411833
# Permission changes
18421834
chown -R dovecot:mail /var/log/dovecot.log
18431835
chmod 660 /var/log/dovecot.log
1844-
chown -R root:www-data $RC_CONFIG_DIR/
1845-
chmod 751 -R $RC_CONFIG_DIR
1846-
chmod 644 $RC_CONFIG_DIR/*.php
1847-
chmod 644 $RC_CONFIG_DIR/plugins/managesieve/config.inc.php
1848-
1849-
sed -i "s/'archive'/'archive', 'managesieve'/g" $RC_CONFIG_DIR/config.inc.php
1850-
1836+
1837+
if [ -d "/var/lib/roundcube" ]; then
1838+
# Modify Roundcube config
1839+
mkdir -p $RC_CONFIG_DIR/plugins/managesieve
1840+
cp -f $HESTIA_INSTALL_DIR/roundcube/plugins/config_managesieve.inc.php $RC_CONFIG_DIR/plugins/managesieve/config.inc.php
1841+
ln -s $RC_CONFIG_DIR/plugins/managesieve/config.inc.php $RC_INSTALL_DIR/plugins/managesieve/config.inc.php\
1842+
chown -R root:www-data $RC_CONFIG_DIR/
1843+
chmod 751 -R $RC_CONFIG_DIR
1844+
chmod 644 $RC_CONFIG_DIR/*.php
1845+
chmod 644 $RC_CONFIG_DIR/plugins/managesieve/config.inc.php
1846+
sed -i "s/'archive'/'archive', 'managesieve'/g" $RC_CONFIG_DIR/config.inc.php
1847+
fi
18511848
# Restart Dovecot and exim4
18521849
systemctl restart dovecot > /dev/null 2>&1
18531850
systemctl restart exim4 > /dev/null 2>&1

‎install/hst-install-ubuntu.sh‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -698,8 +698,12 @@ fi
698698
# Installing MariaDB repo
699699
if [ "$mysql" = 'yes' ]; then
700700
echo "[ * ] MariaDB"
701-
echo "deb [arch=$ARCH signed-by=/usr/share/keyrings/mariadb-keyring.gpg] https://dlm.mariadb.com/repo/mariadb-server/$mariadb_v/repo/$VERSION $codename main" > $apt/mariadb.list
702-
curl -s https://mariadb.org/mariadb_release_signing_key.asc | gpg --dearmor | tee /usr/share/keyrings/mariadb-keyring.gpg >/dev/null 2>&1
701+
if [ "$release" != '22.04' ]; then
702+
echo "deb [arch=$ARCH signed-by=/usr/share/keyrings/mariadb-keyring.gpg] https://dlm.mariadb.com/repo/mariadb-server/$mariadb_v/repo/$VERSION $codename main" > $apt/mariadb.list
703+
else
704+
echo "#deb [arch=$ARCH signed-by=/usr/share/keyrings/mariadb-keyring.gpg] https://dlm.mariadb.com/repo/mariadb-server/$mariadb_v/repo/$VERSION $codename main" > $apt/mariadb.list
705+
fi
706+
curl -s https://mariadb.org/mariadb_release_signing_key.asc | gpg --dearmor | tee /usr/share/keyrings/mariadb-keyring.gpg >/dev/null 2>&1
703707
fi
704708

705709
# Installing HestiaCP repo
@@ -1888,22 +1892,23 @@ if [ "$sieve" = 'yes' ]; then
18881892

18891893
# exim4 install
18901894
sed -i "s/\stransport = local_delivery/ transport = dovecot_virtual_delivery/" /etc/exim4/exim4.conf.template
1891-
18921895
sed -i "s/address_pipe:/dovecot_virtual_delivery:\n driver = pipe\n command = \/usr\/lib\/dovecot\/dovecot-lda -e -d \$local_part@\$domain -f \$sender_address -a \$original_local_part@\$original_domain\n delivery_date_add\n envelope_to_add\n return_path_add\n log_output = true\n log_defer_output = true\n user = \${extract{2}{:}{\${lookup{\$local_part}lsearch{\/etc\/exim4\/domains\/\${lookup{\$domain}dsearch{\/etc\/exim4\/domains\/}}\/passwd}}}}\n group = mail\n return_output\n\naddress_pipe:/g" /etc/exim4/exim4.conf.template
18931896

1894-
# Modify Roundcube install
1895-
mkdir -p $RC_CONFIG_DIR/plugins/managesieve
1896-
1897-
cp -f $HESTIA_INSTALL_DIR/roundcube/plugins/config_managesieve.inc.php $RC_CONFIG_DIR/plugins/managesieve/config.inc.php
1898-
ln -s $RC_CONFIG_DIR/plugins/managesieve/config.inc.php $RC_INSTALL_DIR/plugins/managesieve/config.inc.php
1899-
19001897
# Permission changes
19011898
chown -R dovecot:mail /var/log/dovecot.log
19021899
chmod 660 /var/log/dovecot.log
1903-
chown -R root:www-data $RC_CONFIG_DIR/
1904-
chmod 751 -R $RC_CONFIG_DIR
1905-
chmod 644 $RC_CONFIG_DIR/*.php
1906-
chmod 644 $RC_CONFIG_DIR/plugins/managesieve/config.inc.php
1900+
1901+
if [ -d "/var/lib/roundcube" ]; then
1902+
# Modify Roundcube config
1903+
mkdir -p $RC_CONFIG_DIR/plugins/managesieve
1904+
cp -f $HESTIA_INSTALL_DIR/roundcube/plugins/config_managesieve.inc.php $RC_CONFIG_DIR/plugins/managesieve/config.inc.php
1905+
ln -s $RC_CONFIG_DIR/plugins/managesieve/config.inc.php $RC_INSTALL_DIR/plugins/managesieve/config.inc.php\
1906+
chown -R root:www-data $RC_CONFIG_DIR/
1907+
chmod 751 -R $RC_CONFIG_DIR
1908+
chmod 644 $RC_CONFIG_DIR/*.php
1909+
chmod 644 $RC_CONFIG_DIR/plugins/managesieve/config.inc.php
1910+
sed -i "s/'archive'/'archive', 'managesieve'/g" $RC_CONFIG_DIR/config.inc.php
1911+
fi
19071912

19081913
sed -i "s/'archive'/'archive', 'managesieve'/g" $RC_CONFIG_DIR/config.inc.php
19091914

0 commit comments

Comments
 (0)