diff --git a/client/package.json b/client/package.json index c9b51709..02b1061c 100644 --- a/client/package.json +++ b/client/package.json @@ -14,6 +14,7 @@ "license": "GPL-3.0", "homepage": "https://mailtrain.org/", "dependencies": { + /* "@ckeditor/ckeditor5-alignment": "^10.0.3", "@ckeditor/ckeditor5-basic-styles": "^10.0.3", "@ckeditor/ckeditor5-block-quote": "^10.1.0", @@ -32,6 +33,7 @@ "@ckeditor/ckeditor5-theme-lark": "^11.1.0", "@ckeditor/ckeditor5-ui": "^11.1.0", "@ckeditor/ckeditor5-upload": "^10.0.3", + */ "axios": "^0.18.0", "datatables.net": "^1.10.19", "datatables.net-bs": "^1.10.19", @@ -69,8 +71,10 @@ "@babel/plugin-proposal-function-bind": "^7.0.0", "@babel/preset-env": "^7.0.0", "@babel/preset-react": "^7.0.0", + /* "@ckeditor/ckeditor5-dev-utils": "^11.0.1", "@ckeditor/ckeditor5-dev-webpack-plugin": "^7.0.1", + */ "babel-loader": "^8.0.4", "css-loader": "^1.0.1", "file-loader": "^2.0.0", diff --git a/server/config/default.yaml b/server/config/default.yaml index aeb6fa78..4aae41e3 100644 --- a/server/config/default.yaml +++ b/server/config/default.yaml @@ -47,6 +47,7 @@ enabledLanguages: # Inject custom scripts in subscription/layout.mjml.hbs # customSubscriptionScripts: [/custom/hello-world.js] + # If you start out as a root user (eg. if you want to use ports lower than 1000) # then you can downgrade the user once all services are up and running #user: mailtrain @@ -60,24 +61,24 @@ enabledLanguages: log: # silly|verbose|info|http|warn|error|silent - level: verbose + level: info www: # HTTP port to listen on for trusted requests (logged-in users) trustedPort: 3000 # HTTP port to listen on for sandboxed requests (logged-in users) - sandboxPort: 8081 + sandboxPort: 3003 # HTTP port to listen on for public requests (campaign recipients) - publicPort: 8082 + publicPort: 3004 # HTTP interface to listen on host: 0.0.0.0 # URL base for trusted urls (logged-in users). It must be absolute (starting with http:// or https://). If Mailtrain is served on # a non-standard port (e.g. 3000), the URL must also specify the port. trustedUrlBase: http://localhost:3000 # URL base for sandbox urls (logged-in users). It must be absolute (starting with http:// or https://) and contain the sandbox port. - sandboxUrlBase: http://localhost:8081 + sandboxUrlBase: http://localhost:3003 # URL base for public urls (campaign recipients). It must be absolute (starting with http:// or https://) and contain the sandbox port. - publicUrlBase: http://localhost:8082 + publicUrlBase: http://localhost:3004 # Secret for signing the session ID cookie diff --git a/server/workers/reports/config/default.yaml b/server/workers/reports/config/default.yaml index 99575b7f..4b9d7806 100644 --- a/server/workers/reports/config/default.yaml +++ b/server/workers/reports/config/default.yaml @@ -6,7 +6,7 @@ language: en log: # silly|verbose|info|http|warn|error|silent - level: verbose + level: info mysql: host: localhost