Merge branch 'master' into gnous

data/conf/nginx/includes/site-defaults.conf

@@ -3,6 +3,8 @@
   charset utf-8;
   override_charset on;
 
+  server_tokens off;
+
   ssl_protocols TLSv1.2 TLSv1.3;
   ssl_prefer_server_ciphers on;
   ssl_ciphers ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305;

data/conf/nginx/site.conf

@@ -1,4 +1,3 @@
-server_tokens off;
 proxy_cache_path /tmp levels=1:2 keys_zone=sogo:10m inactive=24h  max_size=1g;
 server_names_hash_bucket_size 64;
 

data/conf/phpfpm/php-conf.d/other.ini

@@ -1,2 +1,3 @@
 max_execution_time = 3600
 max_input_time = 3600
+memory_limit = 512M

data/conf/postfix/main.cf

@@ -15,7 +15,7 @@ smtpd_relay_restrictions = permit_mynetworks,
 alias_maps = hash:/etc/aliases
 alias_database = hash:/etc/aliases
 relayhost =
-mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 [fe80::]/10 [fc00::]/7
+mynetworks_style = subnet
 mailbox_size_limit = 0
 recipient_delimiter = +
 inet_interfaces = all
@@ -198,6 +198,3 @@ parent_domain_matches_subdomains = debug_peer_list,fast_flush_domains,mynetworks
 
 # DO NOT EDIT ANYTHING BELOW #
 # User overrides #
-
-myhostname = mail.gnous.fr
-

data/conf/rspamd/custom/bulk_header.map

@@ -1,5 +1,5 @@
 /X-EMV-Platform; .*/i
-/.*nur-1-click*/i
+/.*nur-1-click.*/i
 /.*episerver.*/i
 /.*supergewinne.*/i
 /List-Unsubscribe.*nbps\.eu/i

data/conf/rspamd/local.d/dkim_signing.conf

@@ -32,4 +32,4 @@ selector_prefix = "DKIM_SELECTORS";
 # forwards are arc signed, rejects are dkim signed
 sign_networks = "/etc/rspamd/custom/dovecot_trusted.map";
 use_domain_sign_networks = "header";
-sign_headers = "from:sender:reply-to:subject:date:message-id:to:cc:mime-version:content-type:content-transfer-encoding:resent-to:resent-cc:resent-from:resent-sender:resent-message-id:in-reply-to:references:list-id:list-help:list-owner:list-unsubscribe:list-subscribe:list-post:openpgp:autocrypt";
+sign_headers = "from:sender:reply-to:subject:date:message-id:to:cc:mime-version:content-type:content-transfer-encoding:content-language:resent-to:resent-cc:resent-from:resent-sender:resent-message-id:in-reply-to:references:list-id:list-help:list-owner:list-unsubscribe:list-subscribe:list-post:list-unsubscribe-post:disposition-notification-to:disposition-notification-options:original-recipient:openpgp:autocrypt";

data/conf/rspamd/local.d/multimap.conf

@@ -80,7 +80,6 @@ SIEVE_HOST {
   type = "ip";
   map = "${LOCAL_CONFDIR}/custom/dovecot_trusted.map";
   symbols_set = ["SIEVE_HOST"];
-  score = -15;
 }
 
 RSPAMD_HOST {

data/conf/rspamd/local.d/reputation.conf

@@ -3,7 +3,6 @@ rules {
     selector "ip" {
     }
     backend "redis" {
-      servers = "redis";
     }
     symbol = "IP_REPUTATION";
   }

data/conf/sogo/custom-theme.js

@@ -1,86 +1,36 @@
-/* -*- Mode: javascript; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-
+/* EXAMPLE - EXAMPLE - EXAMPLE - EXAMPLE - EXAMPLE - EXAMPLE - EXAMPLE
 (function() {
   'use strict';
-
   angular.module('SOGo.Common')
     .config(configure)
 
-  /**
-   * @ngInject
-   */
   configure.$inject = ['$mdThemingProvider'];
   function configure($mdThemingProvider) {
-
-    /**
-     * The SOGo palettes are defined in js/Common/Common.app.js:
-     *
-     * - sogo-green
-     * - sogo-blue
-     * - sogo-grey
-     *
-     * The Material palettes are also available:
-     *
-     * - red
-     * - pink
-     * - purple
-     * - deep-purple
-     * - indigo
-     * - blue
-     * - light-blue
-     * - cyan
-     * - teal
-     * - green
-     * - light-green
-     * - lime
-     * - yellow
-     * - amber
-     * - orange
-     * - deep-orange
-     * - brown
-     * - grey
-     * - blue-grey
-     *
-     * See https://material.angularjs.org/latest/Theming/01_introduction
-     * and https://material.io/archive/guidelines/style/color.html#color-color-palette
-     *
-     * You can also define your own palettes. See js/Common/Common.app.js.
-     */
-
-    // Create new background palette from grey palette
     var greyMap = $mdThemingProvider.extendPalette('grey', {
-      // background color of sidebar selected item,
-      // background color of right panel,
-      // background color of menus (autocomplete and contextual menus)
       '200': 'F5F5F5',
-      // background color of sidebar
       '300': 'E5E5E5',
-       // background color of the busy periods of the attendees editor
       '1000': '4C566A'
     });
     var greenCow = $mdThemingProvider.extendPalette('green', {
       '600': 'E5E5E5'
     });
-
     $mdThemingProvider.definePalette('frost-grey', greyMap);
     $mdThemingProvider.definePalette('green-cow', greenCow);
-
-    // Apply new palettes to the default theme, remap some of the hues
     $mdThemingProvider.theme('default')
       .primaryPalette('green-cow', {
-        'default': '400',  // background color of top toolbars
+        'default': '400',
         'hue-1': '400',
-        'hue-2': '600',    // background color of sidebar toolbar
+        'hue-2': '600',
         'hue-3': 'A700'
       })
       .accentPalette('green', {
-        'default': '600',  // background color of fab buttons
-        'hue-1': '300',    // background color of center list toolbar
+        'default': '600',
+        'hue-1': '300',
         'hue-2': '300',
         'hue-3': 'A700'
       })
       .backgroundPalette('frost-grey');
-
     $mdThemingProvider.generateThemesOnDemand(false);
   }
 })();
+ */

data/conf/sogo/sogo.conf

@@ -85,7 +85,7 @@
   //LDAPDebugEnabled = YES;
   //PGDebugEnabled = YES;
   //MySQL4DebugEnabled = YES;
-  SOGoUIxDebugEnabled = YES;
+  //SOGoUIxDebugEnabled = YES;
   //WODontZipResponse = YES;
     WOLogFile = "/dev/sogo_log";
 }