diff --git a/app/client/src/api/Api.tsx b/app/client/src/api/Api.tsx index bc6f54e6aa..a599879511 100644 --- a/app/client/src/api/Api.tsx +++ b/app/client/src/api/Api.tsx @@ -67,10 +67,7 @@ axiosInstance.interceptors.response.use( } } const errorData = error.response.data.responseMeta; - if ( - errorData.status === 404 && - errorData.error.code === 4028 - ) { + if (errorData.status === 404 && errorData.error.code === 4028) { history.push(PAGE_NOT_FOUND_URL); return Promise.reject({ code: 404, diff --git a/app/client/src/sagas/ErrorSagas.tsx b/app/client/src/sagas/ErrorSagas.tsx index ff08077e86..cf8b31ddd8 100644 --- a/app/client/src/sagas/ErrorSagas.tsx +++ b/app/client/src/sagas/ErrorSagas.tsx @@ -59,7 +59,7 @@ export function getResponseErrorMessage(response: ApiResponse) { : undefined; } -type ErrorPayloadType = { code?: number; message?: string, show?:boolean }; +type ErrorPayloadType = { code?: number; message?: string; show?: boolean }; let ActionErrorDisplayMap: { [key: string]: (error: ErrorPayloadType) => string; } = {}; @@ -92,7 +92,7 @@ export function* errorSaga( } = errorAction; const message = error && error.message ? error.message : ActionErrorDisplayMap[type](error); - + if (show && error && error.show) { // error.code !== 401 IS A HACK! // TODO(abhinav): Figure out a generic way diff --git a/deploy/install.sh b/deploy/install.sh index 513185b930..1f54fc07bd 100755 --- a/deploy/install.sh +++ b/deploy/install.sh @@ -130,7 +130,6 @@ if [[ "$setup_encryption" = "true" ]];then fi fi echo "" - read -p 'Would you like to host appsmith on a custom domain / subdomain? [Y/n]: ' setup_domain setup_domain=${setup_domain:-Y} if [ $setup_domain == "Y" -o $setup_domain == "y" -o $setup_domain == "yes" -o $setup_domain == "Yes" ];then diff --git a/deploy/template/docker.env.sh b/deploy/template/docker.env.sh index e63cea4133..e322ee0118 100644 --- a/deploy/template/docker.env.sh +++ b/deploy/template/docker.env.sh @@ -8,6 +8,10 @@ if [ -f docker-compose.yml ] fi cat > docker.env << EOF +# Read our documentation on how to configure these features +# https://docs.appsmith.com/v/v1.1/enabling-3p-services + +# ***** Email ********** APPSMITH_MAIL_ENABLED=false # APPSMITH_MAIL_HOST= # APPSMITH_MAIL_PASSWORD= @@ -15,16 +19,24 @@ APPSMITH_MAIL_ENABLED=false # APPSMITH_MAIL_SMTP_AUTH= # APPSMITH_MAIL_SMTP_TLS_ENABLED= # APPSMITH_MAIL_USERNAME= -# APPSMITH_MARKETPLACE_URL= -APPSMITH_MONGODB_URI=mongodb://$mongo_root_user:$mongo_root_password@$mongo_host/appsmith?retryWrites=true -# APPSMITH_OAUTH2_GITHUB_CLIENT_ID= -# APPSMITH_OAUTH2_GITHUB_CLIENT_SECRET= +# ****************************** + +# ******** Google OAuth ******** # APPSMITH_OAUTH2_GOOGLE_CLIENT_ID= # APPSMITH_OAUTH2_GOOGLE_CLIENT_SECRET= -# APPSMITH_RAPID_API_KEY_VALUE= -APPSMITH_REDIS_URL=redis://redis:6379 -# APPSMITH_ROLLBAR_ACCESS_TOKEN= -# APPSMITH_ROLLBAR_ENV= -# APPSMITH_SEGMENT_KEY= +# ****************************** +# ********* Github OAUth ********** +# APPSMITH_OAUTH2_GITHUB_CLIENT_ID= +# APPSMITH_OAUTH2_GITHUB_CLIENT_SECRET= +# ********************************* + +# ******** Google Maps *********** +# APPSMITH_GOOGLE_MAPS_API_KEY= +# ******************************** + +# ******** Database ************* +APPSMITH_REDIS_URL=redis://redis:6379 +APPSMITH_MONGODB_URI=mongodb://$mongo_root_user:$mongo_root_password@$mongo_host/appsmith?retryWrites=true +# ******************************* EOF