paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Web] Fix for last value of array in vars 

[Compose] Update Solr and Unbound images
master
andryyy 2019-02-08 20:55:05 +01:00
parent 86b11870e6
commit ff9113b35f
No known key found for this signature in database
GPG Key ID: 8EC34FF2794E25EF
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
data/web/inc/vars.inc.php
View File

@ -1,6 +1,6 @@
<?php <?php
error_reporting(E_ERROR); error_reporting(E_ERROR);
//error_reporting(E_ALL); error_reporting(E_ALL);
/* /*
PLEASE USE THE FILE "vars.local.inc.php" TO OVERWRITE SETTINGS AND MAKE THEM PERSISTENT! PLEASE USE THE FILE "vars.local.inc.php" TO OVERWRITE SETTINGS AND MAKE THEM PERSISTENT!
@ -28,7 +28,6 @@ if ($https_port === FALSE) {
$https_port = substr($_SERVER['HTTP_HOST'], $https_port+1); $https_port = substr($_SERVER['HTTP_HOST'], $https_port+1);
} }
// TODO: Switch from array_pop to array_key_last with release of PHP 7.3
// Alternatively select port here => // Alternatively select port here =>
//$https_port = 1234; //$https_port = 1234;
// Other settings => // Other settings =>
@ -44,18 +43,18 @@ $autodiscover_config = array(
// The autoconfig service will additionally announce the STARTTLS-enabled ports, specified in the "tlsport" variable. // The autoconfig service will additionally announce the STARTTLS-enabled ports, specified in the "tlsport" variable.
'imap' => array( 'imap' => array(
'server' => $mailcow_hostname, 'server' => $mailcow_hostname,
'port' => array_key_last(explode(':', getenv('IMAPS_PORT'))), 'port' => end(explode(':', getenv('IMAPS_PORT'))),
'tlsport' => array_key_last(explode(':', getenv('IMAP_PORT'))), 'tlsport' => end(explode(':', getenv('IMAP_PORT'))),
), ),
'pop3' => array( 'pop3' => array(
'server' => $mailcow_hostname, 'server' => $mailcow_hostname,
'port' => array_key_last(explode(':', getenv('POPS_PORT'))), 'port' => end(explode(':', getenv('POPS_PORT'))),
'tlsport' => array_key_last(explode(':', getenv('POP_PORT'))), 'tlsport' => end(explode(':', getenv('POP_PORT'))),
), ),
'smtp' => array( 'smtp' => array(
'server' => $mailcow_hostname, 'server' => $mailcow_hostname,
'port' => array_key_last(explode(':', getenv('SMTPS_PORT'))), 'port' => end(explode(':', getenv('SMTPS_PORT'))),
'tlsport' => array_key_last(explode(':', getenv('SUBMISSION_PORT'))), 'tlsport' => end(explode(':', getenv('SUBMISSION_PORT'))),
), ),
'activesync' => array( 'activesync' => array(
'url' => 'https://'.$mailcow_hostname.($https_port == 443 ? '' : ':'.$https_port).'/Microsoft-Server-ActiveSync', 'url' => 'https://'.$mailcow_hostname.($https_port == 443 ? '' : ':'.$https_port).'/Microsoft-Server-ActiveSync',

4
docker-compose.yml
View File

@ -2,7 +2,7 @@ version: '2.1'
services: services:
unbound-mailcow: unbound-mailcow:
image: mailcow/unbound:1.5 image: mailcow/unbound:1.6
build: ./data/Dockerfiles/unbound build: ./data/Dockerfiles/unbound
command: /usr/sbin/unbound command: /usr/sbin/unbound
environment: environment:
@ -395,7 +395,7 @@ services:
- dockerapi - dockerapi
solr-mailcow: solr-mailcow:
image: mailcow/solr:1.0 image: mailcow/solr:1.1
build: ./data/Dockerfiles/solr build: ./data/Dockerfiles/solr
restart: always restart: always
volumes: volumes: