mirror of
https://github.com/myvesta/vesta
synced 2025-07-06 04:51:54 -07:00
installer update (fail2ban)
This commit is contained in:
parent
a16af0ec83
commit
5604a90870
94 changed files with 37 additions and 36 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -1,3 +1,4 @@
|
||||||
*.tar
|
*.tar
|
||||||
*.zip
|
*.zip
|
||||||
*.gzip
|
*.gzip
|
||||||
|
*.gz
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -35,7 +35,7 @@
|
||||||
AssignUserID %user% %group%
|
AssignUserID %user% %group%
|
||||||
</IfModule>
|
</IfModule>
|
||||||
|
|
||||||
IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
|
Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
|
||||||
|
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
AssignUserID %user% %group%
|
AssignUserID %user% %group%
|
||||||
</IfModule>
|
</IfModule>
|
||||||
|
|
||||||
IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
|
Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
|
||||||
|
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
AssignUserID %user% %group%
|
AssignUserID %user% %group%
|
||||||
</IfModule>
|
</IfModule>
|
||||||
|
|
||||||
IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
|
Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
|
||||||
|
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
AssignUserID %user% %group%
|
AssignUserID %user% %group%
|
||||||
</IfModule>
|
</IfModule>
|
||||||
|
|
||||||
IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
|
Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
|
||||||
|
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
|
||||||
|
|
|
@ -43,7 +43,7 @@
|
||||||
AssignUserID %user% %group%
|
AssignUserID %user% %group%
|
||||||
</IfModule>
|
</IfModule>
|
||||||
|
|
||||||
IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
|
Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
|
||||||
|
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
|
||||||
|
|
|
@ -37,7 +37,7 @@
|
||||||
AssignUserID %user% %group%
|
AssignUserID %user% %group%
|
||||||
</IfModule>
|
</IfModule>
|
||||||
|
|
||||||
IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
|
Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
|
||||||
|
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
SSLCertificateKeyFile %ssl_key%
|
SSLCertificateKeyFile %ssl_key%
|
||||||
%ssl_ca_str%SSLCertificateChainFile %ssl_ca%
|
%ssl_ca_str%SSLCertificateChainFile %ssl_ca%
|
||||||
|
|
||||||
IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
|
Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
|
||||||
|
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
<Directory %home%/%user%/web/%domain%/stats>
|
<Directory %home%/%user%/web/%domain%/stats>
|
||||||
AllowOverride All
|
AllowOverride All
|
||||||
</Directory>
|
</Directory>
|
||||||
IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
|
Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
|
||||||
|
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
SSLCertificateKeyFile %ssl_key%
|
SSLCertificateKeyFile %ssl_key%
|
||||||
%ssl_ca_str%SSLCertificateChainFile %ssl_ca%
|
%ssl_ca_str%SSLCertificateChainFile %ssl_ca%
|
||||||
|
|
||||||
IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
|
Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
|
||||||
|
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
<Directory %home%/%user%/web/%domain%/stats>
|
<Directory %home%/%user%/web/%domain%/stats>
|
||||||
AllowOverride All
|
AllowOverride All
|
||||||
</Directory>
|
</Directory>
|
||||||
IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
|
Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
|
||||||
|
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -35,7 +35,7 @@
|
||||||
AssignUserID %user% %group%
|
AssignUserID %user% %group%
|
||||||
</IfModule>
|
</IfModule>
|
||||||
|
|
||||||
IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
|
Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
|
||||||
|
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
AssignUserID %user% %group%
|
AssignUserID %user% %group%
|
||||||
</IfModule>
|
</IfModule>
|
||||||
|
|
||||||
IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
|
Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
|
||||||
|
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
AssignUserID %user% %group%
|
AssignUserID %user% %group%
|
||||||
</IfModule>
|
</IfModule>
|
||||||
|
|
||||||
IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
|
Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
|
||||||
|
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
AssignUserID %user% %group%
|
AssignUserID %user% %group%
|
||||||
</IfModule>
|
</IfModule>
|
||||||
|
|
||||||
IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
|
Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
|
||||||
|
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
|
||||||
|
|
|
@ -43,7 +43,7 @@
|
||||||
AssignUserID %user% %group%
|
AssignUserID %user% %group%
|
||||||
</IfModule>
|
</IfModule>
|
||||||
|
|
||||||
IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
|
Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
|
||||||
|
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
|
||||||
|
|
|
@ -37,7 +37,7 @@
|
||||||
AssignUserID %user% %group%
|
AssignUserID %user% %group%
|
||||||
</IfModule>
|
</IfModule>
|
||||||
|
|
||||||
IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
|
Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
|
||||||
|
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
SSLCertificateKeyFile %ssl_key%
|
SSLCertificateKeyFile %ssl_key%
|
||||||
%ssl_ca_str%SSLCertificateChainFile %ssl_ca%
|
%ssl_ca_str%SSLCertificateChainFile %ssl_ca%
|
||||||
|
|
||||||
IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
|
Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
|
||||||
|
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
<Directory %home%/%user%/web/%domain%/stats>
|
<Directory %home%/%user%/web/%domain%/stats>
|
||||||
AllowOverride All
|
AllowOverride All
|
||||||
</Directory>
|
</Directory>
|
||||||
IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
|
Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
|
||||||
|
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
SSLCertificateKeyFile %ssl_key%
|
SSLCertificateKeyFile %ssl_key%
|
||||||
%ssl_ca_str%SSLCertificateChainFile %ssl_ca%
|
%ssl_ca_str%SSLCertificateChainFile %ssl_ca%
|
||||||
|
|
||||||
IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
|
Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
|
||||||
|
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
<Directory %home%/%user%/web/%domain%/stats>
|
<Directory %home%/%user%/web/%domain%/stats>
|
||||||
AllowOverride All
|
AllowOverride All
|
||||||
</Directory>
|
</Directory>
|
||||||
IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
|
Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
|
||||||
|
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -35,7 +35,7 @@
|
||||||
AssignUserID %user% %group%
|
AssignUserID %user% %group%
|
||||||
</IfModule>
|
</IfModule>
|
||||||
|
|
||||||
IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
|
Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
|
||||||
|
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
AssignUserID %user% %group%
|
AssignUserID %user% %group%
|
||||||
</IfModule>
|
</IfModule>
|
||||||
|
|
||||||
IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
|
Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
|
||||||
|
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
AssignUserID %user% %group%
|
AssignUserID %user% %group%
|
||||||
</IfModule>
|
</IfModule>
|
||||||
|
|
||||||
IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
|
Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
|
||||||
|
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
AssignUserID %user% %group%
|
AssignUserID %user% %group%
|
||||||
</IfModule>
|
</IfModule>
|
||||||
|
|
||||||
IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
|
Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
|
||||||
|
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
|
||||||
|
|
|
@ -43,7 +43,7 @@
|
||||||
AssignUserID %user% %group%
|
AssignUserID %user% %group%
|
||||||
</IfModule>
|
</IfModule>
|
||||||
|
|
||||||
IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
|
Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
|
||||||
|
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
|
||||||
|
|
|
@ -37,7 +37,7 @@
|
||||||
AssignUserID %user% %group%
|
AssignUserID %user% %group%
|
||||||
</IfModule>
|
</IfModule>
|
||||||
|
|
||||||
IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
|
Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
|
||||||
|
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
SSLCertificateKeyFile %ssl_key%
|
SSLCertificateKeyFile %ssl_key%
|
||||||
%ssl_ca_str%SSLCertificateChainFile %ssl_ca%
|
%ssl_ca_str%SSLCertificateChainFile %ssl_ca%
|
||||||
|
|
||||||
IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
|
Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
|
||||||
|
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
<Directory %home%/%user%/web/%domain%/stats>
|
<Directory %home%/%user%/web/%domain%/stats>
|
||||||
AllowOverride All
|
AllowOverride All
|
||||||
</Directory>
|
</Directory>
|
||||||
IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
|
Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
|
||||||
|
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
SSLCertificateKeyFile %ssl_key%
|
SSLCertificateKeyFile %ssl_key%
|
||||||
%ssl_ca_str%SSLCertificateChainFile %ssl_ca%
|
%ssl_ca_str%SSLCertificateChainFile %ssl_ca%
|
||||||
|
|
||||||
IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
|
Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
|
||||||
|
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
<Directory %home%/%user%/web/%domain%/stats>
|
<Directory %home%/%user%/web/%domain%/stats>
|
||||||
AllowOverride All
|
AllowOverride All
|
||||||
</Directory>
|
</Directory>
|
||||||
IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
|
Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
|
||||||
|
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -1074,12 +1074,12 @@ if [ "$fail2ban" = 'yes' ]; then
|
||||||
rm -f fail2ban.tar.gz
|
rm -f fail2ban.tar.gz
|
||||||
if [ "$dovecot" = 'no' ]; then
|
if [ "$dovecot" = 'no' ]; then
|
||||||
fline=$(cat /etc/fail2ban/jail.local |grep -n dovecot-iptables -A 2)
|
fline=$(cat /etc/fail2ban/jail.local |grep -n dovecot-iptables -A 2)
|
||||||
fline=$(echo "$fline" |tail -n1 |cut -f 1 -d -)
|
fline=$(echo "$fline" |grep enabled |tail -n1 |cut -f 1 -d -)
|
||||||
sed -i "${fline}s/true/false/" /etc/fail2ban/jail.local
|
sed -i "${fline}s/true/false/" /etc/fail2ban/jail.local
|
||||||
fi
|
fi
|
||||||
if [ "$exim" = 'no' ]; then
|
if [ "$exim" = 'no' ]; then
|
||||||
fline=$(cat /etc/fail2ban/jail.local |grep -n exim-iptables -A 2)
|
fline=$(cat /etc/fail2ban/jail.local |grep -n exim-iptables -A 2)
|
||||||
fline=$(echo "$fline" |tail -n1 |cut -f 1 -d -)
|
fline=$(echo "$fline" |grep enabled |tail -n1 |cut -f 1 -d -)
|
||||||
sed -i "${fline}s/true/false/" /etc/fail2ban/jail.local
|
sed -i "${fline}s/true/false/" /etc/fail2ban/jail.local
|
||||||
fi
|
fi
|
||||||
update-rc.d fail2ban defaults
|
update-rc.d fail2ban defaults
|
||||||
|
|
|
@ -1143,12 +1143,12 @@ if [ "$fail2ban" = 'yes' ]; then
|
||||||
rm -f fail2ban.tar.gz
|
rm -f fail2ban.tar.gz
|
||||||
if [ "$dovecot" = 'no' ]; then
|
if [ "$dovecot" = 'no' ]; then
|
||||||
fline=$(cat /etc/fail2ban/jail.local |grep -n dovecot-iptables -A 2)
|
fline=$(cat /etc/fail2ban/jail.local |grep -n dovecot-iptables -A 2)
|
||||||
fline=$(echo "$fline" |tail -n1 |cut -f 1 -d -)
|
fline=$(echo "$fline" |grep enabled |tail -n1 |cut -f 1 -d -)
|
||||||
sed -i "${fline}s/true/false/" /etc/fail2ban/jail.local
|
sed -i "${fline}s/true/false/" /etc/fail2ban/jail.local
|
||||||
fi
|
fi
|
||||||
if [ "$exim" = 'no' ]; then
|
if [ "$exim" = 'no' ]; then
|
||||||
fline=$(cat /etc/fail2ban/jail.local |grep -n exim-iptables -A 2)
|
fline=$(cat /etc/fail2ban/jail.local |grep -n exim-iptables -A 2)
|
||||||
fline=$(echo "$fline" |tail -n1 |cut -f 1 -d -)
|
fline=$(echo "$fline" |grep enabled |tail -n1 |cut -f 1 -d -)
|
||||||
sed -i "${fline}s/true/false/" /etc/fail2ban/jail.local
|
sed -i "${fline}s/true/false/" /etc/fail2ban/jail.local
|
||||||
fi
|
fi
|
||||||
chkconfig fail2ban on
|
chkconfig fail2ban on
|
||||||
|
|
|
@ -1063,12 +1063,12 @@ if [ "$fail2ban" = 'yes' ]; then
|
||||||
rm -f fail2ban.tar.gz
|
rm -f fail2ban.tar.gz
|
||||||
if [ "$dovecot" = 'no' ]; then
|
if [ "$dovecot" = 'no' ]; then
|
||||||
fline=$(cat /etc/fail2ban/jail.local |grep -n dovecot-iptables -A 2)
|
fline=$(cat /etc/fail2ban/jail.local |grep -n dovecot-iptables -A 2)
|
||||||
fline=$(echo "$fline" |tail -n1 |cut -f 1 -d -)
|
fline=$(echo "$fline" |grep enabled |tail -n1 |cut -f 1 -d -)
|
||||||
sed -i "${fline}s/true/false/" /etc/fail2ban/jail.local
|
sed -i "${fline}s/true/false/" /etc/fail2ban/jail.local
|
||||||
fi
|
fi
|
||||||
if [ "$exim" = 'no' ]; then
|
if [ "$exim" = 'no' ]; then
|
||||||
fline=$(cat /etc/fail2ban/jail.local |grep -n exim-iptables -A 2)
|
fline=$(cat /etc/fail2ban/jail.local |grep -n exim-iptables -A 2)
|
||||||
fline=$(echo "$fline" |tail -n1 |cut -f 1 -d -)
|
fline=$(echo "$fline" |grep enabled |tail -n1 |cut -f 1 -d -)
|
||||||
sed -i "${fline}s/true/false/" /etc/fail2ban/jail.local
|
sed -i "${fline}s/true/false/" /etc/fail2ban/jail.local
|
||||||
fi
|
fi
|
||||||
update-rc.d fail2ban defaults
|
update-rc.d fail2ban defaults
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue