From 34a08f036f05e8fc6cd175c887cc89ca4746d5d6 Mon Sep 17 00:00:00 2001 From: Bobby Wibowo Date: Sun, 18 Mar 2018 20:41:09 +0700 Subject: [PATCH] Updates * Updated .editorconfig file to match indent styling for GitHub MD files and Nginx Conf files. * Removed final newline from LICENSE. * Restored indents to tabs in Nginx Conf files. --- .editorconfig | 5 ++++ LICENSE | 2 +- nginx-ssl.sample.conf | 60 +++++++++++++++++++++---------------------- nginx.sample.conf | 46 ++++++++++++++++----------------- 4 files changed, 59 insertions(+), 54 deletions(-) diff --git a/.editorconfig b/.editorconfig index 60837ab..39851d3 100644 --- a/.editorconfig +++ b/.editorconfig @@ -7,7 +7,12 @@ trim_trailing_whitespace = true insert_final_newline = true [*.md] +indent_style = tab +indent_size = 4 trim_trailing_whitespace = false +[*.conf] +indent_size = 4 + [LICENSE] insert_final_newline = false diff --git a/LICENSE b/LICENSE index 4aac64d..e6b240d 100644 --- a/LICENSE +++ b/LICENSE @@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +SOFTWARE. \ No newline at end of file diff --git a/nginx-ssl.sample.conf b/nginx-ssl.sample.conf index 2172564..3afbbd1 100644 --- a/nginx-ssl.sample.conf +++ b/nginx-ssl.sample.conf @@ -1,43 +1,43 @@ upstream backend { - server 127.0.0.1:9999; # Change to the port you specified on lolisafe + server 127.0.0.1:9999; # Change to the port you specified on lolisafe } server { - listen 80; - listen [::]:80; - server_name lolisafe.moe; - return 301 https://$server_name$request_uri; + listen 80; + listen [::]:80; + server_name lolisafe.moe; + return 301 https://$server_name$request_uri; } server { - listen 443 ssl http2; - listen [::]:443 ssl http2; + listen 443 ssl http2; + listen [::]:443 ssl http2; - server_name lolisafe.moe; + server_name lolisafe.moe; - ssl_certificate /path/to/your/fullchain.pem; - ssl_certificate_key /path/to/your/privkey.pem; - ssl_trusted_certificate /path/to/your/fullchain.pem; + ssl_certificate /path/to/your/fullchain.pem; + ssl_certificate_key /path/to/your/privkey.pem; + ssl_trusted_certificate /path/to/your/fullchain.pem; - client_max_body_size 100M; # Change this to the max file size you want to allow + client_max_body_size 100M; # Change this to the max file size you want to allow - location / { - add_header Access-Control-Allow-Origin *; - root /path/to/your/uploads/folder; - try_files $uri @proxy; - } + location / { + add_header Access-Control-Allow-Origin *; + root /path/to/your/uploads/folder; + try_files $uri @proxy; + } - location @proxy { - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header Host $http_host; - proxy_set_header X-NginX-Proxy true; - proxy_pass http://backend; - proxy_redirect off; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - proxy_redirect off; - proxy_set_header X-Forwarded-Proto $scheme; - } + location @proxy { + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $http_host; + proxy_set_header X-NginX-Proxy true; + proxy_pass http://backend; + proxy_redirect off; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_redirect off; + proxy_set_header X-Forwarded-Proto $scheme; + } } diff --git a/nginx.sample.conf b/nginx.sample.conf index 71b8855..8d1d6f0 100644 --- a/nginx.sample.conf +++ b/nginx.sample.conf @@ -1,32 +1,32 @@ upstream backend { - server 127.0.0.1:9999; # Change to the port you specified on lolisafe + server 127.0.0.1:9999; # Change to the port you specified on lolisafe } server { - listen 80; - listen [::]:80; + listen 80; + listen [::]:80; - server_name lolisafe.moe; + server_name lolisafe.moe; - client_max_body_size 100M; # Change this to the max file size you want to allow + client_max_body_size 100M; # Change this to the max file size you want to allow - location / { - add_header Access-Control-Allow-Origin *; - root /path/to/your/uploads/folder; - try_files $uri @proxy; - } + location / { + add_header Access-Control-Allow-Origin *; + root /path/to/your/uploads/folder; + try_files $uri @proxy; + } - location @proxy { - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header Host $http_host; - proxy_set_header X-NginX-Proxy true; - proxy_pass http://backend; - proxy_redirect off; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - proxy_redirect off; - proxy_set_header X-Forwarded-Proto $scheme; - } + location @proxy { + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $http_host; + proxy_set_header X-NginX-Proxy true; + proxy_pass http://backend; + proxy_redirect off; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_redirect off; + proxy_set_header X-Forwarded-Proto $scheme; + } }