Skip to content

Commit e28fc98

Browse files
author
Serghey Rodin
committed
Merge branch 'master' of github.com:serghey-rodin/vesta
2 parents df019a8 + 9a0b310 commit e28fc98

File tree

11 files changed

+62
-34
lines changed

11 files changed

+62
-34
lines changed

‎func/main.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Internal variables
33
HOMEDIR='/home'
44
BACKUP='/backup'
5-
BACKUP_GZIP=5
5+
BACKUP_GZIP=9
66
BACKUP_DISK_LIMIT=95
77
BACKUP_LA_LIMIT=5
88
RRD_STEP=300

‎install/ubuntu/16.04/dovecot/conf.d/10-ssl.conf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
ssl = yes
2+
ssl_protocols = !SSLv2 !SSLv3
3+
24
ssl_cert = </usr/local/vesta/ssl/certificate.crt
35
ssl_key = </usr/local/vesta/ssl/certificate.key

‎install/ubuntu/16.04/dovecot/dovecot.conf‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,23 @@ protocols = imap pop3
22
listen = *, ::
33
base_dir = /var/run/dovecot/
44
!include conf.d/*.conf
5+
6+
namespace {
7+
type = private
8+
separator = /
9+
prefix =
10+
inbox = yes
11+
12+
mailbox Sent {
13+
auto = subscribe
14+
special_use = \Sent
15+
}
16+
mailbox Drafts {
17+
auto = subscribe
18+
special_use = \Drafts
19+
}
20+
mailbox Trash {
21+
auto = subscribe
22+
special_use = \Trash
23+
}
24+
}

‎install/ubuntu/16.04/exim/exim4.conf.template‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#SPAM_SCORE = 50
99
#CLAMD = yes
1010

11+
disable_ipv6 = true
1112
domainlist local_domains = dsearch;/etc/exim4/domains/
1213
domainlist relay_to_domains = dsearch;/etc/exim4/domains/
1314
hostlist relay_from_hosts = 127.0.0.1

‎install/ubuntu/16.04/nginx/nginx.conf‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
# Server globals
22
user www-data;
3-
worker_processes 2;
4-
error_log /var/log/nginx/error.log;
3+
worker_processes auto;
4+
worker_rlimit_nofile 65535;
5+
error_log /var/log/nginx/error.log crit;
56
pid /var/run/nginx.pid;
67

78

89
# Worker config
910
events {
1011
worker_connections 1024;
1112
use epoll;
13+
multi_accept on;
1214
}
1315

1416

@@ -37,7 +39,7 @@ http {
3739
'"$status" $body_bytes_sent "$http_referer" '
3840
'"$http_user_agent" "$http_x_forwarded_for"';
3941
log_format bytes '$body_bytes_sent';
40-
#access_log /var/log/nginx/access.log main;
42+
#access_log /var/log/nginx/access.log main;
4143
access_log off;
4244

4345

@@ -51,9 +53,9 @@ http {
5153
gzip_comp_level 9;
5254
gzip_min_length 512;
5355
gzip_buffers 8 64k;
54-
gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript image/svg+xml application/x-font-ttf font/opentype;
56+
gzip_types text/plain text/css text/javascript text/js text/xml application/json application/javascript application/x-javascript application/xml application/xml+rss application/x-font-ttf image/svg+xml font/opentype;
5557
gzip_proxied any;
56-
58+
gzip_disable "MSIE [1-6]\.";
5759

5860
# Proxy settings
5961
proxy_redirect off;

‎install/ubuntu/16.04/pma/apache.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Alias /phpmyadmin /usr/share/phpmyadmin
1515
php_admin_flag allow_url_fopen Off
1616
php_value include_path .
1717
php_admin_value upload_tmp_dir /var/lib/phpmyadmin/tmp
18-
php_admin_value open_basedir /usr/share/phpmyadmin/:/etc/phpmyadmin/:/var/lib/phpmyadmin/:/usr/share/php/php-gettext
18+
php_admin_value open_basedir /usr/share/phpmyadmin/:/etc/phpmyadmin/:/var/lib/phpmyadmin/:/usr/share/php/php-gettext:/usr/share/javascript/
1919
</IfModule>
2020

2121
</Directory>

‎install/ubuntu/16.04/roundcube/main.inc.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@
448448
$rcmail_config['protect_default_folders'] = true;
449449

450450
// if in your system 0 quota means no limit set this option to true
451-
$rcmail_config['quota_zero_as_unlimited'] = false;
451+
$rcmail_config['quota_zero_as_unlimited'] = true;
452452

453453
// Make use of the built-in spell checker. It is based on GoogieSpell.
454454
// Since Google only accepts connections over https your PHP installatation
@@ -724,8 +724,8 @@
724724
// show pretty dates as standard
725725
$rcmail_config['prettydate'] = true;
726726

727-
// save compose message every 300 seconds (5min)
728-
$rcmail_config['draft_autosave'] = 300;
727+
// save compose message every 30 seconds
728+
$rcmail_config['draft_autosave'] = 30;
729729

730730
// default setting if preview pane is enabled
731731
$rcmail_config['preview_pane'] = false;

‎install/ubuntu/16.04/templates/dns/child-ns.tpl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ ID='8' RECORD='pop' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time
99
ID='9' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%'
1010
ID='10' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='mail.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%'
1111
ID='11' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% ?all"' SUSPENDED='no' TIME='%time%' DATE='%date%'
12+
ID='12' RECORD='_dmarc' TYPE='TXT' PRIORITY='' VALUE='"v=DMARC1; p=none"' SUSPENDED='no' TIME='%time%' DATE='%date%'

‎install/ubuntu/16.04/templates/dns/default.tpl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ ID='12' RECORD='pop' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%tim
1313
ID='13' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%'
1414
ID='14' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='mail.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%'
1515
ID='15' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% ?all"' SUSPENDED='no' TIME='%time%' DATE='%date%'
16+
ID='16' RECORD='_dmarc' TYPE='TXT' PRIORITY='' VALUE='"v=DMARC1; p=none"' SUSPENDED='no' TIME='%time%' DATE='%date%'

‎install/ubuntu/16.04/vsftpd/vsftpd.conf‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@ tcp_wrappers=YES
1717
force_dot_files=YES
1818
ascii_upload_enable=YES
1919
ascii_download_enable=YES
20-
#allow_writable_chroot=YES
2120
allow_writeable_chroot=YES
2221
seccomp_sandbox=NO
2322
pasv_enable=YES
24-
pasv_max_port=12100
2523
pasv_min_port=12000
24+
pasv_max_port=12100
25+
max_per_ip=10
26+
max_clients=100
2627
use_localtime=YES

0 commit comments

Comments
 (0)