Merge pull request #21 from Human-Connection/following

Following

Author: appinteractive

Dockerfile

@@ -4,6 +4,7 @@ LABEL Description="This image is used to start the hc-api-feathers" Vendor="Huma
 # update unix packages
 RUN apk update && apk upgrade
 RUN rm -rf /var/cache/apk/*
+RUN yarn global add pm2
 
 # expose the app port
 EXPOSE 3030
@@ -15,9 +16,12 @@ ENV NODE_ENV=production
 ENV API_PORT=3030
 
 # start the application in a autohealing cluster
-#CMD NODE_ENV=production pm2 start server/index.js -n api -i 0 --attach
+# NOTE: quick fix for server issues, restart api when reaching max of 300 MB Memory Usage (happens in conjunction with 100% CPU Usage)
+# TODO: find better way of dealing with that issue
+CMD NODE_ENV=production pm2 start server/index.js -n api --attach --max-memory-restart 300M
+# CMD NODE_ENV=production pm2 start server/index.js -n api -i 2 --attach
 # as we have issues with pm2 currently in conjunction with nuxt, we use the standard approach here
-CMD NODE_ENV=production node server/index.js
+# CMD NODE_ENV=production node server/index.js
 
 # create working directory
 RUN mkdir -p /var/www/

README.md

@@ -81,9 +81,10 @@ Getting up and running is as easy as 1, 2, 3, 4 ... 5.
    We are using [Thumbor](https://github.com/thumbor/thumbor) as a Thumbnail Microservice.
    You can install it locally if you like but this is totally optional.
    
-   - At first you have to [install](http://thumbor.readthedocs.io/en/latest/installing.html) it locally.
-   - After installation start it via the console with `thumbor`
-   - Set the `thumbor.url` in `config/local.json` to `http://localhost:8888` if not defined differently. The `thumbor.key` does not necessarily have to be defined, it just makes the URL more secure.
+   **Install OR use docker**
+   
+   - At first you have to [install](http://thumbor.readthedocs.io/en/latest/installing.html) it locally and start it in the console with `thumbor` **OR** run it with docker `docker run -p 8000:8000 apsl/thumbor`
+   - Set the `thumbor.url` in `config/local.json` to `http://localhost:8888` (with docker `http://localhost:8000`) if not defined differently. The `thumbor.key` does not necessarily have to be defined, it just makes the URL more secure.
    
    > Do not forget to always start it if you choose that setup or otherwise you will not see any pictures at all.
 

config/default.json

@@ -5,9 +5,10 @@
   "frontURL": "http://localhost:3000",
   "public": "../public/",
   "debug": true,
+  "logLevel": "log",
   "paginate": {
     "default": 10,
-    "max": 50
+    "max": 100
   },
   "thumbor": {
     "url": "",

config/production.json

@@ -5,6 +5,7 @@
   "frontURL": "WEBAPP_BASE_URL",
   "mongodb": "MONGO_DB",
   "debug": true,
+  "logLevel": "warn",
   "smtpConfig": {
     "host": "SMTP_HOST",
     "port": 587,

email-templates/account/email-verified/de/style.scss

@@ -1 +1 @@
-@import '../../layout/common';
+@import '../../../layout/common';

email-templates/account/email-verified/en/style.scss

@@ -1 +1 @@
-@import '../../layout/common';
+@import '../../../layout/common';

email-templates/account/identity-change/de/style.scss

@@ -1 +1 @@
-@import '../../layout/common';
+@import '../../../layout/common';

email-templates/account/identity-change/en/style.scss

@@ -1 +1 @@
-@import '../../layout/common';
+@import '../../../layout/common';

email-templates/account/password-change/de/style.scss

@@ -1 +1 @@
-@import '../../layout/common';
+@import '../../../layout/common';

email-templates/account/password-change/en/style.scss

@@ -1 +1 @@
-@import '../../layout/common';
+@import '../../../layout/common';