NobMail

diff --cc data/Dockerfiles/clamd/Dockerfile
index f4d4765c,0c69beaa..f5a3903b
--- a/data/Dockerfiles/clamd/Dockerfile
+++ b/data/Dockerfiles/clamd/Dockerfile
@@@ -43,22 -30,18 +43,19 @@@ RUN apt-get update && apt-get install -
    && make install \
    && make clean \
    && cd .. && rm -rf clamav-${CLAMAV} \
 -  && apk del build-dependencies \
 -  && addgroup -S clamav \
 -  && adduser -S -D -h /var/lib/clamav -s /sbin/nologin -G clamav -g clamav clamav \
 -  && adduser clamav tty \
 -  && mkdir -p /run/clamav \
 -  && chown clamav:clamav /run/clamav \
 -  && chmod +x /dl_files.sh \
 -  && set -ex; /bin/bash /dl_files.sh \
 -  && chmod 750 /run/clamav
 +  && apt-get -y --auto-remove purge build-essential \
 +  && apt-get -y purge zlib1g-dev \
 +  libncurses5-dev \
 +  libzip-dev \
 +  libpcre2-dev \
 +  libxml2-dev \
 +  libssl-dev \
 +  libjson-c-dev \
 +  && addgroup --system --gid 700 clamav \
 +  && adduser --system --no-create-home --home /var/lib/clamav --uid 700 --gid 700 --disabled-login clamav \
