diff --git a/CHANGELOG.md b/CHANGELOG.md index 3986e29..0454145 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# [1.0.0-next.5](https://github.com/getmeli/meli/compare/v1.0.0-next.4...v1.0.0-next.5) (2020-12-04) + + +### Bug Fixes + +* disable ssl for sites temporarily ([4477259](https://github.com/getmeli/meli/commit/44772595634660b315cc4d456d47b5b8556fc2a2)) + # [1.0.0-next.4](https://github.com/getmeli/meli/compare/v1.0.0-next.3...v1.0.0-next.4) (2020-12-04) diff --git a/LICENSE b/LICENSE index adccdfe..4c0eab7 100644 --- a/LICENSE +++ b/LICENSE @@ -3,7 +3,7 @@ Business Source License 1.1 Parameters Licensor: Charlie Bravo SRL -Licensed Work: Meli 1.0.0-next.4 +Licensed Work: Meli 1.0.0-next.5 The Licensed Work is (c) 2020 Charlie Bravo SRL Additional Use Grant: You may make use of the Licensed Work, provided that you may not use the Licensed Work for a Static Site diff --git a/package.json b/package.json index e24eb16..80ea487 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@skipper/core", - "version": "1.0.0-next.4", + "version": "1.0.0-next.5", "private": true, "description": "", "main": "src/index.js", diff --git a/src/caddy/generate-config.ts b/src/caddy/generate-config.ts index 5b46bf2..0ab7abb 100644 --- a/src/caddy/generate-config.ts +++ b/src/caddy/generate-config.ts @@ -2,7 +2,7 @@ import { Sites } from '../entities/sites/site'; import { env } from '../env'; import { generateSiteRoutes } from './config/generate-site-routes'; import { errors } from './config/errors'; -import { generateManualCertificatesConfig, generateServerTlsConfig } from './config/ssl'; +import { generateManualCertificatesConfig } from './config/ssl'; import { uiRoute } from './config/ui-route'; import { apiRoute } from './config/api-route'; import { URL } from 'url'; @@ -40,7 +40,7 @@ export async function generateConfig(): Promise { // fallback, ], errors, - ...(sslDisabled ? [] : generateServerTlsConfig(sites)), + // ...(sslDisabled ? [] : generateServerTlsConfig(sites)), }, }, },