Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.6.1</version>
<version>3.9.0</version>
<executions>
<execution>
<id>analyze</id>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
#
server
{
${core.ipboth.enabled}listen [::]:${mail.imap.port};
${core.ipv4only.enabled}listen ${mail.imap.port};
${core.ipv6only.enabled}listen [::]:${mail.imap.port};
${core.ipboth.enabled}listen [::]:${mail.imap.port} so_keepalive=on;
${core.ipv4only.enabled}listen ${mail.imap.port} so_keepalive=on;
${core.ipv6only.enabled}listen [::]:${mail.imap.port} so_keepalive=on;
${web.ssl.dhparam.enabled}ssl_dhparam ${web.ssl.dhparam.file};
protocol imap;
proxy on;
Expand Down
6 changes: 3 additions & 3 deletions proxy/conf/nginx/templates/nginx.conf.mail.imap.template
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
server
{
server_name ${vhn};
${core.ipboth.enabled}listen ${vip}${mail.imap.port};
${core.ipv4only.enabled}listen ${vip}${mail.imap.port};
${core.ipv6only.enabled}listen ${vip}${mail.imap.port};
${core.ipboth.enabled}listen ${vip}${mail.imap.port} so_keepalive=on;
${core.ipv4only.enabled}listen ${vip}${mail.imap.port} so_keepalive=on;
${core.ipv6only.enabled}listen ${vip}${mail.imap.port} so_keepalive=on;
protocol imap;
proxy on;
timeout ${mail.imap.timeout};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
#
server
{
${core.ipboth.enabled}listen [::]:${mail.imaps.port} ssl;
${core.ipv4only.enabled}listen ${mail.imaps.port} ssl;
${core.ipv6only.enabled}listen [::]:${mail.imaps.port} ssl;
${core.ipboth.enabled}listen [::]:${mail.imaps.port} ssl so_keepalive=on;
${core.ipv4only.enabled}listen ${mail.imaps.port} ssl so_keepalive=on;
${core.ipv6only.enabled}listen [::]:${mail.imaps.port} ssl so_keepalive=on;
${web.ssl.dhparam.enabled}ssl_dhparam ${web.ssl.dhparam.file};
protocol imap;
proxy on;
Expand Down
6 changes: 3 additions & 3 deletions proxy/conf/nginx/templates/nginx.conf.mail.imaps.template
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
server
{
server_name ${vhn};
${core.ipboth.enabled}listen ${vip}${mail.imaps.port} ssl;
${core.ipv4only.enabled}listen ${vip}${mail.imaps.port} ssl;
${core.ipv6only.enabled}listen ${vip}${mail.imaps.port} ssl;
${core.ipboth.enabled}listen ${vip}${mail.imaps.port} ssl so_keepalive=on;
${core.ipv4only.enabled}listen ${vip}${mail.imaps.port} ssl so_keepalive=on;
${core.ipv6only.enabled}listen ${vip}${mail.imaps.port} ssl so_keepalive=on;
protocol imap;
proxy on;
timeout ${mail.imap.timeout};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
#
server
{
${core.ipboth.enabled}listen [::]:${mail.pop3.port};
${core.ipv4only.enabled}listen ${mail.pop3.port};
${core.ipv6only.enabled}listen [::]:${mail.pop3.port};
${core.ipboth.enabled}listen [::]:${mail.pop3.port} so_keepalive=on;
${core.ipv4only.enabled}listen ${mail.pop3.port} so_keepalive=on;
${core.ipv6only.enabled}listen [::]:${mail.pop3.port} so_keepalive=on;
${web.ssl.dhparam.enabled}ssl_dhparam ${web.ssl.dhparam.file};
protocol pop3;
proxy on;
Expand Down
6 changes: 3 additions & 3 deletions proxy/conf/nginx/templates/nginx.conf.mail.pop3.template
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
server
{
server_name ${vhn};
${core.ipboth.enabled}listen ${vip}${mail.pop3.port};
${core.ipv4only.enabled}listen ${vip}${mail.pop3.port};
${core.ipv6only.enabled}listen ${vip}${mail.pop3.port};
${core.ipboth.enabled}listen ${vip}${mail.pop3.port} so_keepalive=on;
${core.ipv4only.enabled}listen ${vip}${mail.pop3.port} so_keepalive=on;
${core.ipv6only.enabled}listen ${vip}${mail.pop3.port} so_keepalive=on;
protocol pop3;
proxy on;
timeout ${mail.pop3.timeout};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
#
server
{
${core.ipboth.enabled}listen [::]:${mail.pop3s.port} ssl;
${core.ipv4only.enabled}listen ${mail.pop3s.port} ssl;
${core.ipv6only.enabled}listen [::]:${mail.pop3s.port} ssl;
${core.ipboth.enabled}listen [::]:${mail.pop3s.port} ssl so_keepalive=on;
${core.ipv4only.enabled}listen ${mail.pop3s.port} ssl so_keepalive=on;
${core.ipv6only.enabled}listen [::]:${mail.pop3s.port} ssl so_keepalive=on;
${web.ssl.dhparam.enabled}ssl_dhparam ${web.ssl.dhparam.file};
protocol pop3;
proxy on;
Expand Down
6 changes: 3 additions & 3 deletions proxy/conf/nginx/templates/nginx.conf.mail.pop3s.template
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
server
{
server_name ${vhn};
${core.ipboth.enabled}listen ${vip}${mail.pop3s.port} ssl;
${core.ipv4only.enabled}listen ${vip}${mail.pop3s.port} ssl;
${core.ipv6only.enabled}listen ${vip}${mail.pop3s.port} ssl;
${core.ipboth.enabled}listen ${vip}${mail.pop3s.port} ssl so_keepalive=on;
${core.ipv4only.enabled}listen ${vip}${mail.pop3s.port} ssl so_keepalive=on;
${core.ipv6only.enabled}listen ${vip}${mail.pop3s.port} ssl so_keepalive=on;
protocol pop3;
proxy on;
timeout ${mail.pop3.timeout};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ include ${core.includes}/${core.cprefix}.map.ssl;

server
{
${core.ipboth.enabled}listen 8636 ssl;
${core.ipv4only.enabled}listen 8636 ssl;
${core.ipv6only.enabled}listen [::]:8636 ssl;
${core.ipboth.enabled}listen 8636 ssl so_keepalive=on;
${core.ipv4only.enabled}listen 8636 ssl so_keepalive=on;
${core.ipv6only.enabled}listen [::]:8636 ssl so_keepalive=on;
ssl_protocols ${web.ssl.protocols};
ssl_prefer_server_ciphers ${web.ssl.preferserverciphers};
ssl_ciphers ${web.ssl.ciphers};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ include ${core.includes}/${core.cprefix}.map.ssl;

server
{
${core.ipboth.enabled}listen 5222 ssl;
${core.ipv4only.enabled}listen 5222 ssl;
${core.ipv6only.enabled}listen [::]:5222 ssl;
${core.ipboth.enabled}listen 5222 ssl so_keepalive=on;
${core.ipv4only.enabled}listen 5222 ssl so_keepalive=on;
${core.ipv6only.enabled}listen [::]:5222 ssl so_keepalive=on;
ssl_protocols ${web.ssl.protocols};
ssl_prefer_server_ciphers ${web.ssl.preferserverciphers};
ssl_ciphers ${web.ssl.ciphers};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
#
server
{
${core.ipboth.enabled}listen ${web.admin.port} default_server ssl;
${core.ipboth.enabled}listen [::]:${web.admin.port} default_server ssl;
${core.ipv4only.enabled}listen ${web.admin.port} default_server ssl;
${core.ipv6only.enabled}listen [::]:${web.admin.port} default_server ssl;
${core.ipboth.enabled}listen ${web.admin.port} default_server ssl so_keepalive=on;
${core.ipboth.enabled}listen [::]:${web.admin.port} default_server ssl so_keepalive=on;
${core.ipv4only.enabled}listen ${web.admin.port} default_server ssl so_keepalive=on;
${core.ipv6only.enabled}listen [::]:${web.admin.port} default_server ssl so_keepalive=on;

ssl_protocols ${web.ssl.protocols};
ssl_prefer_server_ciphers ${web.ssl.preferserverciphers};
Expand Down
6 changes: 3 additions & 3 deletions proxy/conf/nginx/templates/nginx.conf.web.admin.template
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ server
{
server_name ${vhn};

${core.ipboth.enabled}listen ${vip}${web.admin.port} ssl;
${core.ipv4only.enabled}listen ${vip}${web.admin.port} ssl;
${core.ipv6only.enabled}listen ${vip}${web.admin.port} ssl;
${core.ipboth.enabled}listen ${vip}${web.admin.port} ssl so_keepalive=on;
${core.ipv4only.enabled}listen ${vip}${web.admin.port} ssl so_keepalive=on;
${core.ipv6only.enabled}listen ${vip}${web.admin.port} ssl so_keepalive=on;

ssl_protocols ${web.ssl.protocols};
ssl_prefer_server_ciphers ${web.ssl.preferserverciphers};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@
#
server
{
${core.ipboth.enabled}listen ${web.carbonio.admin.port} default_server ssl;
${core.ipboth.enabled}listen [::]:${web.carbonio.admin.port} default_server ssl;
${core.ipv4only.enabled}listen ${web.carbonio.admin.port} default_server ssl;
${core.ipv6only.enabled}listen [::]:${web.carbonio.admin.port} default_server ssl;
${core.ipboth.enabled}listen ${web.carbonio.admin.port} default_server ssl so_keepalive=on;
${core.ipboth.enabled}listen [::]:${web.carbonio.admin.port} default_server ssl so_keepalive=on;
${core.ipv4only.enabled}listen ${web.carbonio.admin.port} default_server ssl so_keepalive=on;
${core.ipv6only.enabled}listen [::]:${web.carbonio.admin.port} default_server ssl so_keepalive=on;
http2 on;

ssl_protocols ${web.ssl.protocols};
ssl_prefer_server_ciphers ${web.ssl.preferserverciphers};
Expand Down Expand Up @@ -46,13 +47,15 @@ server
proxy_request_buffering off;
proxy_pass http://carbonio-storages/;
proxy_http_version 1.1;
proxy_set_header Connection "";
}

location /services/catalog/
{
proxy_request_buffering off;
proxy_pass http://carbonio-catalog/;
proxy_http_version 1.1;
proxy_set_header Connection "";
}

location ^~ /service
Expand Down Expand Up @@ -111,14 +114,14 @@ server

location ~/logout
{
add_header Set-Cookie "ZM_ADMIN_AUTH_TOKEN=; Path=/; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0";
add_header Set-Cookie "ZX_AUTH_TOKEN=; Path=/; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0";
add_header Set-Cookie "ZM_AUTH_TOKEN=; Path=/; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0";
add_header Set-Cookie "JSESSIONID=; Path=/; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0";
add_header Set-Cookie "AUTH_TOKEN_TYPE=; Path=/; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0";
add_header Set-Cookie "T=; Path=/; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0";
add_header Set-Cookie "Y=; Path=/; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0";
add_header Set-Cookie "ADMIN_AUTH_KEY=; Path=/; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0";
add_header Set-Cookie "ZM_ADMIN_AUTH_TOKEN=; Path=/; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0; HttpOnly; Secure; SameSite=Strict";
add_header Set-Cookie "ZX_AUTH_TOKEN=; Path=/; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0; HttpOnly; Secure; SameSite=Strict";
add_header Set-Cookie "ZM_AUTH_TOKEN=; Path=/; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0; HttpOnly; Secure; SameSite=Strict";
add_header Set-Cookie "JSESSIONID=; Path=/; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0; HttpOnly; Secure; SameSite=Strict";
add_header Set-Cookie "AUTH_TOKEN_TYPE=; Path=/; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0; HttpOnly; Secure; SameSite=Strict";
add_header Set-Cookie "T=; Path=/; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0; HttpOnly; Secure; SameSite=Strict";
add_header Set-Cookie "Y=; Path=/; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0; HttpOnly; Secure; SameSite=Strict";
add_header Set-Cookie "ADMIN_AUTH_KEY=; Path=/; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0; HttpOnly; Secure; SameSite=Strict";
${web.carbonio.admin.logout.redirect.default};
}

Expand Down
25 changes: 14 additions & 11 deletions proxy/conf/nginx/templates/nginx.conf.web.carbonio.admin.template
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ server
{
server_name ${vhn};

${core.ipboth.enabled}listen ${vip}${web.carbonio.admin.port} ssl;
${core.ipv4only.enabled}listen ${vip}${web.carbonio.admin.port} ssl;
${core.ipv6only.enabled}listen ${vip}${web.carbonio.admin.port} ssl;
${core.ipboth.enabled}listen ${vip}${web.carbonio.admin.port} ssl so_keepalive=on;
${core.ipv4only.enabled}listen ${vip}${web.carbonio.admin.port} ssl so_keepalive=on;
${core.ipv6only.enabled}listen ${vip}${web.carbonio.admin.port} ssl so_keepalive=on;
http2 on;
ssl_protocols ${web.ssl.protocols};
ssl_prefer_server_ciphers ${web.ssl.preferserverciphers};
ssl_session_cache ${ssl.session.cachesize};
Expand Down Expand Up @@ -47,13 +48,15 @@ server
proxy_request_buffering off;
proxy_pass http://carbonio-storages/;
proxy_http_version 1.1;
proxy_set_header Connection "";
}

location /services/catalog/
{
proxy_request_buffering off;
proxy_pass http://carbonio-catalog/;
proxy_http_version 1.1;
proxy_set_header Connection "";
}

location ^~ /service
Expand Down Expand Up @@ -112,14 +115,14 @@ server

location ~/logout
{
add_header Set-Cookie "ZM_ADMIN_AUTH_TOKEN=; Path=/; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0";
add_header Set-Cookie "ZX_AUTH_TOKEN=; Path=/; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0";
add_header Set-Cookie "ZM_AUTH_TOKEN=; Path=/; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0";
add_header Set-Cookie "JSESSIONID=; Path=/; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0";
add_header Set-Cookie "AUTH_TOKEN_TYPE=; Path=/; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0";
add_header Set-Cookie "T=; Path=/; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0";
add_header Set-Cookie "Y=; Path=/; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0";
add_header Set-Cookie "ADMIN_AUTH_KEY=; Path=/; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0";
add_header Set-Cookie "ZM_ADMIN_AUTH_TOKEN=; Path=/; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0; HttpOnly; Secure; SameSite=Strict";
add_header Set-Cookie "ZX_AUTH_TOKEN=; Path=/; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0; HttpOnly; Secure; SameSite=Strict";
add_header Set-Cookie "ZM_AUTH_TOKEN=; Path=/; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0; HttpOnly; Secure; SameSite=Strict";
add_header Set-Cookie "JSESSIONID=; Path=/; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0; HttpOnly; Secure; SameSite=Strict";
add_header Set-Cookie "AUTH_TOKEN_TYPE=; Path=/; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0; HttpOnly; Secure; SameSite=Strict";
add_header Set-Cookie "T=; Path=/; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0; HttpOnly; Secure; SameSite=Strict";
add_header Set-Cookie "Y=; Path=/; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0; HttpOnly; Secure; SameSite=Strict";
add_header Set-Cookie "ADMIN_AUTH_KEY=; Path=/; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0; HttpOnly; Secure; SameSite=Strict";
${web.carbonio.admin.logout.redirect.vhost};
}

Expand Down
Loading