-   && mkdir -p /run/clamav /var/lib/clamav \
-   && chown clamav:clamav /run/clamav /var/lib/clamav \
-   && chmod 750 /run/clamav \
 +  && rm -rf /tmp/* /var/tmp/*
  
 -# Port provision
 -EXPOSE 3310
 +COPY bootstrap.sh ./
 +COPY tini /sbin/tini
  
 -# AV daemon bootstrapping
  CMD ["/sbin/tini", "-g", "--", "/bootstrap.sh"]
diff --cc data/Dockerfiles/clamd/bootstrap.sh
index ba39e0a3,e12f2bc6..15618d72
--- a/data/Dockerfiles/clamd/bootstrap.sh
+++ b/data/Dockerfiles/clamd/bootstrap.sh
@@@ -14,6 -22,6 +14,10 @@@ if [[ ! -f /var/lib/clamav/whitelist.ig
    echo "Example-Signature.Ignore-1" > /var/lib/clamav/whitelist.ign2
  fi
  chown clamav:clamav /var/lib/clamav/whitelist.ign2
++mkdir -p /run/clamav /var/lib/clamav
++chown clamav:clamav /run/clamav /var/lib/clamav
++chmod 750 /run/clamav
++chmod 755 /var/lib/clamav
  
  dos2unix /var/lib/clamav/whitelist.ign2
  sed -i '/^\s*$/d' /var/lib/clamav/whitelist.ign2
diff --cc data/Dockerfiles/dovecot/Dockerfile
index 0cca60e8,0cca60e8..c0ddc998
--- a/data/Dockerfiles/dovecot/Dockerfile
+++ b/data/Dockerfiles/dovecot/Dockerfile
@@@ -97,6 -97,6 +97,7 @@@ RUN echo '30 3 * * *  vmail /usr/local/
  RUN echo '* * * * *   vmail /usr/local/bin/trim_logs.sh >> /dev/console 2>&1' > /etc/cron.d/trim_logs
  RUN echo '25 * * * *  vmail /usr/local/bin/maildir_gc.sh >> /dev/console 2>&1' > /etc/cron.d/maildir_gc
  RUN echo '30 1 * * *  root  /usr/local/bin/sa-rules.sh  >> /dev/console 2>&1' > /etc/cron.d/sa-rules
++RUN echo '0 2 * * *   root  /usr/bin/curl http://solr:8983/solr/dovecot/update?optimize=true >> /dev/console 2>&1' > /etc/cron.d/solr-optimize 
  COPY trim_logs.sh /usr/local/bin/trim_logs.sh
  COPY syslog-ng.conf /etc/syslog-ng/syslog-ng.conf
  COPY imapsync /usr/local/bin/imapsync
diff --cc data/Dockerfiles/solr/Dockerfile
index 00000000,00000000..f1eed87e
new file mode 100644
--- /dev/null
+++ b/data/Dockerfiles/solr/Dockerfile
@@@ -1,0 -1,0 +1,9 @@@
++FROM solr:7-alpine
++USER root
++COPY docker-entrypoint.sh /
++
++RUN apk --no-cache add su-exec curl \
++  && chmod +x /docker-entrypoint.sh \
++  && /docker-entrypoint.sh --bootstrap
++
++ENTRYPOINT ["/docker-entrypoint.sh"]
diff --cc data/Dockerfiles/solr/docker-entrypoint.sh
index 00000000,00000000..2d9d1752
new file mode 100755
--- /dev/null
+++ b/data/Dockerfiles/solr/docker-entrypoint.sh
@@@ -1,0 -1,0 +1,195 @@@
++#!/bin/bash
++
++if [[ "${SKIP_SOLR}" =~ ^([yY][eE][sS]|[yY])+$ ]]; then
++  echo "SKIP_SOLR=y, skipping Solr..."
++  sleep 365d
++  exit 0
++fi
++
++set -e
++
++# allow easier debugging with `docker run -e VERBOSE=yes`
++if [[ "$VERBOSE" = "yes" ]]; then
++  set -x
++fi
++
++# run the optional initdb
++. /opt/docker-solr/scripts/run-initdb
++
++function solr_config() {
++  curl -XPOST http://localhost:8983/solr/dovecot/schema -H 'Content-type:application/json' -d '{
++    "add-field-type":{
++      "name":"long",
++      "class":"solr.TrieLongField"
++    },
++    "add-field-type":{
++      "name":"text",
++      "class":"solr.TextField",
++      "positionIncrementGap":100,
++      "indexAnalyser":{
++        "tokenizer":{
++          "class":"solr.StandardTokenizerFactory"
++        },
++        "filter":{
++          "class":"solr.WordDelimiterFilterFactory",
++          "generateWordParts":1,
++          "generateNumberParts":1,
++          "catenateWorks":1,
++          "catenateNumbers":1,
++          "catenateAll":0
++        },
++        "filter":{
++          "class":"solr.LowerCaseFilterFactory"
++        },
++        "filter":{
++          "class":"solr.KeywordMarkerFilterFactory",
++          "protected":"protwords.txt"
++        }
++      },
++      "queryAnalyzer":{
++        "tokenizer":{
++          "class":"solr.StandardTokenizerFactory"
++        },
++        "filter":{
++          "synonyms":"synonyms.txt",
++          "ignoreCase":true,
++          "expand":true
++        },
++        "filter":{
++          "class":"solr.LowerCaseFilterFactory"
++        },
++        "filter":{
++          "class":"solr.WordDelimiterFilterFactory",
++          "generateWordParts":1,
++          "generateNumberParts":1,
++          "catenateWords":0,
++          "catenateNumbers":0,
++          "catenateAll":0,
++          "splitOnCaseChange":1
++        }
++      }
++    },
++    "add-field":{
++      "name":"uid",
++      "type":"long",
++      "indexed":true,
++      "stored":true,
++      "required":true
++    },
++    "add-field":{
++      "name":"box",
++      "type":"string",
++      "indexed":true,
++      "stored":true,
++      "required":true
++    },
++    "add-field":{
++      "name":"user",
++      "type":"string",
++      "indexed":true,
++      "stored":true,
++      "required":true
++    },
++    "add-field":{
++      "name":"hdr",
++      "type":"text",
++      "indexed":true,
++      "stored":false
++
++    },
++    "add-field":{
++      "name":"body",
++      "type":"text",
++      "indexed":true,
++      "stored":false
++    },
++    "add-field":{
++      "name":"from",
++      "type":"text",
++      "indexed":true,
++      "stored":false
++    },
++    "add-field":{
++      "name":"to",
++      "type":"text",
++      "indexed":true,
++      "stored":false
++    },
++    "add-field":{
++      "name":"cc",
++      "type":"text",
++      "indexed":true,
++      "stored":false
++    },
++    "add-field":{
++      "name":"bcc",
++      "type":"text",
++      "indexed":true,
++      "stored":false
++    },
++    "add-field":{
++      "name":"subject",
++      "type":"text",
++      "indexed":true,
++      "stored":false
++    }
++  }'
++
++  curl -XPOST http://localhost:8983/solr/dovecot/config -H 'Content-type:application/json' -d '{
++    "update-requesthandler":{
++      "name":"/select",
++      "class":"solr.SearchHandler",
++      "defaults":{
++        "wt":"xml"
++      }
++    }
++  }'
++
++  curl -XPOST http://localhost:8983/solr/dovecot/config/updateHandler -d '{
++    "set-property": {
++      "updateHandler.autoSoftCommit.maxDocs":500,
++      "updateHandler.autoSoftCommit.maxTime":120000,
++      "updateHandler.autoCommit.maxDocs":200,
++      "updateHandler.autoCommit.maxTime":1800000,
++      "updateHandler.autoCommit.openSearcher":false
++    }
++  }'
++}
++
++# fixing volume permission
++[[ -d /opt/solr/server/solr/dovecot/data ]] && chown -R solr:solr /opt/solr/server/solr/dovecot/data
++sed -i 's/#SOLR_HEAP="512m"/SOLR_HEAP="'${SOLR_HEAP:-1024}'m"/g' /opt/solr/bin/solr.in.sh
++
++# start a Solr so we can use the Schema API, but only on localhost,
++# so that clients don't see Solr until we have configured it.
++echo "Starting local Solr instance to setup configuration"
++su-exec solr start-local-solr
++
++# keep a sentinel file so we don't try to create the core a second time
++# for example when we restart a container.
++SENTINEL=/opt/docker-solr/core_created
++if [[ -f ${SENTINEL} ]]; then
++  echo "skipping core creation"
++else
++  echo "Creating core \"dovecot\""
++  su-exec solr /opt/solr/bin/solr create -c "dovecot"
++
++  # See https://github.com/docker-solr/docker-solr/issues/27
++  echo "Checking core"
++  while ! wget -O - 'http://localhost:8983/solr/admin/cores?action=STATUS' | grep -q instanceDir; do
++    echo "Could not find any cores, waiting..."
++    sleep 5
++  done
++  echo "Created core \"dovecot\""
++  touch ${SENTINEL}
++fi
++
++echo "Starting configuration"
++solr_config
++echo "Stopping local Solr"
++su-exec solr stop-local-solr
++if [[ "${1}" == "--bootstrap" ]]; then
++  exit 0
++else
++  exec su-exec solr solr-foreground
++fi
diff --cc data/conf/dovecot/dovecot.conf
index 0b3a8b9a,54211c25..05d205c7
--- a/data/conf/dovecot/dovecot.conf
+++ b/data/conf/dovecot/dovecot.conf
@@@ -20,7 -20,7 +20,7 @@@ disable_plaintext_auth = ye
  login_log_format_elements = "user=<%u> method=%m rip=%r lip=%l mpid=%e %c %k"
  mail_home = /var/vmail/%d/%n
  mail_location = maildir:~/
--mail_plugins = quota acl zlib listescape mail_crypt mail_crypt_acl mail_log notify
++mail_plugins = quota acl zlib listescape mail_crypt mail_crypt_acl mail_log notify fts fts_solr
  mail_attachment_fs = crypt:set_prefix=mail_crypt_global:posix:
  mail_attachment_dir = /var/attachments
  mail_attachment_min_size = 128k
@@@ -279,7 -273,7 +279,7 @@@ userdb 
  }
  protocol imap {
    imap_metadata = yes
--  mail_plugins = quota imap_quota imap_acl acl zlib imap_zlib imap_sieve listescape mail_crypt mail_crypt_acl notify mail_log
++  mail_plugins = quota imap_quota imap_acl acl zlib imap_zlib imap_sieve listescape mail_crypt mail_crypt_acl notify mail_log fts fts_solr
  }
  mail_attribute_dict = file:%h/dovecot-attributes
  protocol lmtp {
@@@ -291,9 -285,9 +291,12 @@@ protocol sieve 
  }
  plugin {
    # Allow "any" or "authenticated" to be used in ACLs
-   #acl_anyone = allow
+   acl_anyone = </usr/local/etc/dovecot/acl_anyone
    acl_shared_dict = file:/var/vmail/shared-mailboxes.db
    acl = vfile
++  fts = solr
++  fts_autoindex = yes
++  fts_solr = url=http://solr:8983/solr/dovecot/
    quota = dict:Userquota::proxy::sqlquota
    quota_rule2 = Trash:storage=+100%%
    sieve = /var/vmail/sieve/%u.sieve
diff --cc data/conf/rspamd/meta_exporter/pipe.php
index 1e37ab50,1e37ab50..187acc89
--- a/data/conf/rspamd/meta_exporter/pipe.php
+++ b/data/conf/rspamd/meta_exporter/pipe.php
@@@ -51,6 -51,6 +51,7 @@@ $raw_data = mb_convert_encoding($raw_da
  $headers = getallheaders();
  
  $qid      = $headers['X-Rspamd-Qid'];
++$subject      = $headers['X-Rspamd-Subject'];
  $score    = $headers['X-Rspamd-Score'];
  $rcpts    = $headers['X-Rspamd-Rcpt'];
  $user     = $headers['X-Rspamd-User'];
@@@ -188,10 -188,10 +189,11 @@@ foreach (json_decode($rcpts, true) as $
  foreach ($rcpt_final_mailboxes as $rcpt) {
    error_log("QUARANTINE: quarantine pipe: processing quarantine message for rcpt " . $rcpt);
    try {
--    $stmt = $pdo->prepare("INSERT INTO `quarantine` (`qid`, `score`, `sender`, `rcpt`, `symbols`, `user`, `ip`, `msg`, `action`)
++    $stmt = $pdo->prepare("INSERT INTO `quarantine` (`qid`, `subject`, `score`, `sender`, `rcpt`, `symbols`, `user`, `ip`, `msg`, `action`)
        VALUES (:qid, :score, :sender, :rcpt, :symbols, :user, :ip, :msg, :action)");
      $stmt->execute(array(
        ':qid' => $qid,
++      ':subject' => $subject,
        ':score' => $score,
        ':sender' => $sender,
        ':rcpt' => $rcpt,
diff --cc data/conf/sogo/sogo.conf
index 1fd33acd,1fd33acd..aa1a86ec
--- a/data/conf/sogo/sogo.conf
+++ b/data/conf/sogo/sogo.conf
@@@ -15,6 -15,6 +15,7 @@@
      SOGoFoldersSendEMailNotifications = YES;
      SOGoForwardEnabled = YES;
      SOGoUIAdditionalJSFiles = (js/custom-sogo.js);
++    SOGoEnablePublicAccess = YES;
  
      // Multi-domain setup
      // Domains are isolated, you can define visibility options here.
diff --cc data/web/debug.php
index d99213cc,d99213cc..84fc597c
--- a/data/web/debug.php
+++ b/data/web/debug.php
@@@ -4,7 -4,7 +4,12 @@@ require_once $_SERVER['DOCUMENT_ROOT'] 
  if (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == "admin") {
  require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/header.inc.php';
  $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
--
++if (strtolower(getenv('SKIP_SOLR')) == 'n') {
++  $solr_status = solr_status();
++}
++else {
++  $solr_status = false;
++}
  ?>
  <div class="container">
  
@@@ -58,6 -58,6 +63,34 @@@
                </div>
              </div>
            </div>
++          <div class="panel panel-default">
++            <div class="panel-heading">
++              <h3 class="panel-title">Solr status</h3>
++            </div>
++            <div class="panel-body">
++              <div class="row">
++                <div class="col-sm-3">
++                  <p><img class="img-responsive" alt="Solr Logo" width="128px" src=" data:image/png;base64,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" /></p>
++                </div>
++                <div class="col-sm-9">
++                  <?php
++                  if ($solr_status !== false):
++                  ?>
++                  <p>Uptime: ~<?=round($solr_status['uptime'] / 1000 / 60 / 60);?>h</p>
++                  <p>Started at: <?=$solr_status['startTime'];?></p>
++                  <p>Last modified: <?=$solr_status['index']['lastModified'];?></p>
++                  <p>Size: <?=$solr_status['index']['size'];?></p>
++                  <?php
++                  else:
++                  ?>
++                  <p>Solr is disabled or died.</p>
++                  <?php
++                  endif;
++                  ?>
++                </div>
++              </div>
++            </div>
++          </div>
            <div class="panel panel-default">
              <div class="panel-heading">
                <h3 class="panel-title"><?=$lang['debug']['containers_info'];?></h3>
diff --cc data/web/inc/functions.inc.php
index 312b87f7,89ccd037..de1d7d40
--- a/data/web/inc/functions.inc.php
+++ b/data/web/inc/functions.inc.php
@@@ -1452,17 -1452,4 +1452,52 @@@ function get_logs($application, $lines 
    }
    return false;
  }
 +function getGUID() {
 +  if (function_exists('com_create_guid')) {
 +    return com_create_guid();
 +  }
 +  mt_srand((double)microtime()*10000);//optional for php 4.2.0 and up.
 +  $charid = strtoupper(md5(uniqid(rand(), true)));
 +  $hyphen = chr(45);// "-"
 +  return substr($charid, 0, 8).$hyphen
 +        .substr($charid, 8, 4).$hyphen
 +        .substr($charid,12, 4).$hyphen
 +        .substr($charid,16, 4).$hyphen
 +        .substr($charid,20,12);
 +}
++function solr_status() {
++  $curl = curl_init();
++  $endpoint = 'http://solr:8983/solr/admin/cores';
++  $params = array(
++    'action' => 'STATUS',
++    'core' => 'dovecot',
++    'indexInfo' => 'true'
++  );
++  $url = $endpoint . '?' . http_build_query($params);
++  curl_setopt($curl, CURLOPT_URL, $url);
++  curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
++  curl_setopt($curl, CURLOPT_POST, 0);
++  curl_setopt($curl, CURLOPT_TIMEOUT, 20);
++  $response = curl_exec($curl);
++  if ($response === false) {
++    $err = curl_error($curl);
++    curl_close($curl);
++    // logger(array('return' => array(
++      // 'type' => 'danger',
++      // 'log' => array(__FUNCTION__, $action, $service_name, $attr1, $attr2, $extra_headers),
++      // 'msg' => $err,
++    // )));
++    return $err;
++  }
++  else {
++    curl_close($curl);
++    // logger(array('return' => array(
++      // 'type' => 'success',
++      // 'log' => array(__FUNCTION__, $action, $service_name, $attr1, $attr2, $extra_headers),
++    // )));
++    $status = json_decode($response, true);
++    return (!empty($status['status']['dovecot'])) ? $status['status']['dovecot'] : false;
++  }
++  return false;
++}
  ?>
diff --cc data/web/inc/init_db.inc.php
index 052c1b0e,052c1b0e..0c3323ab
--- a/data/web/inc/init_db.inc.php
+++ b/data/web/inc/init_db.inc.php
@@@ -3,7 -3,7 +3,7 @@@ function init_db_schema() 
    try {
      global $pdo;
  
--    $db_version = "15122018_0717";
++    $db_version = "14012019_0717";
  
      $stmt = $pdo->query("SHOW TABLES LIKE 'versions'");
      $num_results = count($stmt->fetchAll(PDO::FETCH_ASSOC));
@@@ -226,6 -226,6 +226,7 @@@
          "cols" => array(
            "id" => "INT NOT NULL AUTO_INCREMENT",
            "qid" => "VARCHAR(30) NOT NULL",
++          "subject" => "VARCHAR(500)",
            "score" => "FLOAT(8,2)",
            "ip" => "VARBINARY(16)",
            "action" => "CHAR(20) NOT NULL DEFAULT 'unknown'",
diff --cc docker-compose.yml
index 0216e4f1,fbe1f015..d13e9d81
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@@ -55,9 -55,10 +55,9 @@@ services
              - redis
  
      clamd-mailcow:
-       image: mailcow/clamd:1.18
 -      image: mailcow/clamd:1.15
++      image: mailcow/clamd:1.20
        build: ./data/Dockerfiles/clamd
        restart: always
 -      tty: true
        environment:
          - TZ=${TZ}
          - SKIP_CLAMD=${SKIP_CLAMD:-n}
@@@ -128,6 -129,6 +128,7 @@@
          - API_KEY=${API_KEY:-invalid}
          - API_ALLOW_FROM=${API_ALLOW_FROM:-invalid}
          - COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME:-mailcow-dockerized}
++        - SKIP_SOLR=${SKIP_SOLR:-y}
        restart: always
        dns:
          - ${IPV4_NETWORK:-172.22.1}.254
@@@ -373,7 -376,7 +376,7 @@@
              - watchdog
  
      dockerapi-mailcow:
--      image: mailcow/dockerapi:1.24
++      image: mailcow/dockerapi:1.25
        restart: always
        build: ./data/Dockerfiles/dockerapi
        oom_kill_disable: true
@@@ -389,6 -392,6 +392,23 @@@
            aliases:
              - dockerapi
  
++    solr-mailcow:
++      image: mailcow/solr:1.0
++      build: ./data/Dockerfiles/solr
++      restart: always
++      volumes:
++        - solr-vol-1:/opt/solr/server/solr/dovecot/data
++      dns:
++        - 172.22.1.254
++      dns_search: mailcow-network
++      environment:
++        - SOLR_HEAP=${SOLR_HEAP:-1024}
++        - SKIP_SOLR=${SKIP_SOLR:-y}
++      networks:
++        mailcow-network:
++          aliases:
++            - solr
++
      ipv6nat:
        depends_on:
          - unbound-mailcow
@@@ -406,6 -409,6 +426,7 @@@
          - netfilter-mailcow
          - watchdog-mailcow
          - dockerapi-mailcow
++        - solr-mailcow
        image: robbertkl/ipv6nat
        restart: always
        privileged: true
@@@ -433,5 -436,5 +454,6 @@@ volumes
    mysql-socket-vol-1:
    redis-vol-1:
    rspamd-vol-1:
++  solr-vol-1:
    postfix-vol-1:
    crypt-vol-1:
diff --cc generate_config.sh
index ed941db6,ed941db6..da224726
--- a/generate_config.sh
+++ b/generate_config.sh
@@@ -48,6 -48,6 +48,39 @@@ while [ -z "${MAILCOW_TZ}" ]; d
    fi
  done
  
++MEM_TOTAL=$(awk '/MemTotal/ {print $2}' /proc/meminfo)
++
++if [ ${MEM_TOTAL} -le "1572864" ]; then
++  echo "Installed memory is less than 1.5 GiB. It is recommended to disable ClamAV to prevent out-of-memory situations."
++  read -r -p  "Do you want to disable ClamAV now? ClamAV can be re-enabled by setting SKIP_CLAMD=n in mailcow.conf. [Y/n] " response
++  case $response in
++    [nN][oO]|[nN])
++      SKIP_CLAMD=n
++      ;;
++    *)
++      SKIP_CLAMD=y
++    ;;
++  esac
++else
++ SKIP_CLAMD=n
++fi
++
++if [ ${MEM_TOTAL} -le "6815744" ]; then
++  echo "Installed memory is less than 6.5 GiB. It is highly recommended to disable Solr to prevent out-of-memory situations."
++  echo "Solr is a prone to run OOM and should be monitored. The default Solr heap size is 1024 MiB and should be set according to your expected load in mailcow.conf."
++  read -r -p  "Do you want to disable Solr now (recommended)? Solr can be re-enabled by setting SKIP_SOLR=n in mailcow.conf. [Y/n] " response
++  case $response in
++    [nN][oO]|[nN])
++      SKIP_SOLR=n
++      ;;
++    *)
++      SKIP_SOLR=y
++    ;;
++  esac
++else
++  SKIP_SOLR=n
++fi
++
  [ ! -f ./data/conf/rspamd/override.d/worker-controller-password.inc ] && echo '# Placeholder' > ./data/conf/rspamd/override.d/worker-controller-password.inc
  
  cat << EOF > mailcow.conf
@@@ -145,6 -145,6 +178,13 @@@ SKIP_IP_CHECK=
  
  SKIP_CLAMD=n
  
++# Skip Solr on low-memory systems
++SKIP_SOLR=${SKIP_SOLR}
++
++# Solr heap size in MB, there is no recommendation, please see Solr docs.
++# Solr is a prone to run OOM and should be monitored. Unmonitored Solr setups are not recommended.
++SOLR_HEAP=1024
++
  # Enable watchdog (watchdog-mailcow) to restart unhealthy containers (experimental)
  
  USE_WATCHDOG=n
diff --cc update.sh
index 10f7f4e0,656c809f..226ce295
--- a/update.sh
+++ b/update.sh
@@@ -121,6 -121,7 +121,9 @@@ CONFIG_ARRAY=
    "API_KEY"
    "API_ALLOW_FROM"
    "MAILDIR_GC_TIME"
+   "ACL_ANYONE"
++  "SOLR_HEAP"
++  "SKIP_SOLR"
  )
  
  sed -i '$a\' mailcow.conf
@@@ -202,6 -203,19 +205,26 @@@ for option in ${CONFIG_ARRAY[@]}; d
        echo '# Check interval is hourly' >> mailcow.conf
        echo 'MAILDIR_GC_TIME=1440' >> mailcow.conf
      fi
+   elif [[ ${option} == "ACL_ANYONE" ]]; then
+     if ! grep -q ${option} mailcow.conf; then
+       echo "Adding new option \"${option}\" to mailcow.conf"
+       echo '# Set this to "allow" to enable the anyone pseudo user. Disabled by default.
+ ' >> mailcow.conf
+       echo '# When enabled, ACL can be created, that apply to "All authenticated users"
+ ' >> mailcow.conf
+       echo '# This should probably only be activated on mail hosts, that are used exclusivly by one organisation.
+ ' >> mailcow.conf
+       echo '# Otherwise a user might share data with too many other users.
+ ' >> mailcow.conf
+       echo 'ACL_ANYONE=disallow' >> mailcow.conf
+     fi
++  elif [[ ${option} == "SOLR_HEAP" ]]; then
++    if ! grep -q ${option} mailcow.conf; then
++      echo "Adding new option \"${option}\" to mailcow.conf"
++      echo '# Solr heap size, there is no recommendation, please see Solr docs.' >> mailcow.conf
++      echo '# Solr is a prone to run OOM and should be monitored. Unmonitored Solr setups are not recommended.' >> mailcow.conf
++      echo "SOLR_HEAP=1024" >> mailcow.conf
++  fi
    elif ! grep -q ${option} mailcow.conf; then
      echo "Adding new option \"${option}\" to mailcow.conf"
      echo "${option}=n" >> mailcow.conf