Merge branch 'ipv6' into 'master'

soportar ipv6

See merge request sutty/jekyll/sutty-base-jekyll-theme!1
This commit is contained in:
Maki 2021-05-03 20:21:28 +00:00
commit 62f5a08d50

View file

@ -19,7 +19,7 @@ build: ## Compilar el sitio
serve: /etc/hosts kill-servers ## Servidor de prueba serve: /etc/hosts kill-servers ## Servidor de prueba
@echo "Iniciando servidor web en https://$(domain):4000/" @echo "Iniciando servidor web en https://$(domain):4000/"
@if ! ss -lnp | grep -q :65000 ; then nghttpd -d _site/ 65000 ../sutty.local/domain/sutty.local.{key,crt} & echo $$! > /tmp/nghttpd.pid ; fi @if ! ss -lnp | grep -q :65000 ; then nghttpd -d _site/ 65000 ../sutty.local/domain/sutty.local.{key,crt} & echo $$! > /tmp/nghttpd.pid ; fi
@if ! ss -lnp | grep -q :4000 ; then nghttpx -b "127.0.0.1,65001;/assets/js/:/sockjs-node/" -b "$(domain),65000;/;proto=h2;tls" -f "0.0.0.0,4000" -L FATAL --no-ocsp ../sutty.local/domain/sutty.local.{key,crt} & echo $$! > /tmp/nghttpx.pid ; fi @if ! ss -lnp | grep -q :4000 ; then nghttpx -b "127.0.0.1,65001;/assets/js/:/sockjs-node/" -b "$(domain),65000;/;proto=h2;tls" -f "*,4000" -L FATAL --no-ocsp ../sutty.local/domain/sutty.local.{key,crt} & echo $$! > /tmp/nghttpx.pid ; fi
kill-servers: /tmp/nghttpd.pid /tmp/nghttpx.pid /tmp/webpack.pid ## Cerrar el servidor kill-servers: /tmp/nghttpd.pid /tmp/nghttpx.pid /tmp/webpack.pid ## Cerrar el servidor
@ -33,7 +33,7 @@ webpack-dev-server: /tmp/webpack.pid ## Servidor de prueba de Webpack
# node_modules/font-awesome/scss/_variables.scss # node_modules/font-awesome/scss/_variables.scss
assets/fonts/forkawesome-webfont.woff2: fa.txt assets/fonts/forkawesome-webfont.woff2: fa.txt
which glyphhanger || npm i -g glyphhanger which glyphhanger || npm i -g glyphhanger
grep -v "^#" fa.txt | sed "s/^/U+/" | tr "\n" "," | xargs -rI {} glyphhanger --subset=node_modules/fork-awesome/fonts/forkawesome-webfont.ttf --formats=woff2 --whitelist="{}" grep -v "^#" fa.txt | sed "s/^/U+/" | cut -d " " -f 1 | tr "\n" "," | xargs -rI {} glyphhanger --subset=node_modules/fork-awesome/fonts/forkawesome-webfont.ttf --formats=woff2 --whitelist="{}"
mv node_modules/fork-awesome/fonts/forkawesome-webfont-subset.woff2 $@ mv node_modules/fork-awesome/fonts/forkawesome-webfont-subset.woff2 $@
fa: assets/fonts/forkawesome-webfont.woff2 ## Fork Awesome fa: assets/fonts/forkawesome-webfont.woff2 ## Fork Awesome