From 5f2d9509ba324054dc25137f296a6b3fa7aed786 Mon Sep 17 00:00:00 2001 From: cybafelo Date: Tue, 11 Jun 2019 19:02:02 +0000 Subject: [PATCH] ready to serve --- config.js | 17 ++--- hosts | 8 +- nginx/sites-available/r3.conf | 135 +++++++++++++++++----------------- start_r3_api | 3 +- start_r3_websocket | 3 +- 5 files changed, 83 insertions(+), 83 deletions(-) diff --git a/config.js b/config.js index 1e0b9f6..ddfe36f 100644 --- a/config.js +++ b/config.js @@ -2,15 +2,13 @@ var environment = { path : '/usr/share/cybafelo', protocol : 'https', websocketProtocol : 'wss', - websocketApp : 'r3-websocket', - context : 'dev', - domain : 'cybafelo.local', + websocketApp : 'websocket', + domain : 'r3js.org', remoteDomain : 'cybafelo.com', remoteEnvironment : 'live' }; var protocol = environment.protocol; -var context = environment.context; var domain = environment.domain; var remoteDomain = environment.remoteDomain; var remoteEnvironment = environment.remoteEnvironment; @@ -19,7 +17,7 @@ var websocketApp = environment.websocketApp; var config = { editor: { - url: protocol + '://' + context + '-r3-3ditor.' + domain, + url: protocol + '://editor.' + domain, default: { platform: 'cybafelo', account: 'root', @@ -28,7 +26,7 @@ var config = { } }, api: { - url: protocol + '://' + context + '-r3-api.' + domain, + url: protocol + '://api.' + domain, remoteUrl: protocol + '://' + remoteEnvironment + '-r3-api.' + remoteDomain, uploadPath: '/uploads', clientPassword: '"kent sent me" motherfucker!' @@ -36,13 +34,12 @@ var config = { websocket: { protocol : websocketProtocol, domain : domain, - context : context, application: websocketApp, - host : context + '-' + websocketApp + '.' + domain, - url : websocketProtocol + '://' + context + '-' + websocketApp + '.' + domain + host : websocketApp + '.' + domain, + url : websocketProtocol + '://' + websocketApp + '.' + domain }, portal: { - url: protocol + '://' + context + '-r3-portal.' + domain + url: protocol + '://portal.' + domain }, db: {}, environment : environment diff --git a/hosts b/hosts index dac4db5..f137403 100644 --- a/hosts +++ b/hosts @@ -9,7 +9,7 @@ # the app has to have a 1 to 1 mapping to the folder name which you cloned from the repo: -127.0.1.1 dev-r3-3ditor.cybafelo.local -127.0.1.1 dev-r3-portal.cybafelo.local -127.0.1.1 dev-r3-api.cybafelo.local -127.0.1.1 dev-r3-websocket.cybafelo.local +127.0.1.1 editor.r3js.org +127.0.1.1 portal.r3js.org +127.0.1.1 api.r3js.org +127.0.1.1 websocket.r3js.org diff --git a/nginx/sites-available/r3.conf b/nginx/sites-available/r3.conf index 1597c5d..af4fb70 100644 --- a/nginx/sites-available/r3.conf +++ b/nginx/sites-available/r3.conf @@ -1,76 +1,77 @@ # Define our node ports -upstream r3-api { - server 127.0.0.1:3104; +upstream api { + server 127.0.0.1:3104; } -upstream r3-websocket { - server 127.0.0.1:3105; +upstream websocket { + server 127.0.0.1:3105; } upstream php { - server 127.0.0.1:9001; + server 127.0.0.1:9001; } # Now define our sites server { listen 443 ssl default_server; - listen 80 default_server; - listen [::]:80 default_server ipv6only=on; + listen 80 default_server; + listen [::]:80 default_server ipv6only=on; + + ssl_certificate /etc/letsencrypt/live/r3js.org/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/r3js.org/privkey.pem; - ssl_certificate /usr/share/cybafelo/r3-config/cybafelo.local.cert.pem; - ssl_certificate_key /usr/share/cybafelo/r3-config/cybafelo.local.key.pem; - ssl_protocols TLSv1 TLSv1.1 TLSv1.2; - ssl_ciphers HIGH:!aNULL:!MD5; + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; + ssl_ciphers HIGH:!aNULL:!MD5; client_max_body_size 20M; - server_name ~^(?.*?)-(?.*?)\.(?.*); + server_name ~^(?.*?)\.(?.*); - root /usr/share/cybafelo/$app; + root /usr/share/cybafelo/r3js.org/$app; - location ~ \.php$ { - - if ($request_method = OPTIONS) { - add_header Access-Control-Allow-Origin $http_origin; - add_header Access-Control-Allow-Methods "GET, POST, PUT, DELETE, OPTIONS"; - add_header Access-Control-Allow-Headers "Authorization, Content-Type, x-authorization"; - add_header Access-Control-Allow-Credentials true; - return 200; - } + location ~ \.php$ { - add_header Access-Control-Allow-Origin $http_origin; + if ($request_method = OPTIONS) { + add_header Access-Control-Allow-Origin $http_origin; + add_header Access-Control-Allow-Methods "GET, POST, PUT, DELETE, OPTIONS"; + add_header Access-Control-Allow-Headers "Authorization, Content-Type, x-authorization"; + add_header Access-Control-Allow-Credentials true; + return 200; + } + + add_header Access-Control-Allow-Origin $http_origin; add_header Access-Control-Allow-Credentials true; - + fastcgi_pass php; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param SCRIPT_URL $request_uri; - fastcgi_param SERVER_NAME $http_host; - include fastcgi_params; - } + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param SCRIPT_URL $request_uri; + fastcgi_param SERVER_NAME $http_host; + include fastcgi_params; + } - location = / { - if ($request_method = OPTIONS) { - add_header Access-Control-Allow-Origin $http_origin; - add_header Access-Control-Allow-Methods "GET, POST, PUT, DELETE, OPTIONS"; - add_header Access-Control-Allow-Headers "Authorization, Content-Type, x-authorization"; - add_header Access-Control-Allow-Credentials true; - return 200; - } - add_header Access-Control-Allow-Origin $http_origin; + location = / { + if ($request_method = OPTIONS) { + add_header Access-Control-Allow-Origin $http_origin; + add_header Access-Control-Allow-Methods "GET, POST, PUT, DELETE, OPTIONS"; + add_header Access-Control-Allow-Headers "Authorization, Content-Type, x-authorization"; + add_header Access-Control-Allow-Credentials true; + return 200; + } + add_header Access-Control-Allow-Origin $http_origin; add_header Access-Control-Allow-Credentials true; - try_files /index.html @node; - } + try_files /index.html @node; + } location ~ { - if ($request_method = OPTIONS) { - add_header Access-Control-Allow-Origin $http_origin; - add_header Access-Control-Allow-Methods "GET, POST, PUT, DELETE, OPTIONS"; - add_header Access-Control-Allow-Headers "Authorization, Content-Type, x-authorization"; - add_header Access-Control-Allow-Credentials true; - return 200; - } + if ($request_method = OPTIONS) { + add_header Access-Control-Allow-Origin $http_origin; + add_header Access-Control-Allow-Methods "GET, POST, PUT, DELETE, OPTIONS"; + add_header Access-Control-Allow-Headers "Authorization, Content-Type, x-authorization"; + add_header Access-Control-Allow-Credentials true; + return 200; + } add_header Access-Control-Allow-Origin $http_origin; add_header Access-Control-Allow-Credentials true; add_header X-Content-Type-Options "nosniff"; @@ -78,30 +79,30 @@ server { } location @node { - + add_header Access-Control-Allow-Credentials true; - + # WebSocket support - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; - # Normal parameters - proxy_pass_request_headers on; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-NginX-Proxy true; + # Normal parameters + proxy_pass_request_headers on; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-NginX-Proxy true; - # Set Environment, App, and Domain - proxy_set_header X-R3-Env $environment; - proxy_set_header X-R3-App $app; - proxy_set_header X-R3-Host $host_domain; + # Set Environment, App, and Domain + proxy_set_header X-R3-Env live; + proxy_set_header X-R3-App $app; + proxy_set_header X-R3-Host $host_domain; - # Pass Everything to our app - proxy_pass http://$app; - proxy_ssl_session_reuse off; - proxy_set_header Host $http_host; - proxy_redirect off; + # Pass Everything to our app + proxy_pass http://$app; + proxy_ssl_session_reuse off; + proxy_set_header Host $http_host; + proxy_redirect off; } } diff --git a/start_r3_api b/start_r3_api index 02a9656..5aef530 100755 --- a/start_r3_api +++ b/start_r3_api @@ -1,3 +1,4 @@ #!/bin/bash cd /usr/share/cybafelo/r3-api -pm2 start bin/start --node-args="--inspect=3204" --name "r3-api" +#pm2 start bin/start --node-args="--inspect=3204" --name "r3-api" +pm2 start bin/start --name "r3-api" diff --git a/start_r3_websocket b/start_r3_websocket index acb5b5f..2525975 100755 --- a/start_r3_websocket +++ b/start_r3_websocket @@ -1,3 +1,4 @@ #!/bin/bash cd /usr/share/cybafelo/r3-websocket -pm2 start index.js --node-args="--inspect=3205" --name "r3-websocket" +#pm2 start index.js --node-args="--inspect=3205" --name "r3-websocket" +pm2 start index.js --name "r3-websocket"