REL-0.12 Add option to disable devilbox Intranet

This commit is contained in:
cytopia 2017-09-26 16:58:24 +02:00
parent 1ad6de7e4c
commit c58b1e3db3
No known key found for this signature in database
GPG Key ID: 6D56EDB8695128A2
2 changed files with 40 additions and 17 deletions

View File

@ -234,7 +234,7 @@ services:
##
## Disable default vhost?
##
- VHOST_MAIN_DISABLE=${DEVILBOX_UI_DISABLE}
- MAIN_VHOST_DISABLE=${DEVILBOX_UI_DISABLE}
##
## Enable Mass Vhosts

View File

@ -16,7 +16,7 @@
###
### 1: Yes
### 0: No
DEBUG_COMPOSE_ENTRYPOINT=0
DEBUG_COMPOSE_ENTRYPOINT=1
###
@ -70,20 +70,6 @@ LOCAL_LISTEN_ADDR=127.0.0.1:
TLD_SUFFIX=loc
###
### TLD_SUFFIX domains are checked if they are set in the
### host computer /etc/hosts or available via attached DNS server.
### Timeout is done on vhosts.php (intranet) via ajax calls.
### In order to keep performance, set this to a low value.
### DNS checks might not succeed in time on slow machines.
### If DNS is valid, but timeout is expired, set this to a higher value.
###
### DNS_CHECK_TIMEOUT value is how many seconds to time out
### Default is to timeout after 1 second (DNS_CHECK_TIMEOUT=1)
###
DNS_CHECK_TIMEOUT=1
###
### Set your user id and group id
###
@ -102,6 +88,28 @@ NEW_GID=1000
TIMEZONE=Europe/Berlin
################################################################################
###
### INTRANET SETTINGS
###
################################################################################
###
### TLD_SUFFIX domains are checked if they are set in the
### host computer /etc/hosts or available via attached DNS server.
### Timeout is done on vhosts.php (intranet) via ajax calls.
### In order to keep performance, set this to a low value.
### DNS checks might not succeed in time on slow machines.
### If DNS is valid, but timeout is expired, set this to a higher value.
###
### DNS_CHECK_TIMEOUT value is how many seconds to time out
### Default is to timeout after 1 second (DNS_CHECK_TIMEOUT=1)
###
DNS_CHECK_TIMEOUT=1
###
### Devilbox UI Password protection enable/disable (1/0)
###
@ -132,6 +140,16 @@ DEVILBOX_UI_PROTECT=0
DEVILBOX_UI_PASSWORD=password
###
### Disable the Devilbox Intranet?
###
### Example:
### DEVILBOX_UI_PROTECT=1
### DEVILBOX_UI_PROTECT=0
###
DEVILBOX_UI_DISABLE=1
################################################################################
###
@ -331,7 +349,7 @@ PHP_XDEBUG_ENABLE=1
# Your local port (your computer host [not the docker])
# where your ide/editor is listening for xdebug connections.
PHP_XDEBUG_REMOTE_PORT=9000
PHP_XDEBUG_REMOTE_PORT=9001
# Your local IP address (your computer host [not the docker])
# where your ide/editor is listening for xdebug connections.
@ -352,6 +370,11 @@ PHP_XDEBUG_REMOTE_HOST=192.168.0.215
HOST_PORT_HTTPD=80
HTTPD_DOCROOT_DIR="htdocs"
HTTPD_TEMPLATE_DIR=".devilbox"
################################################################################
###