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 d0c6ad7..913de65 100644 Binary files a/general.encrypted and b/general.encrypted differ 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";