From e5ca0f21b2a5ffac6ae96282d274ada61a999402 Mon Sep 17 00:00:00 2001 From: mathias Date: Mon, 1 Oct 2018 17:03:14 +0300 Subject: [PATCH] Latest changes --- .htaccess | 84 ++++++++++++++++++ 404.md | 6 -- _config.yml | 3 - _layouts/default.html | 8 +- .../android-chrome.png => android-chrome.png | Bin ...ple-touch-icon.png => apple-touch-icon.png | Bin browserconfig.xml | 13 +++ build.sh | 21 +++-- icons/safari-pinned-tab.svg | 6 -- index.html | 1 + mstile-150x150.png | Bin 0 -> 666 bytes safari-pinned-tab.svg | 1 + .../manifest.webmanifest => site.webmanifest | 0 13 files changed, 112 insertions(+), 31 deletions(-) create mode 100644 .htaccess delete mode 100644 404.md rename icons/android-chrome.png => android-chrome.png (100%) rename icons/apple-touch-icon.png => apple-touch-icon.png (100%) create mode 100644 browserconfig.xml delete mode 100644 icons/safari-pinned-tab.svg create mode 100644 mstile-150x150.png create mode 100644 safari-pinned-tab.svg rename icons/manifest.webmanifest => site.webmanifest (100%) diff --git a/.htaccess b/.htaccess new file mode 100644 index 0000000..9de9b14 --- /dev/null +++ b/.htaccess @@ -0,0 +1,84 @@ +RewriteBase / +RewriteEngine On + +AddDefaultCharset utf-8 +AddCharset UTF-8 .css .js .webmanifest +FileETag MTime Size +ServerSignature Off +SetEnvIf Host ^ suppress-error-charset + +AddType image/x-icon .ico +AddType application/manifest+json .webmanifest + +RewriteCond %{HTTP_HOST} ^www\.(.*)$ [NC] +RewriteRule ^ https://%1%{REQUEST_URI} [R=301,L] +RewriteCond %{ENV:HTTPS} !=on +RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L] +RewriteCond %{HTTP_HOST} ^flame.ga$ +RewriteRule ^ https://kaboom.pw/$1 [R=301,L] +RewriteCond %{HTTP_HOST} ^www.flame.ga$ +RewriteRule ^ https://kaboom.pw/$1 [R=301,L] + +ErrorDocument 404 https://kaboom.pw/ +RewriteCond %{REQUEST_FILENAME} -d +RewriteRule . - [R=404] + + +Header set Content-Security-Policy "default-src 'none'; font-src data:; img-src 'self'; manifest-src 'self'; style-src 'self'; upgrade-insecure-requests" +Header set X-Frame-Options "DENY" +Header set X-Xss-Protection "1; mode=block" + + +Header set Referrer-Policy "no-referrer" +Header set Strict-Transport-Security "max-age=63072000; includeSubdomains; preload" +Header set Vary "Accept-Encoding" +Header set X-Content-Type-Options "nosniff" +Header unset Accept-Ranges +Header unset Last-Modified + +RewriteCond %{HTTP:Accept-Encoding} br +RewriteCond %{REQUEST_FILENAME}.br -f +RewriteRule ^(.*)$ $1.br [L] + +RewriteCond %{HTTP:Accept-Encoding} gzip +RewriteCond %{REQUEST_FILENAME}.gz -f +RewriteRule ^(.*)$ $1.gz [L] + +AddEncoding br .br +AddEncoding gzip .gz + + +ForceType "text/css; charset=utf-8" + + + +ForceType image/x-icon + + + +ForceType "text/html; charset=utf-8" + + + +ForceType "text/javascript; charset=utf-8" + + + +ForceType "image/png; charset=utf-8" + + + +ForceType "image/svg+xml; charset=utf-8" + + + +ForceType "text/plain; charset=utf-8" + + + +ForceType "application/manifest+json; charset=utf-8" + + + +ForceType "text/xml; charset=utf-8" + diff --git a/404.md b/404.md deleted file mode 100644 index feef71e..0000000 --- a/404.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -layout: default -title: Oops ---- -# {{ page.title }} -This page does not exist. You may return to the [home page](/). diff --git a/_config.yml b/_config.yml index 2172996..9a7172e 100644 --- a/_config.yml +++ b/_config.yml @@ -7,8 +7,5 @@ exclude: - Gemfile - LICENSE -kramdown: - entity_output: :as_input - sass: style: :compressed diff --git a/_layouts/default.html b/_layouts/default.html index f928047..1dd544f 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -16,14 +16,12 @@ layout: minify - - - - + + -
+
{{ content }}
diff --git a/icons/android-chrome.png b/android-chrome.png similarity index 100% rename from icons/android-chrome.png rename to android-chrome.png diff --git a/icons/apple-touch-icon.png b/apple-touch-icon.png similarity index 100% rename from icons/apple-touch-icon.png rename to apple-touch-icon.png diff --git a/browserconfig.xml b/browserconfig.xml new file mode 100644 index 0000000..af23180 --- /dev/null +++ b/browserconfig.xml @@ -0,0 +1,13 @@ +--- +layout: minify +--- + + + + + + #555555 + + + + diff --git a/build.sh b/build.sh index 5f3762e..7f1f813 100755 --- a/build.sh +++ b/build.sh @@ -1,14 +1,13 @@ #!/bin/bash -cd $HOME/build-websites/kaboom-website/ +cd $HOME/build/kaboom-website/ rm Gemfile.lock -#bundle install -jekyll build --destination $HOME/html/kaboom.pw/ -#if jekyll build --destination $HOME/html/kaboom.pw/; then +bundle install +if bundle exec jekyll build --destination $HOME/html/kaboom.pw/; then cd $HOME/html/kaboom.pw/ - #rm -rf *.br - #rm -rf *.gz - #for file in `find . -type f -name '*'`; do - # $HOME/build-websites/zopfli $file - # $HOME/build-websites/brotli $file - #done -#fi + rm -rf *.br + rm -rf *.gz + for file in `find . -type f -name '*'`; do + $HOME/build/zopfli $file + $HOME/build/brotli $file + done +fi diff --git a/icons/safari-pinned-tab.svg b/icons/safari-pinned-tab.svg deleted file mode 100644 index 65bc7d7..0000000 --- a/icons/safari-pinned-tab.svg +++ /dev/null @@ -1,6 +0,0 @@ ---- -layout: minify ---- - - - diff --git a/index.html b/index.html index 7202175..5e14794 100644 --- a/index.html +++ b/index.html @@ -38,3 +38,4 @@ layout: default Feel free to download the schematics and worlds of the Kaboom.pw server. Worlds reset once a week. + diff --git a/mstile-150x150.png b/mstile-150x150.png new file mode 100644 index 0000000000000000000000000000000000000000..ec36636558d1bbef7782f280f28b9e17d69902ce GIT binary patch literal 666 zcmeAS@N?(olHy`uVBq!ia0y~yVB`Z~4rZW;e?I4QAjOjI=U}oXkrghd;n4#1%;YM*{s$_cB2GN`m}?8IIYvOxg7?mw|yv($mE;q~g}wJGb++ z40%`s-aPrg|K|nCJma8luSKs;M0#s&>Cdt3b5@+r4b+Vde9*q>%n@(-am9G@%O?DQlX!JnDox7 zteNL_RQQyK)K|U@YrB&(?yb0Eee9A)@8SX}&ECqR5ATFkz39k`pBW}|^^~&P;}xbY zUlXr+-MlLFxX>hf>5F?tiEBf$7v)s zL>}WM|Jw_%SRS%`Q2qP(?B@C#HeP=hyS|>WJF2VJ_F&Y^NV%(a7auV53ZGtlFFhx? z@QhY}SG=IF@$oq}U2#V)=uG|iE$~NoykhT0o38lx!k2#7^s}z3%lbCu{ImX0y}B&1 zQyU%b#d~hJHaFqD{+ft0-y65M=67c+b_e%9sT00bCmyt}u3G_Hi~_|zT(eI}c95B3 Rv&;{q!qe5yWt~$(695~iCyW39 literal 0 HcmV?d00001 diff --git a/safari-pinned-tab.svg b/safari-pinned-tab.svg new file mode 100644 index 0000000..b776ae2 --- /dev/null +++ b/safari-pinned-tab.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/manifest.webmanifest b/site.webmanifest similarity index 100% rename from icons/manifest.webmanifest rename to site.webmanifest