diff options
| author | Egor Tensin <egor@tensin.name> | 2026-06-06 22:18:37 +0200 |
|---|---|---|
| committer | Egor Tensin <egor@tensin.name> | 2026-06-06 22:25:32 +0200 |
| commit | 07a784f0d654fcd552069e85b314ea7c29cb5dd6 (patch) | |
| tree | 9c12dec00b68aaa33dbf8429f34f9812493c965a | |
| parent | bump dependencies (diff) | |
| download | wireguard-config-07a784f0d654fcd552069e85b314ea7c29cb5dd6.tar.gz wireguard-config-07a784f0d654fcd552069e85b314ea7c29cb5dd6.zip | |
move Jekyll source files to src/
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | DEVELOPMENT.md | 2 | ||||
| -rw-r--r-- | Makefile | 11 | ||||
| -rw-r--r-- | _config.yml | 13 | ||||
| l--------- | src/LICENSE.txt | 1 | ||||
| -rw-r--r-- | src/assets/css/pre_overlay.css (renamed from assets/css/pre_overlay.css) | 0 | ||||
| -rw-r--r-- | src/assets/js/bundle.js (renamed from assets/js/bundle.js) | 0 | ||||
| -rw-r--r-- | src/assets/js/main.js (renamed from assets/js/main.js) | 0 | ||||
| -rw-r--r-- | src/index.html (renamed from index.html) | 0 |
9 files changed, 14 insertions, 17 deletions
@@ -1,6 +1,6 @@ +/build/ /.bundle/ -/.jekyll-cache/ +.jekyll-cache/ /node_modules/ -/_site/ /vendor/ /.wget/ diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index b42d409..4f6dc3d 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -47,7 +47,7 @@ Upgrading dependencies Building static pages --------------------- -If you try to copy the _site directory and open index.html without running the +If you try to copy the build/ directory and open index.html without running the web server, it won't work: all links will be messed up. Jekyll doesn't provide native support for generating a static website which can be browsed without running a web server. @@ -3,6 +3,9 @@ include prelude.mk LIVE_RELOAD ?= 1 $(eval $(call noexpand,LIVE_RELOAD)) +# Resolve symlinks to actual files: https://github.com/jekyll/jekyll/pull/4640 +export JEKYLL_ENV := production + .PHONY: all all: serve @@ -16,9 +19,9 @@ deps: ruby npm install .PHONY: browserify -browserify: assets/js/bundle.js +browserify: src/assets/js/bundle.js -assets/js/bundle.js: package-lock.json +src/assets/js/bundle.js: package-lock.json npm exec -- browserify --require ip-address --outfile '$(call escape,$@)' .PHONY: maintenance @@ -30,7 +33,7 @@ maintenance: ruby @$(MAKE) browserify @git_status="$$( git status --porcelain=v1 )" && \ - allowed=' M Gemfile.lock| M package-lock.json| M assets/js/bundle.js' && \ + allowed=' M Gemfile.lock| M package-lock.json| M src/assets/js/bundle.js' && \ if [ -z "$$git_status" ]; then \ true; \ elif ! echo "$$git_status" | grep -E -q --invert-match --line-regexp "($$allowed)"; then \ @@ -81,4 +84,4 @@ $(eval $(call noexpand,REMOTE_DIR)) .PHONY: deploy deploy: - rsync -avh -e 'ssh -p $(call escape,$(REMOTE_PORT)) -o StrictHostKeyChecking=no' _site/ '$(call escape,$(REMOTE_USER)@$(REMOTE_HOST):$(REMOTE_DIR)/)' --delete + rsync -avh -e 'ssh -p $(call escape,$(REMOTE_PORT)) -o StrictHostKeyChecking=no' build/ '$(call escape,$(REMOTE_USER)@$(REMOTE_HOST):$(REMOTE_DIR)/)' --delete diff --git a/_config.yml b/_config.yml index 0597cad..f33914d 100644 --- a/_config.yml +++ b/_config.yml @@ -1,20 +1,13 @@ # Jekyll +source: src +destination: build + baseurl: /wireguard-config host: 0.0.0.0 open_url: true show_drafts: true strict_front_matter: true -exclude: - - .wget/ - - DEVELOPMENT.md - - Makefile - - prelude.mk - - README.md - - - package.json - - package-lock.json - # Plugins plugins: - jekyll-github-metadata diff --git a/src/LICENSE.txt b/src/LICENSE.txt new file mode 120000 index 0000000..4ab4373 --- /dev/null +++ b/src/LICENSE.txt @@ -0,0 +1 @@ +../LICENSE.txt
\ No newline at end of file diff --git a/assets/css/pre_overlay.css b/src/assets/css/pre_overlay.css index efa291a..efa291a 100644 --- a/assets/css/pre_overlay.css +++ b/src/assets/css/pre_overlay.css diff --git a/assets/js/bundle.js b/src/assets/js/bundle.js index da8f679..da8f679 100644 --- a/assets/js/bundle.js +++ b/src/assets/js/bundle.js diff --git a/assets/js/main.js b/src/assets/js/main.js index ef57764..ef57764 100644 --- a/assets/js/main.js +++ b/src/assets/js/main.js diff --git a/index.html b/src/index.html index 8ad2cfd..8ad2cfd 100644 --- a/index.html +++ b/src/index.html |