Skip to content

Commit c7b6b6c

Browse files
jaapmarcusjaapmarcus
committed
Merge branch 'main' into conf-updates
Resolve conflict
2 parents 914f355 + 8c08d07 commit c7b6b6c

File tree

10 files changed

+73
-45
lines changed

10 files changed

+73
-45
lines changed

‎bin/v-delete-web-domain‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ fi
6767

6868
# Deleting web backend
6969
if [ ! -z "$WEB_BACKEND" ]; then
70-
$BIN/v-delete-web-domain-backend $user $domain $restart
70+
$BIN/v-delete-web-domain-backend $user $domain 'no'
7171
fi
7272

7373
# Deleting vhost configuration
@@ -142,10 +142,14 @@ fi
142142
$BIN/v-restart-web $restart
143143
check_result $? "Web restart failed" >/dev/null
144144

145-
# Restartinh proxy server
145+
# Restarting proxy server
146146
$BIN/v-restart-proxy $restart
147147
check_result $? "Proxy restart failed" >/dev/null
148148

149+
# Restarting backend server
150+
$BIN/v-restart-web-backend $restart
151+
check_result $? "Backend restart failed" >/dev/null
152+
149153
# Logging
150154
$BIN/v-log-action "$user" "Info" "Web" "Deleted web domain (Name: $domain)."
151155
log_event "$OK" "$ARGUMENTS"

