Merge branch 'proxy' into acs-base

This commit is contained in:
Brian Long 2021-04-02 08:42:43 -04:00
commit 6bce626075

5
.env
View File

@ -1,6 +1,5 @@
EXTERNAL_RESOURCE_DIR=~
ALFRESCO_DIR=${EXTERNAL_RESOURCE_DIR}/alfresco
ALFRESCO_LICENSE_DIR=${ALFRESCO_DIR}/license
ALFRESCO_DIR=~/alfresco
ALFRESCO_LICENSE_DIR=~/alfresco/license
PROXY_PROTOCOL=http
PROXY_HOST=localhost