diff --git a/README.md b/README.md index 045210b..f4c8d54 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,7 @@ Configuration takes place in the environment variables that are defined in ecosy | Variable | Description | Example | |----------------|:-------------------------|------------------------:| -| PORT | Own Port | 80 | +| PORT | Own Port | 8080 | | HOST | Own Host | "localhost" | | REDIS_URL | URL:PORT of redis server | "redis://localhost:6379"| | MYSQL_HOST | MySql Host | "localhost" | @@ -98,6 +98,7 @@ Configuration takes place in the environment variables that are defined in ecosy Notes: +- HOST / PORT is the host on which the ppfun server is listening. In example: If you have a reverse proxy on the same machine, HOST should still be unset or localhost, because it's where the proxy forwards to. - to be able to use USE_PROXYCHECK, you have to have an account on proxycheck.io or getipintel or another checker setup and you might set some proxies in`proxies.json` that get used for making proxycheck requests. Look into `src/isProxy.js` to see how things work, but keep in mind that this isn't neccessarily how pixelplanet.fun uses it. - Admins are users with 0cd and access to `Admintools`in their User Menu for image-upload and whatever - You can find out the id of a user by looking into the logs (i.e. `info: {ip} / {id} wants to place 2 in (1701, -8315)`) when he places a pixel or by checking the MySql Users database diff --git a/deployment/example-ecosystem.yml b/deployment/example-ecosystem.yml index fe2f1e8..f6b0721 100644 --- a/deployment/example-ecosystem.yml +++ b/deployment/example-ecosystem.yml @@ -5,7 +5,6 @@ apps: env: PORT: 80 HOST: "localhost" - ASSET_SERVER: "http://localhost" REDIS_URL: 'redis://localhost:6379' MYSQL_HOST: "localhost" MYSQL_USER: "pixelplanet" diff --git a/src/core/config.js b/src/core/config.js index 3d37067..ed9cfd5 100644 --- a/src/core/config.js +++ b/src/core/config.js @@ -9,7 +9,7 @@ if (process.env.BROWSER) { ); } -export const PORT = process.env.PORT || 80; +export const PORT = process.env.PORT || 8080; export const HOST = process.env.HOST || 'localhost'; export const GMAIL_USER = process.env.GMAIL_USER || null; @@ -30,7 +30,7 @@ export const BACKUP_DIR = process.env.BACKUP_DIR || null; // Proxycheck export const USE_PROXYCHECK = parseInt(process.env.USE_PROXYCHECK, 10) || false; -export const REDIS_URL = process.env.REDIS_URL || 'redis://localhost:6380'; +export const REDIS_URL = process.env.REDIS_URL || 'redis://localhost:6379'; // Database export const MYSQL_HOST = process.env.MYSQL_HOST || 'localhost'; export const MYSQL_DATABASE = process.env.MYSQL_DATABASE || 'pixelplanet';