From 5989f56aad7efd4b8317a313a41cffd322a7c845 Mon Sep 17 00:00:00 2001 From: "Theunis J. Botha" Date: Wed, 22 Mar 2017 12:05:57 +0100 Subject: [PATCH] one config --- bash_aliases | 1 + bash_history | 158 +++++++++++++++++++++++++++ clients.js | 12 +- hosts | 16 ++- nginx/backup/api-runtime.conf | 69 ------------ nginx/backup/api.conf | 25 ----- nginx/backup/app.conf | 19 ---- nginx/backup/dev-core.conf | 34 ------ nginx/backup/games.conf | 15 --- nginx/backup/gate.conf | 25 ----- nginx/backup/masker.conf | 37 ------- nginx/backup/port.conf | 25 ----- nginx/backup/redirect.conf | 37 ------- nginx/backup/salesshuttle.de | 50 --------- nginx/backup/www.conf | 39 ------- nginx/conf.d/ports.conf | 4 + nginx/nginx.conf | 2 +- nginx/sites-available/3d-editor.conf | 24 ---- nginx/sites-available/3d-pong.conf | 29 ----- nginx/sites-available/3d-racing.conf | 29 ----- nginx/sites-available/api-v1.6.conf | 25 ----- nginx/sites-available/gamewheel.conf | 27 +++-- nginx/sites-available/tools.conf | 34 ------ nginx/ssl/ssl.conf | 4 +- start_editor_v1 => start_editor | 0 start_editor_v2 | 5 - start_editor_v3 | 5 - 27 files changed, 198 insertions(+), 552 deletions(-) delete mode 100644 nginx/backup/api-runtime.conf delete mode 100644 nginx/backup/api.conf delete mode 100644 nginx/backup/app.conf delete mode 100644 nginx/backup/dev-core.conf delete mode 100644 nginx/backup/games.conf delete mode 100644 nginx/backup/gate.conf delete mode 100644 nginx/backup/masker.conf delete mode 100644 nginx/backup/port.conf delete mode 100644 nginx/backup/redirect.conf delete mode 100644 nginx/backup/salesshuttle.de delete mode 100644 nginx/backup/www.conf delete mode 100644 nginx/sites-available/3d-editor.conf delete mode 100644 nginx/sites-available/3d-pong.conf delete mode 100644 nginx/sites-available/3d-racing.conf delete mode 100644 nginx/sites-available/api-v1.6.conf delete mode 100644 nginx/sites-available/tools.conf rename start_editor_v1 => start_editor (100%) delete mode 100755 start_editor_v2 delete mode 100755 start_editor_v3 diff --git a/bash_aliases b/bash_aliases index ff4a5f7..f07c9f3 100644 --- a/bash_aliases +++ b/bash_aliases @@ -17,3 +17,4 @@ alias e2='cd /usr/share/gamewheel && ./start_editor_v2' alias e3='cd /usr/share/gamewheel && ./start_editor_v3' alias l='cd /usr/share/gamewheel && ./logs' alias m='pm2 monit' +alias list='pm2 list' diff --git a/bash_history b/bash_history index b5bb3c4..8d2c10d 100644 --- a/bash_history +++ b/bash_history @@ -21805,3 +21805,161 @@ ls ./start_pong l exit +m +l +sudo service nginx restart +ssh gw-beta +ls +cd /etc/nginx/ +ls +cd sites-available +ls +git diff +git status +git add ../start_mail +git commit -am "config changes" +git push +git checkout crispy-dev +git pull +git checkout tj-dev +ls +cd +c +cd config/ +ls +cd nginx/ +ls +git commit -am "move conf files" +git push +git checkout crispy-dev +git checkout tj-dev +cd +c +cd config/ +git checkout tj-dev +git checkout crispy-dev -- certificate +ls +cd certificate/ +ls +git commit -am "certificate" +git push +cd .. +grep "\.local" * -R +grep "\.local" * -Rl | xargs sed -i "s/\.local/\.com/g" +git diff +ls +grep "gamewheel.com" * -R +grep "gamewheel.com" * -Rl | xargs sed -i "s/(\s*)(.*)\.gamewheel.com/\1tj-\2\.gamewheel.com/" +grep "gamewheel.com" * -Rl | xargs sed -i "s/\(\s*\)\(.*\)\.gamewheel.com/\1tj-\2\.gamewheel.com/" +cd .. +grep "\.local" * -Rl | xargs sed -i "s/\.local/\.com/g" +mv nginx ../ +grep "gamewheel.com" * -Rl | xargs sed -i "s/\(\s*\)\(.*\)\.gamewheel.com/\1tj-\2\.gamewheel.com/" +grep "gamewheel.com" * -Rl | xargs sed -i "s/\(\s+\)\(.*\)\.gamewheel.com/\1tj-\2\.gamewheel.com/" +mv ../nginx . +ls +vim hosts +ls +cd nginx/ +ls +git diff +git commit -am "refactorign" +git push +git checkout crispy-dev +git pull +c +cd config/ +git pull +git commit -am "crispy dev" +git push +git checkout tj-dev +git checkout crispy-dev -- nginx/sites-available/gamewheel.conf +ls +cd /etc/nginx/ +ls +rm ssl.conf +sudo rm ssl.conf +cd /etc/ +ls +vim hostname +sudo vim hostname +ls +vim host.conf +ls +cd nginx/ +l +ls +c +cd /etc/nginx/ +ls +ln -s /usr/share/gamewheel/config/nginx/ssl/ +sudo ln -s /usr/share/gamewheel/config/nginx/ssl/ +ls +cd conf.d/ +ls +cd .. +sudo rm conf.d/ +sudo rm -rf conf.d +ls +sudo ln -s /usr/share/gamewheel/config/nginx/conf.d/ +ls +cd conf.d +ls +cd .. +ls +sudo rm sites-available +sudo ln -s /usr/share/gamewheel/config/nginx/sites-available/ +ls -l +cd sites-available +ls +cd .. +cd sites-enabled/ +ls +sudo rm server.conf +sudo ln -s ../sites-available/gamewheel.conf +ls +sudo service nginx restart +cd .. +ls +cd ssl +ls +sudo service nginx restart +c +ls +./start_gate +cd config/ +git diff +git commit -am "fix fallback upstream to gate" +git push +ssh gw-beta +exit +tail -f /var/log/syslog +tail -f /var/log/nginx/*.log +ssh gw-beta +exit +ping lab.gamewheel.com +ping beta.gamewheel.com +ping beta-api.gamewheel.com +exit +sudo service nginx restart +r +sudo service nginx restart +ls +l +exit +l +r +exit +sudo service nginx restart +cd /etc/nginx/ +ls +cd sites-enabled/ +ls +tail -f /var/log/nginx/*.log +exit +pm2 list +lsit +exit +whoami +hostname +ssh gw-beta diff --git a/clients.js b/clients.js index cc16930..c682b07 100644 --- a/clients.js +++ b/clients.js @@ -1,12 +1,12 @@ var clients = { '3d-pong' : { title : "Gamewheel Multiplayer VR Pong", - tj-ogUrl : "http://3d-pong.gamewheel.com", + ogUrl : "http://3d-pong.gamewheel.com", ogType : "website", ogTitle : "Gamewheel Multiplayer VR Pong", ogDescription : "Games is our game", - tj-ogImage : "http://3d-pong.gamewheel.com/pong_image.png", - tj-ctaUrl : "https://www.gamewheel.com", + ogImage : "http://3d-pong.gamewheel.com/pong_image.png", + ctaUrl : "https://www.gamewheel.com", account : 'root', subAccount : 'root', nameOfTheGame : 'pong', @@ -18,18 +18,18 @@ var clients = { 'default': { title : 'Great Job!', message : 'Challenge your friends or learn more about Gamewheel', - tj-cta : 'https://www.gamewheel.com', + cta : 'https://www.gamewheel.com', quote : 'VR PONG!' } } }, '3doo' : { title : "3doo - VR Pong", - tj-ogUrl : "http://3doo.gamewheel.com", + ogUrl : "http://3doo.gamewheel.com", ogType : "website", ogTitle : "3doo – VR App", ogDescription : "Spiele PONG in 3d und VR mit 3doo", - tj-ogImage : "http://3doo.gamewheel.com/pong_image.png", + ogImage : "http://3doo.gamewheel.com/pong_image.png", ctaUrl : "https://3doo.com", account : '3doo', subAccount : 'root', diff --git a/hosts b/hosts index da01929..528d11b 100644 --- a/hosts +++ b/hosts @@ -1,15 +1,14 @@ 127.0.0.1 localhost 127.0.1.1 cybafelo 127.0.1.1 cybafelo.gamewheel.com -127.0.1.1 cybafelo.gamewheel.local # Gamewheel dev endpoints -127.0.1.1 3d-editor.gamewheel.com -127.0.1.1 3d-pong.gamewheel.com -127.0.1.1 3doo.gamewheel.com -127.0.1.1 3d-racing.gamewheel.com -127.0.1.1 api-v1.6.gamewheel.com -127.0.1.1 tools.gamewheel.com +127.0.1.1 tj-3d-editor.gamewheel.com +127.0.1.1 tj-3d-pong.gamewheel.com +127.0.1.1 tj-3doo.gamewheel.com +127.0.1.1 tj-3d-racing.gamewheel.com +127.0.1.1 tj-api-v1.6.gamewheel.com +127.0.1.1 tj-tools.gamewheel.com 127.0.1.1 tj-gate.gamewheel.com 127.0.1.1 tj-content.gamewheel.com 127.0.1.1 tj-asset.gamewheel.com @@ -17,8 +16,7 @@ 127.0.1.1 tj-app.gamewheel.com 127.0.1.1 tj-api.gamewheel.com 127.0.1.1 tj-cdn.gamewheel.com -127.0.1.1 mail.gamewheel.com -127.0.1.1 test.gamewheel.com +127.0.1.1 tj-mail.gamewheel.com # The following lines are desirable for IPv6 capable hosts ::1 ip6-localhost ip6-loopback diff --git a/nginx/backup/api-runtime.conf b/nginx/backup/api-runtime.conf deleted file mode 100644 index cfd721d..0000000 --- a/nginx/backup/api-runtime.conf +++ /dev/null @@ -1,69 +0,0 @@ -#origin git@github.com:ToywheelDev/GW_Runtime.git -#origin git@github.com:ToywheelDev/gw-statistic.git -server { - listen 80; - - tj-server_name api-runtime.gamewheel.com; - - #root /usr/share/gamewheel/GW_Runtime - port 3108 (old api runtime) - #root /usr/share/gamewheel/gw-statistic - port 3109 (new api runtime) - - location /lead/trigger/ { - auth_basic "Restricted"; #For Basic Auth - auth_basic_user_file /etc/nginx/.htpasswd; #For Basic Auth - 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; - proxy_pass http://127.0.0.1:3109; - proxy_ssl_session_reuse off; - proxy_set_header Host $http_host; - proxy_redirect off; - proxy_read_timeout 99999s; - proxy_connect_timeout 99999s; - proxy_send_timeout 99999s; - } - - location /form { - 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; - proxy_pass http://127.0.0.1:3108; - proxy_ssl_session_reuse off; - proxy_set_header Host $http_host; - proxy_redirect off; - proxy_read_timeout 99999s; - proxy_connect_timeout 99999s; - proxy_send_timeout 99999s; - } - - location /lead { - 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; - proxy_pass http://127.0.0.1:3108; - proxy_ssl_session_reuse off; - proxy_set_header Host $http_host; - proxy_redirect off; - proxy_read_timeout 99999s; - proxy_connect_timeout 99999s; - proxy_send_timeout 99999s; - } - - location / { - 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; - proxy_pass http://127.0.0.1:3109; - proxy_ssl_session_reuse off; - proxy_set_header Host $http_host; - proxy_redirect off; - proxy_read_timeout 99999s; - proxy_connect_timeout 99999s; - proxy_send_timeout 99999s; - } -} - diff --git a/nginx/backup/api.conf b/nginx/backup/api.conf deleted file mode 100644 index 48ddeaf..0000000 --- a/nginx/backup/api.conf +++ /dev/null @@ -1,25 +0,0 @@ -#origin git@github.com:ToywheelDev/gamewheel-api.git -server { - listen 80; - - tj-server_name api.gamewheel.com; - - root /usr/share/gamewheel/api; - - location / { - add_header Access-Control-Allow-Origin $http_origin; - autoindex on; - try_files $uri $uri/ @node; - } - - location @node { - 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; - proxy_pass http://127.0.0.1:3107; - proxy_ssl_session_reuse off; - proxy_set_header Host $http_host; - proxy_redirect off; - } -} diff --git a/nginx/backup/app.conf b/nginx/backup/app.conf deleted file mode 100644 index 566004c..0000000 --- a/nginx/backup/app.conf +++ /dev/null @@ -1,19 +0,0 @@ -#origin git@github.com:ToywheelDev/gw-app.git -server { - listen 80; - - tj-server_name app.gamewheel.com; - - root /usr/share/gamewheel/gw-app/dist; - - location / { - 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; - proxy_pass http://127.0.0.1:3106; - proxy_ssl_session_reuse off; - proxy_set_header Host $http_host; - proxy_redirect off; - } -} diff --git a/nginx/backup/dev-core.conf b/nginx/backup/dev-core.conf deleted file mode 100644 index 42955e2..0000000 --- a/nginx/backup/dev-core.conf +++ /dev/null @@ -1,34 +0,0 @@ -server { - listen 80; - listen 443 ssl; - - tj-server_name dev-core.gamewheel.com; - - root /srv/gamewheel.com/dev-core; - index index.php; - - tj-access_log /var/log/nginx/dev-core.gamewheel.com.access.log; - tj-error_log /var/log/nginx/dev-core.gamewheel.com.error.log; - - ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem; - ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key; - ssl_session_timeout 5m; - ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2; - ssl_ciphers "HIGH:!aNULL:!MD5 or HIGH:!aNULL:!MD5:!3DES"; - ssl_prefer_server_ciphers on; - - add_header Access-Control-Allow-Origin '*'; - - location / { - autoindex on; - try_files $uri $uri/ /index.php?$args; - } - - location ~ \.*.php$ { - include fastcgi_params; - fastcgi_split_path_info ^(.+\.php)(.*)$; - fastcgi_pass 127.0.0.1:9001; - fastcgi_intercept_errors on; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - } -} diff --git a/nginx/backup/games.conf b/nginx/backup/games.conf deleted file mode 100644 index 07d5518..0000000 --- a/nginx/backup/games.conf +++ /dev/null @@ -1,15 +0,0 @@ -server { - listen 80; - - tj-server_name games.gamewheel.com; - - root /srv/gamewheel.com/games; - index index.html index.htm; - - add_header Access-Control-Allow-Origin "$http_origin"; - - location / { - autoindex on; - try_files $uri $uri/ =404; - } -} diff --git a/nginx/backup/gate.conf b/nginx/backup/gate.conf deleted file mode 100644 index 3c64f46..0000000 --- a/nginx/backup/gate.conf +++ /dev/null @@ -1,25 +0,0 @@ -#origin git@github.com:ToywheelDev/gamewheel-gate.git -server { - listen 80; - - tj-server_name gate.gamewheel.com; - - root /usr/share/gamewheel/gate; - - location / { - add_header Access-Control-Allow-Origin $http_origin; - autoindex on; - try_files $uri $uri/ @node; - } - - location @node { - 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; - proxy_pass http://127.0.0.1:3111; - proxy_ssl_session_reuse off; - proxy_set_header Host $http_host; - proxy_redirect off; - } -} diff --git a/nginx/backup/masker.conf b/nginx/backup/masker.conf deleted file mode 100644 index 73796f8..0000000 --- a/nginx/backup/masker.conf +++ /dev/null @@ -1,37 +0,0 @@ -server { - listen 80; - # listen 443 ssl; - # Replace here with proper server FQDN - tj-server_name masker.gamewheel.com; - - # Replace here with proper logs paths - tj-access_log /var/log/nginx/masker.gamewheel.com.access.log; - tj-error_log /var/log/nginx/masker.gamewheel.com.error.log; - - # Replace here with proper certificates paths - # ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem; - # ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key; - - #ssl_session_timeout 5m; - #ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2; - #ssl_ciphers "HIGH:!aNULL:!MD5 or HIGH:!aNULL:!MD5:!3DES"; - #ssl_prefer_server_ciphers on; - - # Replace here with proper allowed origins - tj-# add_header Access-Control-Allow-Origin "http://app.gamewheel.com"; - # add_header Access-Control-Allow-Credentials true; - add_header Access-Control-Allow-Methods 'HEAD, GET, POST, PUT, DELETE, OPTIONS'; - add_header Access-Control-Allow-Headers 'origin, x-requested-with, content-type, accept, authorization, Access-Control-Request-Headers, Access-Control-Request-Method, x-gw-api-rt-key, x-gw-api-rt-token'; - - location / { - 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; - # Replace here with proper host/port - proxy_pass http://127.0.0.1:3300; - proxy_ssl_session_reuse off; - proxy_set_header Host $http_host; - proxy_redirect off; - } -} diff --git a/nginx/backup/port.conf b/nginx/backup/port.conf deleted file mode 100644 index 24476ec..0000000 --- a/nginx/backup/port.conf +++ /dev/null @@ -1,25 +0,0 @@ -#origin git@github.com:ToywheelDev/gamewheel-port.git -server { - listen 80; - - tj-server_name port.gamewheel.com; - - root /usr/share/gamewheel/port; - - location / { - add_header Access-Control-Allow-Origin $http_origin; - autoindex on; - try_files $uri $uri/ @node; - } - - location @node { - 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; - proxy_pass http://127.0.0.1:3110; - proxy_ssl_session_reuse off; - proxy_set_header Host $http_host; - proxy_redirect off; - } -} diff --git a/nginx/backup/redirect.conf b/nginx/backup/redirect.conf deleted file mode 100644 index 707515e..0000000 --- a/nginx/backup/redirect.conf +++ /dev/null @@ -1,37 +0,0 @@ -### -# https://gamewheel.com -# redirect to -# https://www.gamewheeel.com -### - -server { - - listen 443 ssl; - server_name gamewheel.com; - - ssl off; - ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem; - ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key; - ssl_session_timeout 5m; - ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2; - ssl_ciphers "HIGH:!aNULL:!MD5 or HIGH:!aNULL:!MD5:!3DES"; - ssl_prefer_server_ciphers on; - - tj-return 301 https://www.gamewheel.com$request_uri; -} - - -### -# http://(www.)gamewheel.com -# redirect to -# https://www.gamewheeel.com -### - -server { - - listen 80; - tj-server_name gamewheel.com www.gamewheel.com; - - tj-return 301 https://www.gamewheel.com$request_uri; -} - diff --git a/nginx/backup/salesshuttle.de b/nginx/backup/salesshuttle.de deleted file mode 100644 index bd66677..0000000 --- a/nginx/backup/salesshuttle.de +++ /dev/null @@ -1,50 +0,0 @@ -server { - listen 80; - #listen 443 ssl; - - server_name salesshuttle.de www.salesshuttle.de; - - root /srv/salesshuttle.de/www; - index index.php; - - # Log Config - access_log /var/log/nginx/salesshuttle.de.access.log; - error_log /var/log/nginx/salesshuttle.de.error.log; - - # SSL Config - #ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem; - #ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key; - #ssl_session_timeout 5m; - #ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2; - #ssl_ciphers "HIGH:!aNULL:!MD5 or HIGH:!aNULL:!MD5:!3DES"; - #ssl_prefer_server_ciphers on; - - add_header 'Access-Control-Allow-Origin' '$http_origin'; - - location / { - add_header Access-Control-Allow-Origin $http_origin; - autoindex on; - try_files $uri $uri/ /index.php?$args; - } - - location ~ \.php$ { - fastcgi_pass 127.0.0.1:9001; - 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 @node { -# 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; -# proxy_pass http://127.0.0.1:3103; -# proxy_ssl_session_reuse off; -# proxy_set_header Host $http_host; -# proxy_redirect off; -# } -} diff --git a/nginx/backup/www.conf b/nginx/backup/www.conf deleted file mode 100644 index 586b316..0000000 --- a/nginx/backup/www.conf +++ /dev/null @@ -1,39 +0,0 @@ -server { - listen 80; - listen 443 ssl; - - tj-server_name www.gamewheel.com; - - root /srv/gamewheel.com/www; - index index.php; - - tj-access_log /var/log/nginx/www.gamewheel.com.access.log; - tj-error_log /var/log/nginx/www.gamewheel.com.error.log; - - ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem; - ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key; - ssl_session_timeout 5m; - ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2; - ssl_ciphers "HIGH:!aNULL:!MD5 or HIGH:!aNULL:!MD5:!3DES"; - ssl_prefer_server_ciphers on; - - - rewrite ^/sitemap(-+([a-zA-Z0-9_-]+))?\.xml$ "/index.php?xml_sitemap=params=$2" last; - rewrite ^/sitemap(-+([a-zA-Z0-9_-]+))?\.xml\.gz$ "/index.php?xml_sitemap=params=$2;zip=true" last; - rewrite ^/sitemap(-+([a-zA-Z0-9_-]+))?\.html$ "/index.php?xml_sitemap=params=$2;html=true" last; - rewrite ^/sitemap(-+([a-zA-Z0-9_-]+))?\.html.gz$ "/index.php?xml_sitemap=params=$2;html=true;zip=true" last; - - add_header Access-Control-Allow-Origin '*'; - - location / { - try_files $uri $uri/ /index.php?$args; - } - - location ~ \.*.php$ { - include fastcgi_params; - fastcgi_split_path_info ^(.+\.php)(.*)$; - fastcgi_pass 127.0.0.1:9001; - fastcgi_intercept_errors on; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - } -} diff --git a/nginx/conf.d/ports.conf b/nginx/conf.d/ports.conf index cfb153e..78304d7 100644 --- a/nginx/conf.d/ports.conf +++ b/nginx/conf.d/ports.conf @@ -36,4 +36,8 @@ upstream port { upstream gate { server 127.0.0.1:3115; +} + +upstream php { + server 127.0.0.1:9001; } \ No newline at end of file diff --git a/nginx/nginx.conf b/nginx/nginx.conf index 0905e4d..6605763 100644 --- a/nginx/nginx.conf +++ b/nginx/nginx.conf @@ -31,7 +31,7 @@ http { ## # Logging Settings ## - log_format custom_access '$request_method: $host$request_uri ($status)'; + log_format custom_access '$request_method ($status) : $host$request_uri\n$request_filename'; access_log /var/log/nginx/access.log custom_access; error_log /var/log/nginx/error.log; diff --git a/nginx/sites-available/3d-editor.conf b/nginx/sites-available/3d-editor.conf deleted file mode 100644 index 6d8f9d1..0000000 --- a/nginx/sites-available/3d-editor.conf +++ /dev/null @@ -1,24 +0,0 @@ -#origin git@github.com:ToywheelDev/3d_editor.git -server { - listen 80; - - server_name 3d-editor.gamewheel.com; - - root /usr/share/gamewheel/3d-editor; - - location ~ { - add_header Access-Control-Allow-Origin $http_origin; - try_files $uri $uri/ @node; - } - - location @node { - 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; - proxy_pass http://3d-editor; - proxy_ssl_session_reuse off; - proxy_set_header Host $http_host; - proxy_redirect off; - } -} diff --git a/nginx/sites-available/3d-pong.conf b/nginx/sites-available/3d-pong.conf deleted file mode 100644 index 57b250f..0000000 --- a/nginx/sites-available/3d-pong.conf +++ /dev/null @@ -1,29 +0,0 @@ -#origin git@github.com:ToywheelDev/vr_pong.git -server { - listen 80; - - server_name - 3d-pong.gamewheel.com - 3doo.gamewheel.com; - - add_header Access-Control-Allow-Origin $http_origin; - - #We start to pass everything to express, otherwise we end up with '/' location saying 403 Forbidden - #Static files delivered trough express.static() - location ~ { - # WebSocket support - 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; - proxy_pass http://3d-pong; - proxy_ssl_session_reuse off; - proxy_set_header Host $http_host; - proxy_redirect off; - } -} diff --git a/nginx/sites-available/3d-racing.conf b/nginx/sites-available/3d-racing.conf deleted file mode 100644 index 417cee9..0000000 --- a/nginx/sites-available/3d-racing.conf +++ /dev/null @@ -1,29 +0,0 @@ -#origin https://github.com/ToywheelDev/3d-racing.git -server { - listen 80; - - server_name 3d-racing.gamewheel.com; - - root /usr/share/gamewheel/3d-racing; - - index index.html; - - #We start to pass everything to express, otherwise we end up with '/' location saying 403 Forbidden - #Static files delivered trough express.static() - location ~ { - # WebSocket support - 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; - proxy_pass http://3d-racing; - proxy_ssl_session_reuse off; - proxy_set_header Host $http_host; - proxy_redirect off; - } -} diff --git a/nginx/sites-available/api-v1.6.conf b/nginx/sites-available/api-v1.6.conf deleted file mode 100644 index 8872e17..0000000 --- a/nginx/sites-available/api-v1.6.conf +++ /dev/null @@ -1,25 +0,0 @@ -#origin git@github.com:ToywheelDev/GW_Config.git -server { - listen 80; - - server_name api-v1.6.gamewheel.com; - - root /usr/share/gamewheel/api-v1.6; - - location ~ { - add_header Access-Control-Allow-Origin $http_origin; - autoindex on; - try_files $uri $uri/ @node; - } - - location @node { - 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; - proxy_pass http://api-v1.6; - proxy_ssl_session_reuse off; - proxy_set_header Host $http_host; - proxy_redirect off; - } -} diff --git a/nginx/sites-available/gamewheel.conf b/nginx/sites-available/gamewheel.conf index 00dab57..f0fddef 100644 --- a/nginx/sites-available/gamewheel.conf +++ b/nginx/sites-available/gamewheel.conf @@ -10,13 +10,22 @@ server { include /etc/nginx/ssl/ssl.conf; - server_name ~^(?[a-z0-9]*-)?(?[0-9a-z]+)\.(?.*); + server_name ~^(?.*?)-(?.*?)\.(?.*); + + root /usr/share/gamewheel/$app; + + location ~ \.php$ { + 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; + } location ~ { - root /usr/share/gamewheel/$app; add_header Access-Control-Allow-Origin $http_origin; - autoindex on; - try_files $uri $uri/ @node; + try_files $uri dist/$uri @node; } location @node { @@ -42,11 +51,11 @@ server { proxy_set_header Host $http_host; proxy_redirect off; - # If our app fails - we send it to gate - error_page 500 502 503 504 = @gate; +# # If our app fails - we send it to gate +# error_page 500 502 503 504 = @gate; } - location @gate { - proxy_pass http://gate; - } +# location @gate { +# proxy_pass http://gate; +# } } diff --git a/nginx/sites-available/tools.conf b/nginx/sites-available/tools.conf deleted file mode 100644 index 8a64037..0000000 --- a/nginx/sites-available/tools.conf +++ /dev/null @@ -1,34 +0,0 @@ -#origin git@github.com:ToywheelDev/tools.git -server { - listen 80; - - tj-server_name tools.gamewheel.com tools-debug.gamewheel.com; - - root /usr/share/gamewheel/tools; - - location ~ \.php$ { - fastcgi_pass 127.0.0.1:9001; - 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 / { - add_header Access-Control-Allow-Origin $http_origin; - autoindex on; - try_files $uri $uri/ @node; - } - - location @node { - 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; - proxy_pass http://127.0.0.1:3109; - proxy_ssl_session_reuse off; - proxy_set_header Host $http_host; - proxy_redirect off; - } -} diff --git a/nginx/ssl/ssl.conf b/nginx/ssl/ssl.conf index 0719d12..4906a39 100644 --- a/nginx/ssl/ssl.conf +++ b/nginx/ssl/ssl.conf @@ -1,6 +1,8 @@ ssl_certificate ssl/gamewheel.com.crt; ssl_certificate_key ssl/gamewheel.com.key; ssl_session_timeout 5m; - ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2; + ## Don't use SSL v3 because of POODLE vulnerability + # ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2; + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; ssl_ciphers "HIGH:!aNULL:!MD5 or HIGH:!aNULL:!MD5:!3DES"; ssl_prefer_server_ciphers on; diff --git a/start_editor_v1 b/start_editor similarity index 100% rename from start_editor_v1 rename to start_editor diff --git a/start_editor_v2 b/start_editor_v2 deleted file mode 100755 index 9f730bc..0000000 --- a/start_editor_v2 +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -cd /usr/share/gamewheel/api-v2 -pm2 start bin/start --node-args="--max-old-space-size=16000 --debug=3206" --name api-v2 -cd /usr/share/gamewheel/3d-editor-v2 -pm2 start server.js --node-args="--max-old-space-size=16000 --debug=3205" --name 3d-editor-v2 \ No newline at end of file diff --git a/start_editor_v3 b/start_editor_v3 deleted file mode 100755 index ee51600..0000000 --- a/start_editor_v3 +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -cd /usr/share/gamewheel/api-v3 -pm2 start bin/start --node-args="--max-old-space-size=16000 --debug=3208" --name api-v3 -cd /usr/share/gamewheel/3d-editor-v3 -pm2 start server.js --node-args="--max-old-space-size=16000 --debug=3207" --name 3d-editor-v3 \ No newline at end of file