Merge branch 'master' into 849-apache-webroot
# Conflicts: # DOCUMENTATION/content/getting-started/index.md
This commit is contained in:
@ -36,7 +36,7 @@ WORKSPACE_INSTALL_NODE=false
|
||||
WORKSPACE_INSTALL_YARN=false
|
||||
WORKSPACE_INSTALL_DRUSH=false
|
||||
WORKSPACE_INSTALL_AEROSPIKE_EXTENSION=false
|
||||
WORKSPACE_INSTALL_INSTALL_V8JS_EXTENSION=false
|
||||
WORKSPACE_INSTALL_V8JS_EXTENSION=false
|
||||
WORKSPACE_COMPOSER_GLOBAL_INSTALL=false
|
||||
WORKSPACE_INSTALL_WORKSPACE_SSH=false
|
||||
WORKSPACE_INSTALL_LARAVEL_ENVOY=false
|
||||
@ -156,7 +156,7 @@ MINIO_PORT=9000
|
||||
|
||||
### ADMINER ############################################################################################################
|
||||
|
||||
ADM_PORT=88
|
||||
ADM_PORT=8080
|
||||
|
||||
### PHP MY ADMIN #######################################################################################################
|
||||
|
||||
@ -169,7 +169,7 @@ PMA_DB_ENGINE=mysql
|
||||
PMA_USER=default
|
||||
PMA_PASSWORD=secret
|
||||
PMA_ROOT_PASSWORD=secret
|
||||
PMA_PORT=88
|
||||
PMA_PORT=8080
|
||||
|
||||
### VARNISH ############################################################################################################
|
||||
|
||||
|
Reference in New Issue
Block a user