From 731db1dfb9b5fc23563be589004a24da34aee803 Mon Sep 17 00:00:00 2001 From: -=yb4f310 Date: Mon, 3 Jul 2017 22:31:14 +0200 Subject: [PATCH] ss --- bash_history | 82 ++++++++++++++++++++++++++++ general.encrypted | Bin 2896 -> 3024 bytes nginx/sites-available/cybafelo.conf | 35 +++++++++++- 3 files changed, 115 insertions(+), 2 deletions(-) diff --git a/bash_history b/bash_history index b60f84f..54fe233 100644 --- a/bash_history +++ b/bash_history @@ -3709,3 +3709,85 @@ r exit s exit +mongo +gl +cd src/ +grep "IMAGE_INSTANCE_CREATED" * -R +ls +cd .. +cd conf +cd config/ +git diff +git commit -am "stuff" +git checkout tj-dev +git pull +git remote -ve +git remote -v +git remote add gamewheel git@github.com:ToywheelDev/gamewheel-config.git +git pull gamewheel tj-dev +cat nginx/sites-available/gamewheel.conf +git checkout cybafelo +sudo service nginx restart +3d +git pull +gulp +c +cd api-v1/ +git pull +r +cd .. +cd blender-node/ +git diff +git pull +git remote -v +git pull cybafelo +git log +r +cd .. +r +m +sudo vim /etc/nginx/sites-available/cybafelo.conf +sudo service nginx restart +gl +git pull +gulp +git log +git checkout 3d-e +cd .. +3d +git log +gl +gulp +3d +gulp +git diff +git commit -am "start move blender node to storage system" +git push +cd .. +cd blender-node/ +git diff +git commit -am "start move blender node to storage system" +git push +exit +gl +gulp +git pull +git diff +gulp +git diff +git add --patch +git commit -m "start move blender load to storage system" +e +exit +g +gl +cd src/ +grep "COMPONENT_CREATED" * -R +3d +cd src/ +grep "COMPONENT_CREATED" * -R +r +s +m +sudo apt-get install virtualbox +virtualbox diff --git a/general.encrypted b/general.encrypted index d0c6ad7e4db0933a78c4c299ab770659b7e971dc..913de65a1dcbc00f5f2319f334cafa04eaf276b0 100644 GIT binary patch literal 3024 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 diff --git a/nginx/sites-available/cybafelo.conf b/nginx/sites-available/cybafelo.conf index d0491ac..6f595dc 100644 --- a/nginx/sites-available/cybafelo.conf +++ b/nginx/sites-available/cybafelo.conf @@ -7,7 +7,19 @@ server { root /usr/share/cybafelo/$app; location ~ \.php$ { - fastcgi_pass 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-gamewheel"; + 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; @@ -16,17 +28,36 @@ server { } 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-gamewheel"; + 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; } 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-gamewheel"; + 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 $uri dist/$uri @node; } location @node { - # WebSocket support + + 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";