diff --git a/README.md b/README.md index e9febd3f..41ff5d60 100644 --- a/README.md +++ b/README.md @@ -4,3 +4,7 @@ [![Check & fix styling](https://github.com/CaddyDz/KingBoosting/actions/workflows/style.yml/badge.svg)](https://github.com/CaddyDz/KingBoosting/actions/workflows/style.yml) [![Tests](https://github.com/CaddyDz/KingBoosting/actions/workflows/test.yml/badge.svg)](https://github.com/CaddyDz/KingBoosting/actions/workflows/test.yml) + +# Installation instructions +## Pre-requisites +- Node 14.x diff --git a/frontend/deploy.sh b/frontend/deploy.sh index 3894231f..d278cdd7 100644 --- a/frontend/deploy.sh +++ b/frontend/deploy.sh @@ -1,6 +1,7 @@ -cd /home/forge/staging.kingboosting.com +cd /home/forge/kingboosting.dsalim.dev git checkout . -git pull origin develop -npm install --production -npm run build --no-lock -pm2 start npm --name "staging.kingboosting.com" --watch -- start +git pull origin $FORGE_SITE_BRANCH +# npm install +# npm run build +# pm2 +# pm2 restart kingboosting.dsalim.dev \ No newline at end of file diff --git a/frontend/nginx.conf b/frontend/nginx.conf index 00efc263..47c7c35f 100644 --- a/frontend/nginx.conf +++ b/frontend/nginx.conf @@ -1,5 +1,5 @@ # FORGE CONFIG (DO NOT REMOVE!) -include forge-conf/eloboost.app/before/*; +include forge-conf/kingboosting.dsalim.dev/before/*; map $sent_http_content_type $expires { "text/html" epoch; @@ -10,18 +10,20 @@ map $sent_http_content_type $expires { server { listen 80; listen [::]:80; - server_name eloboost.app; + server_name kingboosting.dsalim.dev; server_tokens off; - root /home/forge/eloboost.app/; + root /home/forge/kingboosting.dsalim.dev/frontend/; add_header X-Frame-Options "SAMEORIGIN"; add_header X-XSS-Protection "1; mode=block"; add_header X-Content-Type-Options "nosniff"; + index index.html index.htm; + charset utf-8; # FORGE CONFIG (DO NOT REMOVE!) - include forge-conf/eloboost.app/server/*; + include forge-conf/kingboosting.dsalim.dev/server/*; location / { expires $expires; @@ -33,15 +35,16 @@ server { proxy_set_header X-Forwarded-Proto $scheme; proxy_read_timeout 1m; proxy_connect_timeout 1m; - proxy_pass http://127.0.0.1:3000; # set the address of the Node.js + proxy_pass http://127.0.0.1:3301; # set the address of the Node.js } location = /favicon.ico { access_log off; log_not_found off; } location = /robots.txt { access_log off; log_not_found off; } access_log off; - error_log /var/log/nginx/eloboost.app-error.log error; + error_log /var/log/nginx/kingboosting.dsalim.dev-error.log error; } # FORGE CONFIG (DO NOT REMOVE!) -include forge-conf/eloboost.app/after/*; +include forge-conf/kingboosting.dsalim.dev/after/*; + diff --git a/frontend/nuxt.config.js b/frontend/nuxt.config.js index 0d0ef26d..e12f0353 100644 --- a/frontend/nuxt.config.js +++ b/frontend/nuxt.config.js @@ -5,6 +5,7 @@ import router from "./config/router"; import plugins from "./config/plugins"; export default { + server: { port: 3301, }, vue: { config: { productionTip: false,