Skip to content

Commit 87a0a3e

Browse files
jaapmarcushenri-hulski
jaapmarcus
and
henri-hulski
authored
Feature Deb12 Support (hestiacp#3661)
- Fix spamassassin being renamed to ClamD - Fix bug in v-update-sys-ip on Proxmox - Remove check for gpg.hestiacp.com - Fix interface detection proxmox - Fix changes ssl generation - Fix issue with hestia service and clamav - Enable en_US.UTF-8 - Rename spamassassin to spamd on Deb 12 - Check Exim version instead release from DEB - Fix: Sieve and untaining exim config @henri-hulski - Update repos - Feature: add srs to exim config (hestiacp#3197) @henri-hulski Co-authored-by: Henri Hulski <7619824+henri-hulski@users.noreply.github.com>
1 parent acf7b71 commit 87a0a3e

File tree

17 files changed

+822
-136
lines changed

17 files changed

+822
-136
lines changed

‎.prettierignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
# Web templates (for now)
2424
web/templates/
2525

26+
# Patch files
27+
/install/upgrade/patch/*
28+
2629
# Hestia Nginx.conf
2730
/src/deb/nginx/nginx.conf
2831
/src/rpm/nginx/nginx.conf

‎bin/v-list-sys-config‎

Lines changed: 88 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -26,92 +26,94 @@ source_conf "$HESTIA/conf/hestia.conf"
2626
# JSON list function
2727
json_list() {
2828
echo '{
29-
"config": {
30-
"WEB_SYSTEM": "'$WEB_SYSTEM'",
31-
"WEB_RGROUPS": "'$WEB_RGROUPS'",
32-
"WEB_PORT": "'$WEB_PORT'",
33-
"WEB_SSL": "'$WEB_SSL'",
34-
"WEB_SSL_PORT": "'$WEB_SSL_PORT'",
35-
"WEB_BACKEND": "'$WEB_BACKEND'",
36-
"PROXY_SYSTEM": "'$PROXY_SYSTEM'",
37-
"PROXY_PORT": "'$PROXY_PORT'",
38-
"PROXY_SSL_PORT": "'$PROXY_SSL_PORT'",
39-
"FTP_SYSTEM": "'$FTP_SYSTEM'",
40-
"MAIL_SYSTEM": "'$MAIL_SYSTEM'",
41-
"IMAP_SYSTEM": "'$IMAP_SYSTEM'",
42-
"ANTIVIRUS_SYSTEM": "'$ANTIVIRUS_SYSTEM'",
43-
"ANTISPAM_SYSTEM": "'$ANTISPAM_SYSTEM'",
44-
"DB_SYSTEM": "'$DB_SYSTEM'",
45-
"DNS_SYSTEM": "'$DNS_SYSTEM'",
46-
"DNS_CLUSTER": "'$DNS_CLUSTER'",
47-
"DNS_CLUSTER_SYSTEM": "'$DNS_CLUSTER_SYSTEM'",
48-
"SUPPORT_DNSSEC": "'$SUPPORT_DNSSEC'",
49-
"STATS_SYSTEM": "'$STATS_SYSTEM'",
50-
"BACKUP_SYSTEM": "'$BACKUP_SYSTEM'",
51-
"CRON_SYSTEM": "'$CRON_SYSTEM'",
52-
"DISK_QUOTA": "'$DISK_QUOTA'",
53-
"FIREWALL_SYSTEM": "'$FIREWALL_SYSTEM'",
54-
"FIREWALL_EXTENSION": "'$FIREWALL_EXTENSION'",
55-
"FILE_MANAGER": "'$FILE_MANAGER'",
56-
"REPOSITORY": "'$REPOSITORY'",
57-
"VERSION": "'$VERSION'",
58-
"RELEASE_BRANCH": "'$RELEASE_BRANCH'",
59-
"UPGRADE_SEND_EMAIL": "'$UPGRADE_SEND_EMAIL'",
60-
"UPGRADE_SEND_EMAIL_LOG": "'$UPGRADE_SEND_EMAIL_LOG'",
61-
"SMTP_RELAY": "'$SMTP_RELAY'",
62-
"SMTP_RELAY_HOST": "'$SMTP_RELAY_HOST'",
63-
"SMTP_RELAY_PORT": "'$SMTP_RELAY_PORT'",
64-
"SMTP_RELAY_USER": "'$SMTP_RELAY_USER'",
65-
"DEMO_MODE": "'$DEMO_MODE'",
66-
"THEME": "'$THEME'",
67-
"LANGUAGE": "'$LANGUAGE'",
68-
"BACKUP_GZIP": "'$BACKUP_GZIP'",
69-
"BACKUP": "'$BACKUP'",
70-
"BACKUP_MODE": "'$BACKUP_MODE'",
71-
"WEBMAIL_ALIAS": "'$WEBMAIL_ALIAS'",
72-
"WEBMAIL_SYSTEM": "'$WEBMAIL_SYSTEM'",
73-
"DB_PMA_ALIAS": "'$DB_PMA_ALIAS'",
74-
"DB_PGA_ALIAS": "'$DB_PGA_ALIAS'",
75-
"LOGIN_STYLE": "'$LOGIN_STYLE'",
76-
"INACTIVE_SESSION_TIMEOUT": "'$INACTIVE_SESSION_TIMEOUT'",
77-
"PHPMYADMIN_KEY": "'$PHPMYADMIN_KEY'",
78-
"ENFORCE_SUBDOMAIN_OWNERSHIP": "'$ENFORCE_SUBDOMAIN_OWNERSHIP'",
79-
"DEBUG_MODE": "'$DEBUG_MODE'",
80-
"API": "'$API'",
81-
"API_SYSTEM": "'$API_SYSTEM'",
82-
"API_ALLOWED_IP": "'$API_ALLOWED_IP'",
83-
"UPDATE_AVAILABLE": "'$UPDATE_AVAILABLE'",
84-
"PLUGIN_APP_INSTALLER": "'$PLUGIN_APP_INSTALLER'",
85-
"PLUGIN_FILE_MANAGER": "'$PLUGIN_FILE_MANAGER'",
86-
"POLICY_SYSTEM_ENABLE_BACON": "'$POLICY_SYSTEM_ENABLE_BACON'",
87-
"POLICY_SYSTEM_PROTECTED_ADMIN": "'$POLICY_SYSTEM_PROTECTED_ADMIN'",
88-
"POLICY_SYSTEM_HIDE_ADMIN": "'$POLICY_SYSTEM_HIDE_ADMIN'",
89-
"POLICY_SYSTEM_HIDE_SERVICES": "'$POLICY_SYSTEM_HIDE_SERVICES'",
90-
"POLICY_SYSTEM_PASSWORD_RESET": "'$POLICY_SYSTEM_PASSWORD_RESET'",
91-
"POLICY_USER_VIEW_SUSPENDED": "'$POLICY_USER_VIEW_SUSPENDED'",
92-
"POLICY_USER_EDIT_DETAILS": "'$POLICY_USER_EDIT_DETAILS'",
93-
"POLICY_USER_EDIT_WEB_TEMPLATES": "'$POLICY_USER_EDIT_WEB_TEMPLATES'",
94-
"POLICY_USER_EDIT_DNS_TEMPLATES": "'$POLICY_USER_EDIT_DNS_TEMPLATES'",
95-
"POLICY_USER_DELETE_LOGS": "'$POLICY_USER_DELETE_LOGS'",
96-
"POLICY_USER_VIEW_LOGS": "'$POLICY_USER_VIEW_LOGS'",
97-
"POLICY_USER_CHANGE_THEME": "'$POLICY_USER_CHANGE_THEME'",
98-
"POLICY_CSRF_STRICTNESS": "'$POLICY_CSRF_STRICTNESS'",
99-
"USE_SERVER_SMTP": "'$USE_SERVER_SMTP'",
100-
"SERVER_SMTP_HOST": "'$SERVER_SMTP_HOST'",
101-
"SERVER_SMTP_PORT": "'$SERVER_SMTP_PORT'",
102-
"SERVER_SMTP_SECURITY": "'$SERVER_SMTP_SECURITY'",
103-
"SERVER_SMTP_USER": "'$SERVER_SMTP_USER'",
104-
"SERVER_SMTP_PASSWD": "'$SERVER_SMTP_PASSWD'",
105-
"SERVER_SMTP_ADDR": "'$SERVER_SMTP_ADDR'",
106-
"DISABLE_IP_CHECK": "'$DISABLE_IP_CHECK'",
107-
"FROM_NAME": "'$FROM_NAME'",
108-
"FROM_EMAIL": "'$FROM_EMAIL'",
109-
"APP_NAME": "'$APP_NAME'",
110-
"TITLE": "'$TITLE'",
111-
"SUBJECT_EMAIL": "'$SUBJECT_EMAIL'",
112-
"HIDE_DOCS": "'$HIDE_DOCS'"
113-
}
114-
}'
29+
"config": {
30+
"WEB_SYSTEM": "'$WEB_SYSTEM'",
31+
"WEB_RGROUPS": "'$WEB_RGROUPS'",
32+
"WEB_PORT": "'$WEB_PORT'",
33+
"WEB_SSL": "'$WEB_SSL'",
34+
"WEB_SSL_PORT": "'$WEB_SSL_PORT'",
35+
"WEB_BACKEND": "'$WEB_BACKEND'",
36+
"PROXY_SYSTEM": "'$PROXY_SYSTEM'",
37+
"PROXY_PORT": "'$PROXY_PORT'",
38+
"PROXY_SSL_PORT": "'$PROXY_SSL_PORT'",
39+
"FTP_SYSTEM": "'$FTP_SYSTEM'",
40+
"MAIL_SYSTEM": "'$MAIL_SYSTEM'",
41+
"IMAP_SYSTEM": "'$IMAP_SYSTEM'",
42+
"ANTIVIRUS_SYSTEM": "'$ANTIVIRUS_SYSTEM'",
43+
"ANTISPAM_SYSTEM": "'$ANTISPAM_SYSTEM'",
44+
"DB_SYSTEM": "'$DB_SYSTEM'",
45+
"DNS_SYSTEM": "'$DNS_SYSTEM'",
46+
"DNS_CLUSTER": "'$DNS_CLUSTER'",
47+
"DNS_CLUSTER_SYSTEM": "'$DNS_CLUSTER_SYSTEM'",
48+
"SUPPORT_DNSSEC": "'$SUPPORT_DNSSEC'",
49+
"STATS_SYSTEM": "'$STATS_SYSTEM'",
50+
"BACKUP_SYSTEM": "'$BACKUP_SYSTEM'",
51+
"CRON_SYSTEM": "'$CRON_SYSTEM'",
52+
"DISK_QUOTA": "'$DISK_QUOTA'",
53+
"FIREWALL_SYSTEM": "'$FIREWALL_SYSTEM'",
54+
"FIREWALL_EXTENSION": "'$FIREWALL_EXTENSION'",
55+
"FILE_MANAGER": "'$FILE_MANAGER'",
56+
"REPOSITORY": "'$REPOSITORY'",
57+
"VERSION": "'$VERSION'",
58+
"RELEASE_BRANCH": "'$RELEASE_BRANCH'",
59+
"UPGRADE_SEND_EMAIL": "'$UPGRADE_SEND_EMAIL'",
60+
"UPGRADE_SEND_EMAIL_LOG": "'$UPGRADE_SEND_EMAIL_LOG'",
61+
"SMTP_RELAY": "'$SMTP_RELAY'",
62+
"SMTP_RELAY_HOST": "'$SMTP_RELAY_HOST'",
63+
"SMTP_RELAY_PORT": "'$SMTP_RELAY_PORT'",
64+
"SMTP_RELAY_USER": "'$SMTP_RELAY_USER'",
65+
"DEMO_MODE": "'$DEMO_MODE'",
66+
"THEME": "'$THEME'",
67+
"LANGUAGE": "'$LANGUAGE'",
68+
"BACKUP_GZIP": "'$BACKUP_GZIP'",
69+
"BACKUP": "'$BACKUP'",
70+
"BACKUP_MODE": "'$BACKUP_MODE'",
71+
"WEBMAIL_ALIAS": "'$WEBMAIL_ALIAS'",
72+
"WEBMAIL_SYSTEM": "'$WEBMAIL_SYSTEM'",
73+
"DB_PMA_ALIAS": "'$DB_PMA_ALIAS'",
74+
"DB_PGA_ALIAS": "'$DB_PGA_ALIAS'",
75+
"LOGIN_STYLE": "'$LOGIN_STYLE'",
76+
"INACTIVE_SESSION_TIMEOUT": "'$INACTIVE_SESSION_TIMEOUT'",
77+
"PHPMYADMIN_KEY": "'$PHPMYADMIN_KEY'",
78+
"ENFORCE_SUBDOMAIN_OWNERSHIP": "'$ENFORCE_SUBDOMAIN_OWNERSHIP'",
79+
"DEBUG_MODE": "'$DEBUG_MODE'",
80+
"API": "'$API'",
81+
"API_SYSTEM": "'$API_SYSTEM'",
82+
"API_ALLOWED_IP": "'$API_ALLOWED_IP'",
83+
"UPDATE_AVAILABLE": "'$UPDATE_AVAILABLE'",
84+
"PLUGIN_APP_INSTALLER": "'$PLUGIN_APP_INSTALLER'",
85+
"PLUGIN_FILE_MANAGER": "'$PLUGIN_FILE_MANAGER'",
86+
"POLICY_SYSTEM_ENABLE_BACON": "'$POLICY_SYSTEM_ENABLE_BACON'",
87+
"POLICY_SYSTEM_PROTECTED_ADMIN": "'$POLICY_SYSTEM_PROTECTED_ADMIN'",
88+
"POLICY_SYSTEM_HIDE_ADMIN": "'$POLICY_SYSTEM_HIDE_ADMIN'",
89+
"POLICY_SYSTEM_HIDE_SERVICES": "'$POLICY_SYSTEM_HIDE_SERVICES'",
90+
"POLICY_SYSTEM_PASSWORD_RESET": "'$POLICY_SYSTEM_PASSWORD_RESET'",
91+
"POLICY_USER_VIEW_SUSPENDED": "'$POLICY_USER_VIEW_SUSPENDED'",
92+
"POLICY_USER_EDIT_DETAILS": "'$POLICY_USER_EDIT_DETAILS'",
93+
"POLICY_USER_EDIT_WEB_TEMPLATES": "'$POLICY_USER_EDIT_WEB_TEMPLATES'",
94+
"POLICY_USER_EDIT_DNS_TEMPLATES": "'$POLICY_USER_EDIT_DNS_TEMPLATES'",
95+
"POLICY_USER_DELETE_LOGS": "'$POLICY_USER_DELETE_LOGS'",
96+
"POLICY_USER_VIEW_LOGS": "'$POLICY_USER_VIEW_LOGS'",
97+
"POLICY_USER_CHANGE_THEME": "'$POLICY_USER_CHANGE_THEME'",
98+
"POLICY_CSRF_STRICTNESS": "'$POLICY_CSRF_STRICTNESS'",
99+
"POLICY_SYNC_SKELETON": "'$POLICY_SYNC_SKELETON'",
100+
"POLICY_SYNC_ERROR_DOCUMENTS": "'$POLICY_SYNC_ERROR_DOCUMENTS'",
101+
"USE_SERVER_SMTP": "'$USE_SERVER_SMTP'",
102+
"SERVER_SMTP_HOST": "'$SERVER_SMTP_HOST'",
103+
"SERVER_SMTP_PORT": "'$SERVER_SMTP_PORT'",
104+
"SERVER_SMTP_SECURITY": "'$SERVER_SMTP_SECURITY'",
105+
"SERVER_SMTP_USER": "'$SERVER_SMTP_USER'",
106+
"SERVER_SMTP_PASSWD": "'$SERVER_SMTP_PASSWD'",
107+
"SERVER_SMTP_ADDR": "'$SERVER_SMTP_ADDR'",
108+
"DISABLE_IP_CHECK": "'$DISABLE_IP_CHECK'",
109+
"FROM_NAME": "'$FROM_NAME'",
110+
"FROM_EMAIL": "'$FROM_EMAIL'",
111+
"APP_NAME": "'$APP_NAME'",
112+
"TITLE": "'$TITLE'",
113+
"SUBJECT_EMAIL": "'$SUBJECT_EMAIL'",
114+
"HIDE_DOCS": "'$HIDE_DOCS'"
115+
}
116+
}'
115117
}
116118

117119
# Shell list

‎bin/v-list-sys-interfaces‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ csv_list() {
6969
# Defining interface list
7070
# Detect "physical" NICs only (virtual NICs created by Docker, WireGuard etc. are excluded)
7171
physical_nics="$(ip -d -j link show | jq -r '.[] | if .link_type == "loopback" // .linkinfo.info_kind then empty else .ifname end')"
72+
if [ -z "$physical_nics" ]; then
73+
physical_nics="$(ip -d -j link show | jq -r '.[] | if .link_type == "loopback" then empty else .ifname end')"
74+
fi
7275

7376
# Listing data
7477
case $format in

‎bin/v-update-sys-ip‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ check_hestia_demo_mode
3838
# Detect "physical" NICs only (virtual NICs created by Docker, WireGuard etc. are excluded)
3939
physical_nics="$(ip -d -j link show | jq -r '.[] | if .link_type == "loopback" // .linkinfo.info_kind then empty else .ifname end')"
4040

41+
# Proxmox return empty value for $physical_nics.
42+
if [ -z "$physical_nics" ]; then
43+
physical_nics="$(ip -d -j link show | jq -r '.[] | if .link_type == "loopback" then empty else .ifname end')"
44+
fi
45+
4146
for nic in $physical_nics; do
4247
nic_ipv4s="$(ip -4 -d -j addr show "$nic" | jq -r '.[].addr_info[] | if .scope == "global" then .local else empty end')"
4348
if [ -z "$ips" ]; then

‎docs/docs/contributing/building.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Any option can be appended to the installer command. [See the complete list](../
4141

4242
```bash
4343
# Only Hestia
44-
./scr/hst_autocompile.sh --hestia --noinstall --keepbuild '~localsrc'
44+
./hst_autocompile.sh --hestia --noinstall --keepbuild '~localsrc'
4545
```
4646

4747
```bash

‎func/main.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1027,6 +1027,10 @@ is_int_format_valid() {
10271027
is_interface_format_valid() {
10281028
# Detect "physical" NICs only (virtual NICs created by Docker, WireGuard etc. are excluded)
10291029
nic_names="$(ip -d -j link show | jq -r '.[] | if .link_type == "loopback" // .linkinfo.info_kind then empty else .ifname, if .altnames then .altnames[] else empty end end')"
1030+
# Proxmox return empty value for $physical_nics
1031+
if [ -z "$nic_names" ]; then
1032+
nic_names="$(ip -d -j link show | jq -r '.[] | if .link_type == "loopback" then empty else .ifname, if .altnames then .altnames[] else empty end end')"
1033+
fi
10301034
if [ -z "$(echo "$nic_names" | grep -x "$1")" ]; then
10311035
check_result "$E_INVALID" "invalid interface format :: $1"
10321036
fi

‎func/syshealth.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,8 +339,8 @@ function syshealth_repair_system_config() {
339339

340340
# Enforce subdomain ownership
341341
if [[ -z $(check_key_exists 'ENFORCE_SUBDOMAIN_OWNERSHIP') ]]; then
342-
echo "[ ! ] Adding missing variable to hestia.conf: ENFORCE_SUBDOMAIN_OWNERSHIP ('no')"
343-
$BIN/v-change-sys-config-value "ENFORCE_SUBDOMAIN_OWNERSHIP" "no"
342+
echo "[ ! ] Adding missing variable to hestia.conf: ENFORCE_SUBDOMAIN_OWNERSHIP ('yes')"
343+
$BIN/v-change-sys-config-value "ENFORCE_SUBDOMAIN_OWNERSHIP" "yes"
344344
fi
345345

346346
if [[ -z $(check_key_exists 'API') ]]; then

0 commit comments

Comments
 (0)