‎install/deb/firewall/ipset/blacklist.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ BLACKLISTS=(
88
"https://www.projecthoneypot.org/list_of_ips.php?t=d&rss=1" # Project Honey Pot Directory of Dictionary Attacker IPs
99
"https://check.torproject.org/cgi-bin/TorBulkExitList.py?ip=1.1.1.1" # TOR Exit Nodes
1010
"https://www.maxmind.com/en/high-risk-ip-sample-list" # MaxMind GeoIP Anonymous Proxies
11-
"http://danger.rulez.sk/projects/bruteforceblocker/blist.php" # BruteForceBlocker IP List
1211
"https://www.spamhaus.org/drop/drop.lasso" # Spamhaus Don't Route Or Peer List (DROP)
1312
"https://cinsscore.com/list/ci-badguys.txt" # C.I. Army Malicious IP List
1413
"https://lists.blocklist.de/lists/all.txt" # blocklist.de attackers

‎install/deb/templates/mail/nginx/default_rainloop.stpl‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ ssl_certificate_key %ssl_key%;
1111
ssl_stapling on;
1212
ssl_stapling_verify on;
1313

14+
location ^~ /data {
15+
deny all;
16+
return 404;
17+
}
18+
1419
location ~ ^/(README.md|config|temp|logs|bin|SQL|INSTALL|LICENSE|CHANGELOG|UPGRADING)$ {
1520
deny all;
1621
return 404;

‎install/deb/templates/mail/nginx/default_rainloop.tpl‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,12 @@ location ~ /\.(?!well-known\/) {
1313
return 404;
1414
}
1515

16-
location ~ /data/ {
16+
location ^~ /data {
17+
deny all;
18+
return 404;
19+
}
20+
21+
location ~ ^/(README.md|config|temp|logs|bin|SQL|INSTALL|LICENSE|CHANGELOG|UPGRADING)$ {
1722
deny all;
1823
return 404;
1924
}

‎install/deb/templates/mail/nginx/rainloop.stpl‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ location ~ /\.(?!well-known\/) {
1616
return 404;
1717
}
1818

19+
location ^~ /data {
20+
deny all;
21+
return 404;
22+
}
23+
1924
location ~ ^/(README.md|config|temp|logs|bin|SQL|INSTALL|LICENSE|CHANGELOG|UPGRADING)$ {
2025
deny all;
2126
return 404;

‎install/deb/templates/mail/nginx/rainloop.tpl‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ location ~ /\.(?!well-known\/) {
1313
return 404;
1414
}
1515

16+
location ^~ /data {
17+
deny all;
18+
return 404;
19+
}
20+
1621
location ~ ^/(README.md|config|temp|logs|bin|SQL|INSTALL|LICENSE|CHANGELOG|UPGRADING)$ {
1722
deny all;
1823
return 404;

‎install/upgrade/versions/1.4.0.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,10 @@ if [ -f "/etc/clamav/clamd.conf" ]; then
185185
$HESTIA/bin/v-add-user-notification admin 'ClamAV config has been overwritten' 'Warning: If you have manualy changed /etc/clamav/clamd.conf and any changes you made will be lost an backup has been created in the /root/hst_backups folder with the original config. If you have not changed the config file you can ignore this message'
186186
fi
187187

188+
if [ -f "$HESTIA/data/firewall/ipset/blacklist.sh" ]; then
189+
sed -i '/BruteForceBlocker/d' $HESTIA/data/firewall/ipset/blacklist.sh
190+
fi
191+
188192
##### COMMANDS FOR V1.5.X
189193

190194
# Back up default package and install latest version

‎web/bulk/web/index.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
exec (HESTIA_CMD."v-restart-web", $output, $return_var);
4646
exec (HESTIA_CMD."v-restart-proxy", $output, $return_var);
4747
exec (HESTIA_CMD."v-restart-dns", $output, $return_var);
48+
exec (HESTIA_CMD."v-restart-web-backend", $output, $return_var);
4849
}
4950

5051
header("Location: /list/web/");

‎web/delete/web/index.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
if (!empty($_GET['domain'])) {
2020
$v_username = escapeshellarg($user);
2121
$v_domain = escapeshellarg($_GET['domain']);
22-
exec (HESTIA_CMD."v-delete-web-domain ".$v_username." ".$v_domain, $output, $return_var);
22+
exec (HESTIA_CMD."v-delete-web-domain ".$v_username." ".$v_domain." 'yes'", $output, $return_var);
2323
check_return_code($return_var,$output);
2424
unset($output);
2525
}

‎web/templates/pages/edit_server.html‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -332,10 +332,10 @@
332332
</tr>
333333
<tr>
334334
<td class="vst-text">
335-
<?=_('DNS Cluster');?>: <span class="optional"><?php if ($v_dns_cluster == 'yes') { echo 'Yes'; } else { echo 'No'; } ?></span>
335+
<?=_('DNS Cluster');?>: <span class="optional"><?php if ($v_dns_cluster == 'yes') { echo _('Yes'); } else { echo _('No'); } ?></span>
336336
</td>
337337
</tr>
338-
<?php if ($v_dns_cluster = 'yes') {
338+
<?php if ($v_dns_cluster == 'yes') {
339339
$i = 0;
340340
foreach ($dns_cluster as $key => $value) {
341341
$i++;
@@ -482,8 +482,8 @@
482482
<tr>
483483
<td>
484484
<select class="vst-list" name="v_mysql" disabled>
485-
<option value='no'><?=_('no'); ?></option>
486-
<option value='yes' <?php if($v_mysql == 'yes') echo 'selected' ?>><?=_('yes'); ?></option>
485+
<option value='no'><?=_('No'); ?></option>
486+
<option value='yes' <?php if($v_mysql == 'yes') echo 'selected' ?>><?=_('Yes'); ?></option>
487487
</select>
488488
<br><br>
489489
</td>
@@ -582,8 +582,8 @@
582582
<tr>
583583
<td>
584584
<select class="vst-list" name="v_pgsql" disabled>
585-
<option value='no'><?=_('no'); ?></option>
586-
<option value='yes' <?php if($v_pgsql == 'yes') echo 'selected' ?>><?=_('yes'); ?></option>
585+
<option value='no'><?=_('No'); ?></option>
586+
<option value='yes' <?php if($v_pgsql == 'yes') echo 'selected' ?>><?=_('Yes'); ?></option>
587587
</select>
588588
<br><br>
589589
</td>
@@ -660,8 +660,8 @@
660660
<tr>
661661
<td>
662662
<select class="vst-list" name="v_backup">
663-
<option value='no'><?=_('no'); ?></option>
664-
<option value='yes' <?php if($v_backup == 'yes') echo 'selected' ?>><?=_('yes'); ?></option>
663+
<option value='no'><?=_('No'); ?></option>
664+
<option value='yes' <?php if($v_backup == 'yes') echo 'selected' ?>><?=_('Yes'); ?></option>
665665
</select>
666666
<br><br>
667667
</td>
@@ -963,8 +963,8 @@
963963
<tr>
964964
<td>
965965
<select class="vst-list" name="v_api" id="api">
966-
<option value='yes'><?=_('yes'); ?></option>
967-
<option value='no' <?php if($_SESSION['API'] == 'no') echo 'selected' ?>><?=_('no'); ?></option>
966+
<option value='yes'><?=_('Yes'); ?></option>
967+
<option value='no' <?php if($_SESSION['API'] == 'no') echo 'selected' ?>><?=_('No'); ?></option>
968968
</select>
969969
<br><br>
970970
</td>
@@ -1017,8 +1017,8 @@
10171017
<tr>
10181018
<td>
10191019
<select class="vst-list" name="v_policy_system_password_reset">
1020-
<option value='yes'><?=_('yes'); ?></option>
1021-
<option value='no' <?php if($_SESSION['POLICY_SYSTEM_PASSWORD_RESET'] == 'no') echo 'selected' ?>><?=_('no'); ?></option>
1020+
<option value='yes'><?=_('Yes'); ?></option>
1021+
<option value='no' <?php if($_SESSION['POLICY_SYSTEM_PASSWORD_RESET'] == 'no') echo 'selected' ?>><?=_('No'); ?></option>
10221022
</select>
10231023
<br><br>
10241024
</td>
@@ -1061,8 +1061,8 @@
10611061
<tr>
10621062
<td>
10631063
<select class="vst-list" name="v_policy_system_protected_admin">
1064-
<option value='yes'><?=_('yes'); ?></option>
1065-
<option value='no' <?php if($_SESSION['POLICY_SYSTEM_PROTECTED_ADMIN'] !== 'yes') echo 'selected' ?>><?=_('no'); ?></option>
1064+
<option value='yes'><?=_('Yes'); ?></option>
1065+
<option value='no' <?php if($_SESSION['POLICY_SYSTEM_PROTECTED_ADMIN'] !== 'yes') echo 'selected' ?>><?=_('No'); ?></option>
10661066
</select>
10671067
<br><br>
10681068
</td>
@@ -1075,8 +1075,8 @@
10751075
<tr>
10761076
<td>
10771077
<select class="vst-list" name="v_policy_system_hide_admin">
1078-
<option value='yes'><?=_('yes'); ?></option>
1079-
<option value='no' <?php if($_SESSION['POLICY_SYSTEM_HIDE_ADMIN'] !== 'yes') echo 'selected' ?>><?=_('no'); ?></option>
1078+
<option value='yes'><?=_('Yes'); ?></option>
1079+
<option value='no' <?php if($_SESSION['POLICY_SYSTEM_HIDE_ADMIN'] !== 'yes') echo 'selected' ?>><?=_('No'); ?></option>
10801080
</select>
10811081
<br><br>
10821082
</td>
@@ -1089,8 +1089,8 @@
10891089
<tr>
10901090
<td>
10911091
<select class="vst-list" name="v_policy_system_hide_services">
1092-
<option value='yes'><?=_('yes'); ?></option>
1093-
<option value='no' <?php if($_SESSION['POLICY_SYSTEM_HIDE_SERVICES'] !== 'yes') echo 'selected' ?>><?=_('no'); ?></option>
1092+
<option value='yes'><?=_('Yes'); ?></option>
1093+
<option value='no' <?php if($_SESSION['POLICY_SYSTEM_HIDE_SERVICES'] !== 'yes') echo 'selected' ?>><?=_('No'); ?></option>
10941094
</select>
10951095
<br><br>
10961096
</td>
@@ -1122,8 +1122,8 @@
11221122
<tr>
11231123
<td>
11241124
<select class="vst-list" name="v_policy_user_view_suspended">
1125-
<option value='yes' <?php if($_SESSION['POLICY_USER_VIEW_SUSPENDED'] !== 'no') echo 'selected' ?>><?=_('yes'); ?></option>
1126-
<option value='no' <?php if($_SESSION['POLICY_USER_VIEW_SUSPENDED'] == 'no') echo 'selected' ?>><?=_('no'); ?></option>
1125+
<option value='yes' <?php if($_SESSION['POLICY_USER_VIEW_SUSPENDED'] !== 'no') echo 'selected' ?>><?=_('Yes'); ?></option>
1126+
<option value='no' <?php if($_SESSION['POLICY_USER_VIEW_SUSPENDED'] == 'no') echo 'selected' ?>><?=_('No'); ?></option>
11271127
</select>
11281128
<br><br>
11291129
</td>
@@ -1137,8 +1137,8 @@
11371137
<tr>
11381138
<td>
11391139
<select class="vst-list" name="v_policy_user_edit_details">
1140-
<option value='yes' <?php if($_SESSION['POLICY_USER_EDIT_DETAILS'] !== 'no') echo 'selected' ?>><?=_('yes'); ?></option>
1141-
<option value='no' <?php if($_SESSION['POLICY_USER_EDIT_DETAILS'] == 'no') echo 'selected' ?>><?=_('no'); ?></option>
1140+
<option value='yes' <?php if($_SESSION['POLICY_USER_EDIT_DETAILS'] !== 'no') echo 'selected' ?>><?=_('Yes'); ?></option>
1141+
<option value='no' <?php if($_SESSION['POLICY_USER_EDIT_DETAILS'] == 'no') echo 'selected' ?>><?=_('No'); ?></option>
11421142
</select>
11431143
<br><br>
11441144
</td>
@@ -1151,8 +1151,8 @@
11511151
<tr>
11521152
<td>
11531153
<select class="vst-list" name="v_policy_user_edit_web_templates">
1154-
<option value='yes' <?php if($_SESSION['POLICY_USER_EDIT_WEB_TEMPLATES'] !== 'no') echo 'selected' ?>><?=_('yes'); ?></option>
1155-
<option value='no' <?php if($_SESSION['POLICY_USER_EDIT_WEB_TEMPLATES'] == 'no') echo 'selected' ?>><?=_('no'); ?></option>
1154+
<option value='yes' <?php if($_SESSION['POLICY_USER_EDIT_WEB_TEMPLATES'] !== 'no') echo 'selected' ?>><?=_('Yes'); ?></option>
1155+
<option value='no' <?php if($_SESSION['POLICY_USER_EDIT_WEB_TEMPLATES'] == 'no') echo 'selected' ?>><?=_('No'); ?></option>
11561156
</select>
11571157
<br><br>
11581158
</td>
@@ -1165,8 +1165,8 @@
11651165
<tr>
11661166
<td>
11671167
<select class="vst-list" name="v_policy_user_edit_dns_templates">
1168-
<option value='yes' <?php if($_SESSION['POLICY_USER_EDIT_DNS_TEMPLATES'] !== 'no') echo 'selected' ?>><?=_('yes'); ?></option>
1169-
<option value='no' <?php if($_SESSION['POLICY_USER_EDIT_DNS_TEMPLATES'] == 'no') echo 'selected' ?>><?=_('no'); ?></option>
1168+
<option value='yes' <?php if($_SESSION['POLICY_USER_EDIT_DNS_TEMPLATES'] !== 'no') echo 'selected' ?>><?=_('Yes'); ?></option>
1169+
<option value='no' <?php if($_SESSION['POLICY_USER_EDIT_DNS_TEMPLATES'] == 'no') echo 'selected' ?>><?=_('No'); ?></option>
11701170
</select>
11711171
<br><br>
11721172
</td>
@@ -1179,8 +1179,8 @@
11791179
<tr>
11801180
<td>
11811181
<select class="vst-list" name="v_policy_user_view_logs">
1182-
<option value='yes' <?php if($_SESSION['POLICY_USER_VIEW_LOGS'] !== 'no') echo 'selected' ?>><?=_('yes'); ?></option>
1183-
<option value='no' <?php if($_SESSION['POLICY_USER_VIEW_LOGS'] == 'no') echo 'selected' ?>><?=_('no'); ?></option>
1182+
<option value='yes' <?php if($_SESSION['POLICY_USER_VIEW_LOGS'] !== 'no') echo 'selected' ?>><?=_('Yes'); ?></option>
1183+
<option value='no' <?php if($_SESSION['POLICY_USER_VIEW_LOGS'] == 'no') echo 'selected' ?>><?=_('No'); ?></option>
11841184
</select>
11851185
<br><br>
11861186
</td>
@@ -1193,8 +1193,8 @@
11931193
<tr>
11941194
<td>
11951195
<select class="vst-list" name="v_policy_user_delete_logs">
1196-
<option value='yes' <?php if($_SESSION['POLICY_USER_DELETE_LOGS'] !== 'no') echo 'selected' ?>><?=_('yes'); ?></option>
1197-
<option value='no' <?php if($_SESSION['POLICY_USER_DELETE_LOGS'] == 'no') echo 'selected' ?>><?=_('no'); ?></option>
1196+
<option value='yes' <?php if($_SESSION['POLICY_USER_DELETE_LOGS'] !== 'no') echo 'selected' ?>><?=_('Yes'); ?></option>
1197+
<option value='no' <?php if($_SESSION['POLICY_USER_DELETE_LOGS'] == 'no') echo 'selected' ?>><?=_('No'); ?></option>
11981198
</select>
11991199
<br><br>
12001200
</td>
@@ -1212,8 +1212,8 @@
12121212
<tr>
12131213
<td>
12141214
<select class="vst-list" name="v_enforce_subdomain_ownership">
1215-
<option value='yes'><?=_('yes'); ?></option>
1216-
<option value='no' <?php if($_SESSION['ENFORCE_SUBDOMAIN_OWNERSHIP'] == 'no') echo 'selected' ?>><?=_('no'); ?></option>
1215+
<option value='yes'><?=_('Yes'); ?></option>
1216+
<option value='no' <?php if($_SESSION['ENFORCE_SUBDOMAIN_OWNERSHIP'] == 'no') echo 'selected' ?>><?=_('No'); ?></option>
12171217
</select>
12181218
</td>
12191219
</tr>
@@ -1246,8 +1246,8 @@
12461246
<tr>
12471247
<td>
12481248
<select class="vst-list" name="v_plugin_app_installer">
1249-
<option value='false'><?=_('no'); ?></option>
1250-
<option value='true' <?php if($_SESSION['PLUGIN_APP_INSTALLER'] == 'true') echo 'selected' ?>><?=_('yes'); ?></option>
1249+
<option value='false'><?=_('No'); ?></option>
1250+
<option value='true' <?php if($_SESSION['PLUGIN_APP_INSTALLER'] == 'true') echo 'selected' ?>><?=_('Yes'); ?></option>
12511251
</select>
12521252
<br><br>
12531253
</td>
@@ -1260,8 +1260,8 @@
12601260
<tr>
12611261
<td>
12621262
<select class="vst-list" name="v_filemanager">
1263-
<option value='false'><?=_('no'); ?></option>
1264-
<option value='true' <?php if($_SESSION['FILE_MANAGER'] == 'true') echo 'selected' ?>><?=_('yes'); ?></option>
1263+
<option value='false'><?=_('No'); ?></option>
1264+
<option value='true' <?php if($_SESSION['FILE_MANAGER'] == 'true') echo 'selected' ?>><?=_('Yes'); ?></option>
12651265
</select>
12661266
<br><br>
12671267
</td>
@@ -1274,8 +1274,8 @@
12741274
<tr>
12751275
<td>
12761276
<select class="vst-list" name="v_quota">
1277-
<option value='no'><?=_('no'); ?></option>
1278-
<option value='yes' <?php if($_SESSION['DISK_QUOTA'] == 'yes') echo 'selected' ?>><?=_('yes'); ?></option>
1277+
<option value='no'><?=_('No'); ?></option>
1278+
<option value='yes' <?php if($_SESSION['DISK_QUOTA'] == 'yes') echo 'selected' ?>><?=_('Yes'); ?></option>
12791279
</select>
12801280
<br><br>
12811281
</td>
@@ -1288,8 +1288,8 @@
12881288
<tr>
12891289
<td>
12901290
<select class="vst-list" name="v_firewall">
1291-
<option value='no'><?=_('no'); ?></option>
1292-
<option value='yes' <?php if($_SESSION['FIREWALL_SYSTEM'] == 'iptables') echo 'selected' ?>><?=_('yes'); ?></option>
1291+
<option value='no'><?=_('No'); ?></option>
1292+
<option value='yes' <?php if($_SESSION['FIREWALL_SYSTEM'] == 'iptables') echo 'selected' ?>><?=_('Yes'); ?></option>
12931293
</select>
12941294
<br><br>
12951295
</td>

0 commit comments

Comments
 (0)