Skip to content

Commit baae928

Browse files
committed
cron email reporting
1 parent 75a50c9 commit baae928

File tree

6 files changed

+65
-11
lines changed

6 files changed

+65
-11
lines changed

bin/v-update-sys-firewall

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ IFS=$'\n'
5555
for line in $(sort -r -n -k 2 -t \' $rules); do
5656
eval $line
5757
if [ "$SUSPENDED" = 'no' ]; then
58-
chain="-A INPUT"
5958
proto="-p $PROTOCOL"
6059
port="--dport $PORT"
6160
ip="-s $IP"
@@ -83,22 +82,22 @@ for line in $(sort -r -n -k 2 -t \' $rules); do
8382
fi
8483

8584
# Adding firewall rule
86-
echo "$iptables $chain $proto $port $ip $state $action" >> $tmp
85+
echo "$iptables -A INPUT $proto $port $ip $state $action" >> $tmp
8786
fi
8887
done
8988

90-
# Handling DNS replies
91-
proto="-p udp"
92-
port="--sport 53"
93-
action="-j ACCEPT"
94-
echo "$iptables $chain $proto $port $state $action" >> $tmp
89+
# Handling local traffic
90+
echo "$iptables -A INPUT -p udp --sport 53 -j ACCEPT" >> $tmp
91+
echo "$iptables -A INPUT -s 127.0.0.1 -j ACCEPT" >> $tmp
92+
for ip in $(ls $VESTA/data/ips); do
93+
echo "$iptables -A INPUT -s $ip -j ACCEPT" >> $tmp
94+
done
9595

9696
# Enabling stateful firewall
9797
if [ "$stateful" != 'no' ]; then
98-
proto="-p tcp"
99-
state="-m state --state ESTABLISHED,RELATED"
100-
action="-j ACCEPT"
101-
echo "$iptables $chain $proto $state $action" >> $tmp
98+
str="$iptables -A INPUT -p tcp -m state"
99+
str="$str --state ESTABLISHED,RELATED -j ACCEPT"
100+
echo "$str" >> $tmp
102101
fi
103102

104103
# Switching chain policy to DROP
@@ -107,6 +106,9 @@ echo "$iptables -P INPUT DROP" >> $tmp
107106
# Applying rules
108107
bash $tmp
109108

109+
# Deleting temporary file
110+
rm -f $tmp
111+
110112
# Saving rules to the master iptables file
111113
if [ -e "/etc/redhat-release" ]; then
112114
/sbin/iptables-save > /etc/sysconfig/iptables

web/add/cron/reports/index.php

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?php
2+
// Init
3+
error_reporting(NULL);
4+
ob_start();
5+
session_start();
6+
include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
7+
8+
exec (VESTA_CMD."v-add-cron-reports ".$user, $output, $return_var);
9+
$_SESSION['error_msg'] = __('Cronjob email reporting has been successfully enabled');
10+
unset($output);
11+
12+
header("Location: /list/cron/");
13+
exit;

web/delete/cron/reports/index.php

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?php
2+
// Init
3+
error_reporting(NULL);
4+
ob_start();
5+
session_start();
6+
include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
7+
8+
exec (VESTA_CMD."v-delete-cron-reports ".$user, $output, $return_var);
9+
$_SESSION['error_msg'] = __('Cronjob email reporting has been successfully disabled');
10+
unset($output);
11+
12+
header("Location: /list/cron/");
13+
exit;

web/templates/admin/list_cron.html

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,19 @@
2121
</select>
2222
<input type="submit" name="ok" value="" class="submenu-button-select">
2323
</div>
24+
<div class="submenu-select-block">
25+
<?php
26+
if($panel[$user]['CRON_REPORTS'] == 'yes') {
27+
?>
28+
<a class="submenu-select-link" href="/delete/cron/reports/">[ <?php print __('disable email reports');?> ]</a>
29+
<?php
30+
} else {
31+
?>
32+
<a class="submenu-select-link" href="/add/cron/reports/">[ <?php print __('enable email reports');?> ]</a>
33+
<?php
34+
}
35+
?>
36+
</div>
2437
<?php display_error_block(); ?>
2538
</td>
2639
</tr>

web/templates/user/list_cron.html

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,19 @@
1919
</select>
2020
<input type="submit" name="ok" value="" class="submenu-button-select">
2121
</div>
22+
<div class="submenu-select-block">
23+
<?php
24+
if($panel[$user]['CRON_REPORTS'] == 'yes') {
25+
?>
26+
<a class="submenu-select-link" href="/delete/cron/reports/">[ <?php print __('disable email reports');?> ]</a>
27+
<?php
28+
} else {
29+
?>
30+
<a class="submenu-select-link" href="/add/cron/reports/">[ <?php print __('enable email reports');?> ]</a>
31+
<?php
32+
}
33+
?>
34+
</div>
2235
<?php display_error_block(); ?>
2336
</td>
2437
</tr>

0 commit comments

Comments
 (0)