diff options
| -rw-r--r-- | .dir-locals.el | 2 | ||||
| -rw-r--r-- | .dockerignore | 169 | ||||
| -rw-r--r-- | .envrc | 1 | ||||
| -rw-r--r-- | .gitignore | 173 | ||||
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | .well-known/keybase.txt (renamed from static/.well-known/keybase.txt) | 0 | ||||
| -rw-r--r-- | .well-known/webfinger | 1 | ||||
| -rw-r--r-- | Dockerfile | 67 | ||||
| -rw-r--r-- | LICENSE | 395 | ||||
| -rw-r--r-- | Makefile | 92 | ||||
| -rw-r--r-- | README.md | 23 | ||||
| -rwxr-xr-x | bin/build.ts | 30 | ||||
| -rwxr-xr-x | bun.lockb | bin | 32114 -> 0 bytes | |||
| -rw-r--r-- | config.toml | 97 | ||||
| -rw-r--r-- | cv.html (renamed from static/cv/index.html) | 0 | ||||
| -rw-r--r-- | default.nix | 10 | ||||
| -rw-r--r-- | flake.lock | 78 | ||||
| -rw-r--r-- | flake.nix | 34 | ||||
| -rw-r--r-- | fly.toml | 31 | ||||
| -rw-r--r-- | index.md (renamed from content/_index.md) | 0 | ||||
| -rw-r--r-- | package.json | 28 | ||||
| -rw-r--r-- | post/a-new-site.md (renamed from content/post/a-new-site.md) | 0 | ||||
| -rw-r--r-- | post/back-again.md (renamed from content/post/back-again.md) | 0 | ||||
| -rw-r--r-- | post/cedit-and-paredit.md (renamed from content/post/cedit-and-paredit.md) | 0 | ||||
| -rw-r--r-- | post/emacs-package-archive-statistics.md (renamed from content/post/emacs-package-archive-statistics.md) | 0 | ||||
| -rw-r--r-- | post/git-cloning-similar-repositories.md (renamed from content/post/git-cloning-similar-repositories.md) | 0 | ||||
| -rw-r--r-- | post/homesteading.md (renamed from content/post/homesteading.md) | 0 | ||||
| -rw-r--r-- | post/nixos-on-nanopi-r5s.md (renamed from content/post/nixos-on-nanopi-r5s.md) | 2 | ||||
| -rw-r--r-- | post/now-on-three-continents.md (renamed from content/post/now-on-three-continents.md) | 0 | ||||
| -rw-r--r-- | post/opening-projects-with-projectile.md (renamed from content/post/opening-projects-with-projectile.md) | 0 | ||||
| -rw-r--r-- | post/postfix-as-null-client-with-external-catchall.md (renamed from content/post/postfix-as-null-client-with-external-catchall.md) | 0 | ||||
| -rw-r--r-- | post/repository-management-with-ghq.md (renamed from content/post/repository-management-with-ghq.md) | 0 | ||||
| -rw-r--r-- | post/searchix.md | 33 | ||||
| -rw-r--r-- | post/self-hosted-git.md (renamed from content/post/self-hosted-git.md) | 2 | ||||
| -rw-r--r-- | post/when-tailscale-magicdns-isn't.md | 200 | ||||
| -rw-r--r-- | public_key.asc (renamed from static/public_key.asc) | 0 | ||||
| -rw-r--r-- | src/app.ts | 272 | ||||
| -rw-r--r-- | src/config.ts | 8 | ||||
| -rw-r--r-- | src/index.ts | 36 | ||||
| -rw-r--r-- | src/posts.ts | 61 | ||||
| -rw-r--r-- | src/templates.ts | 290 | ||||
| -rw-r--r-- | static/robots.txt | 4 | ||||
| -rw-r--r-- | taplo.toml | 7 | ||||
| -rw-r--r-- | templates/404.html | 37 | ||||
| -rw-r--r-- | templates/atom.xml | 48 | ||||
| -rw-r--r-- | templates/feed-styles.xsl | 82 | ||||
| -rw-r--r-- | templates/feed.xml | 24 | ||||
| -rw-r--r-- | templates/homepage.html | 65 | ||||
| -rw-r--r-- | templates/list.html | 55 | ||||
| -rw-r--r-- | templates/post.html | 75 | ||||
| -rw-r--r-- | templates/style.css | 191 | ||||
| -rw-r--r-- | templates/tags.html | 41 | ||||
| -rw-r--r-- | test/index.test.ts | 97 | ||||
| -rw-r--r-- | tsconfig.json | 31 |
54 files changed, 713 insertions, 2182 deletions
diff --git a/.dir-locals.el b/.dir-locals.el deleted file mode 100644 index d5837e0..0000000 --- a/.dir-locals.el +++ /dev/null @@ -1,2 +0,0 @@ -((nil . ((compile-command . "make -B") - (web-mode-engine . "go")))) diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index f81d56e..0000000 --- a/.dockerignore +++ /dev/null @@ -1,169 +0,0 @@ -# Based on https://raw.githubusercontent.com/github/gitignore/main/Node.gitignore - -# Logs - -logs -_.log -npm-debug.log_ -yarn-debug.log* -yarn-error.log* -lerna-debug.log* -.pnpm-debug.log* - -# Diagnostic reports (https://nodejs.org/api/report.html) - -report.[0-9]_.[0-9]_.[0-9]_.[0-9]_.json - -# Runtime data - -pids -_.pid -_.seed -\*.pid.lock - -# Directory for instrumented libs generated by jscoverage/JSCover - -lib-cov - -# Coverage directory used by tools like istanbul - -coverage -\*.lcov - -# nyc test coverage - -.nyc_output - -# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) - -.grunt - -# Bower dependency directory (https://bower.io/) - -bower_components - -# node-waf configuration - -.lock-wscript - -# Compiled binary addons (https://nodejs.org/api/addons.html) - -build/Release - -# Dependency directories - -node_modules/ -jspm_packages/ - -# Snowpack dependency directory (https://snowpack.dev/) - -web_modules/ - -# TypeScript cache - -\*.tsbuildinfo - -# Optional npm cache directory - -.npm - -# Optional eslint cache - -.eslintcache - -# Optional stylelint cache - -.stylelintcache - -# Microbundle cache - -.rpt2_cache/ -.rts2_cache_cjs/ -.rts2_cache_es/ -.rts2_cache_umd/ - -# Optional REPL history - -.node_repl_history - -# Output of 'npm pack' - -\*.tgz - -# Yarn Integrity file - -.yarn-integrity - -# dotenv environment variable files - -.env -.env.development.local -.env.test.local -.env.production.local -.env.local - -# parcel-bundler cache (https://parceljs.org/) - -.cache -.parcel-cache - -# Next.js build output - -.next -out - -# Nuxt.js build / generate output - -.nuxt -dist - -# Gatsby files - -.cache/ - -# Comment in the public line in if your project uses Gatsby and not Next.js - -# https://nextjs.org/blog/next-9-1#public-directory-support - -# public - -# vuepress build output - -.vuepress/dist - -# vuepress v2.x temp and cache directory - -.temp -.cache - -# Docusaurus cache and generated files - -.docusaurus - -# Serverless directories - -.serverless/ - -# FuseBox cache - -.fusebox/ - -# DynamoDB Local files - -.dynamodb/ - -# TernJS port file - -.tern-port - -# Stores VSCode versions used for testing VSCode extensions - -.vscode-test - -# yarn v2 - -.yarn/cache -.yarn/unplugged -.yarn/build-state.yml -.yarn/install-state.gz -.pnp.\* diff --git a/.envrc b/.envrc deleted file mode 100644 index 3550a30..0000000 --- a/.envrc +++ /dev/null @@ -1 +0,0 @@ -use flake diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 5df5eb6..0000000 --- a/.gitignore +++ /dev/null @@ -1,173 +0,0 @@ -# Based on https://raw.githubusercontent.com/github/gitignore/main/Node.gitignore - -# Logs - -logs -_.log -npm-debug.log_ -yarn-debug.log* -yarn-error.log* -lerna-debug.log* -.pnpm-debug.log* - -# Diagnostic reports (https://nodejs.org/api/report.html) - -report.[0-9]_.[0-9]_.[0-9]_.[0-9]_.json - -# Runtime data - -pids -_.pid -_.seed -\*.pid.lock - -# Directory for instrumented libs generated by jscoverage/JSCover - -lib-cov - -# Coverage directory used by tools like istanbul - -coverage -\*.lcov - -# nyc test coverage - -.nyc_output - -# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) - -.grunt - -# Bower dependency directory (https://bower.io/) - -bower_components - -# node-waf configuration - -.lock-wscript - -# Compiled binary addons (https://nodejs.org/api/addons.html) - -build/Release - -# Dependency directories - -node_modules/ -jspm_packages/ - -# Snowpack dependency directory (https://snowpack.dev/) - -web_modules/ - -# TypeScript cache - -\*.tsbuildinfo - -# Optional npm cache directory - -.npm - -# Optional eslint cache - -.eslintcache - -# Optional stylelint cache - -.stylelintcache - -# Microbundle cache - -.rpt2_cache/ -.rts2_cache_cjs/ -.rts2_cache_es/ -.rts2_cache_umd/ - -# Optional REPL history - -.node_repl_history - -# Output of 'npm pack' - -\*.tgz - -# Yarn Integrity file - -.yarn-integrity - -# dotenv environment variable files - -.env -.env.development.local -.env.test.local -.env.production.local -.env.local - -# parcel-bundler cache (https://parceljs.org/) - -.cache -.parcel-cache - -# Next.js build output - -.next -out - -# Nuxt.js build / generate output - -.nuxt -dist - -# Gatsby files - -.cache/ - -# Comment in the public line in if your project uses Gatsby and not Next.js - -# https://nextjs.org/blog/next-9-1#public-directory-support - -# public - -# vuepress build output - -.vuepress/dist - -# vuepress v2.x temp and cache directory - -.temp -.cache - -# Docusaurus cache and generated files - -.docusaurus - -# Serverless directories - -.serverless/ - -# FuseBox cache - -.fusebox/ - -# DynamoDB Local files - -.dynamodb/ - -# TernJS port file - -.tern-port - -# Stores VSCode versions used for testing VSCode extensions - -.vscode-test - -# yarn v2 - -.yarn/cache -.yarn/unplugged -.yarn/build-state.yml -.yarn/install-state.gz -.pnp.\* -/.direnv/ -/public/ -/.compressstamp -/.formatstamp diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index b7aeba2..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "themes/bear"] - path = themes/bear - url = ssh://git.alanpearce.eu/zola-bearblog diff --git a/static/.well-known/keybase.txt b/.well-known/keybase.txt index f027aa9..f027aa9 100644 --- a/static/.well-known/keybase.txt +++ b/.well-known/keybase.txt diff --git a/.well-known/webfinger b/.well-known/webfinger new file mode 100644 index 0000000..b2e3d7d --- /dev/null +++ b/.well-known/webfinger @@ -0,0 +1 @@ +{"subject":"acct:alan@alanpearce.eu","links":[{"rel":"http://openid.net/specs/connect/1.0/issuer","href":"https://id.alanpearce.eu/"}]} \ No newline at end of file diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 3724bf3..0000000 --- a/Dockerfile +++ /dev/null @@ -1,67 +0,0 @@ -# syntax = docker/dockerfile:1 - -# Adjust BUN_VERSION as desired -ARG BUN_VERSION=1.1.2 -FROM docker.io/oven/bun:${BUN_VERSION} as base - -LABEL fly_launch_runtime="Bun" - -WORKDIR /app - -FROM base as install -RUN mkdir -p /temp/dev -COPY --link bun.lockb package.json /temp/dev/ -RUN cd /temp/dev && bun install --frozen-lockfile - -RUN mkdir -p /temp/prod -COPY --link bun.lockb package.json /temp/prod/ -RUN cd /temp/prod && bun install --frozen-lockfile --production - -FROM base as build -COPY --from=install /temp/dev/node_modules node_modules - -# Copy application code -COPY --link config.toml config.toml -COPY --link src src -COPY --link bin bin -COPY --link content content -COPY --link templates templates -COPY --link static static - -ENV NODE_ENV=production -RUN bun run bin/build.ts -RUN rm -fr node_modules -COPY --from=install /temp/prod/node_modules node_modules -RUN bun build src/index.ts --compile --minify --sourcemap --outfile server - -FROM alpine:20240329 as postprocess - -RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories - -RUN apk add --no-cache prettier@testing make fd brotli gzip zstd - -WORKDIR /app - -COPY --link Makefile ./ -COPY --link config.toml ./ -COPY --from=build /app/public public - -RUN make format -RUN make -j4 compress - -# Final stage for app image -FROM gcr.io/distroless/base-nossl - -WORKDIR /app - -# Copy built application -COPY config.toml /app/ -COPY --from=build /app /app -COPY --from=postprocess /app/public /app/public - -# Start the server by default, this can be overwritten at runtime -EXPOSE 3000 -EXPOSE 9091 - -ENV NODE_ENV=production -CMD [ "/app/server" ] diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..4ea99c2 --- /dev/null +++ b/LICENSE @@ -0,0 +1,395 @@ +Attribution 4.0 International + +======================================================================= + +Creative Commons Corporation ("Creative Commons") is not a law firm and +does not provide legal services or legal advice. Distribution of +Creative Commons public licenses does not create a lawyer-client or +other relationship. Creative Commons makes its licenses and related +information available on an "as-is" basis. Creative Commons gives no +warranties regarding its licenses, any material licensed under their +terms and conditions, or any related information. Creative Commons +disclaims all liability for damages resulting from their use to the +fullest extent possible. + +Using Creative Commons Public Licenses + +Creative Commons public licenses provide a standard set of terms and +conditions that creators and other rights holders may use to share +original works of authorship and other material subject to copyright +and certain other rights specified in the public license below. The +following considerations are for informational purposes only, are not +exhaustive, and do not form part of our licenses. + + Considerations for licensors: Our public licenses are + intended for use by those authorized to give the public + permission to use material in ways otherwise restricted by + copyright and certain other rights. Our licenses are + irrevocable. Licensors should read and understand the terms + and conditions of the license they choose before applying it. + Licensors should also secure all rights necessary before + applying our licenses so that the public can reuse the + material as expected. Licensors should clearly mark any + material not subject to the license. This includes other CC- + licensed material, or material used under an exception or + limitation to copyright. More considerations for licensors: + wiki.creativecommons.org/Considerations_for_licensors + + Considerations for the public: By using one of our public + licenses, a licensor grants the public permission to use the + licensed material under specified terms and conditions. If + the licensor's permission is not necessary for any reason--for + example, because of any applicable exception or limitation to + copyright--then that use is not regulated by the license. Our + licenses grant only permissions under copyright and certain + other rights that a licensor has authority to grant. Use of + the licensed material may still be restricted for other + reasons, including because others have copyright or other + rights in the material. A licensor may make special requests, + such as asking that all changes be marked or described. + Although not required by our licenses, you are encouraged to + respect those requests where reasonable. More considerations + for the public: + wiki.creativecommons.org/Considerations_for_licensees + +======================================================================= + +Creative Commons Attribution 4.0 International Public License + +By exercising the Licensed Rights (defined below), You accept and agree +to be bound by the terms and conditions of this Creative Commons +Attribution 4.0 International Public License ("Public License"). To the +extent this Public License may be interpreted as a contract, You are +granted the Licensed Rights in consideration of Your acceptance of +these terms and conditions, and the Licensor grants You such rights in +consideration of benefits the Licensor receives from making the +Licensed Material available under these terms and conditions. + + +Section 1 -- Definitions. + + a. Adapted Material means material subject to Copyright and Similar + Rights that is derived from or based upon the Licensed Material + and in which the Licensed Material is translated, altered, + arranged, transformed, or otherwise modified in a manner requiring + permission under the Copyright and Similar Rights held by the + Licensor. For purposes of this Public License, where the Licensed + Material is a musical work, performance, or sound recording, + Adapted Material is always produced where the Licensed Material is + synched in timed relation with a moving image. + + b. Adapter's License means the license You apply to Your Copyright + and Similar Rights in Your contributions to Adapted Material in + accordance with the terms and conditions of this Public License. + + c. Copyright and Similar Rights means copyright and/or similar rights + closely related to copyright including, without limitation, + performance, broadcast, sound recording, and Sui Generis Database + Rights, without regard to how the rights are labeled or + categorized. For purposes of this Public License, the rights + specified in Section 2(b)(1)-(2) are not Copyright and Similar + Rights. + + d. Effective Technological Measures means those measures that, in the + absence of proper authority, may not be circumvented under laws + fulfilling obligations under Article 11 of the WIPO Copyright + Treaty adopted on December 20, 1996, and/or similar international + agreements. + + e. Exceptions and Limitations means fair use, fair dealing, and/or + any other exception or limitation to Copyright and Similar Rights + that applies to Your use of the Licensed Material. + + f. Licensed Material means the artistic or literary work, database, + or other material to which the Licensor applied this Public + License. + + g. Licensed Rights means the rights granted to You subject to the + terms and conditions of this Public License, which are limited to + all Copyright and Similar Rights that apply to Your use of the + Licensed Material and that the Licensor has authority to license. + + h. Licensor means the individual(s) or entity(ies) granting rights + under this Public License. + + i. Share means to provide material to the public by any means or + process that requires permission under the Licensed Rights, such + as reproduction, public display, public performance, distribution, + dissemination, communication, or importation, and to make material + available to the public including in ways that members of the + public may access the material from a place and at a time + individually chosen by them. + + j. Sui Generis Database Rights means rights other than copyright + resulting from Directive 96/9/EC of the European Parliament and of + the Council of 11 March 1996 on the legal protection of databases, + as amended and/or succeeded, as well as other essentially + equivalent rights anywhere in the world. + + k. You means the individual or entity exercising the Licensed Rights + under this Public License. Your has a corresponding meaning. + + +Section 2 -- Scope. + + a. License grant. + + 1. Subject to the terms and conditions of this Public License, + the Licensor hereby grants You a worldwide, royalty-free, + non-sublicensable, non-exclusive, irrevocable license to + exercise the Licensed Rights in the Licensed Material to: + + a. reproduce and Share the Licensed Material, in whole or + in part; and + + b. produce, reproduce, and Share Adapted Material. + + 2. Exceptions and Limitations. For the avoidance of doubt, where + Exceptions and Limitations apply to Your use, this Public + License does not apply, and You do not need to comply with + its terms and conditions. + + 3. Term. The term of this Public License is specified in Section + 6(a). + + 4. Media and formats; technical modifications allowed. The + Licensor authorizes You to exercise the Licensed Rights in + all media and formats whether now known or hereafter created, + and to make technical modifications necessary to do so. The + Licensor waives and/or agrees not to assert any right or + authority to forbid You from making technical modifications + necessary to exercise the Licensed Rights, including + technical modifications necessary to circumvent Effective + Technological Measures. For purposes of this Public License, + simply making modifications authorized by this Section 2(a) + (4) never produces Adapted Material. + + 5. Downstream recipients. + + a. Offer from the Licensor -- Licensed Material. Every + recipient of the Licensed Material automatically + receives an offer from the Licensor to exercise the + Licensed Rights under the terms and conditions of this + Public License. + + b. No downstream restrictions. You may not offer or impose + any additional or different terms or conditions on, or + apply any Effective Technological Measures to, the + Licensed Material if doing so restricts exercise of the + Licensed Rights by any recipient of the Licensed + Material. + + 6. No endorsement. Nothing in this Public License constitutes or + may be construed as permission to assert or imply that You + are, or that Your use of the Licensed Material is, connected + with, or sponsored, endorsed, or granted official status by, + the Licensor or others designated to receive attribution as + provided in Section 3(a)(1)(A)(i). + + b. Other rights. + + 1. Moral rights, such as the right of integrity, are not + licensed under this Public License, nor are publicity, + privacy, and/or other similar personality rights; however, to + the extent possible, the Licensor waives and/or agrees not to + assert any such rights held by the Licensor to the limited + extent necessary to allow You to exercise the Licensed + Rights, but not otherwise. + + 2. Patent and trademark rights are not licensed under this + Public License. + + 3. To the extent possible, the Licensor waives any right to + collect royalties from You for the exercise of the Licensed + Rights, whether directly or through a collecting society + under any voluntary or waivable statutory or compulsory + licensing scheme. In all other cases the Licensor expressly + reserves any right to collect such royalties. + + +Section 3 -- License Conditions. + +Your exercise of the Licensed Rights is expressly made subject to the +following conditions. + + a. Attribution. + + 1. If You Share the Licensed Material (including in modified + form), You must: + + a. retain the following if it is supplied by the Licensor + with the Licensed Material: + + i. identification of the creator(s) of the Licensed + Material and any others designated to receive + attribution, in any reasonable manner requested by + the Licensor (including by pseudonym if + designated); + + ii. a copyright notice; + + iii. a notice that refers to this Public License; + + iv. a notice that refers to the disclaimer of + warranties; + + v. a URI or hyperlink to the Licensed Material to the + extent reasonably practicable; + + b. indicate if You modified the Licensed Material and + retain an indication of any previous modifications; and + + c. indicate the Licensed Material is licensed under this + Public License, and include the text of, or the URI or + hyperlink to, this Public License. + + 2. You may satisfy the conditions in Section 3(a)(1) in any + reasonable manner based on the medium, means, and context in + which You Share the Licensed Material. For example, it may be + reasonable to satisfy the conditions by providing a URI or + hyperlink to a resource that includes the required + information. + + 3. If requested by the Licensor, You must remove any of the + information required by Section 3(a)(1)(A) to the extent + reasonably practicable. + + 4. If You Share Adapted Material You produce, the Adapter's + License You apply must not prevent recipients of the Adapted + Material from complying with this Public License. + + +Section 4 -- Sui Generis Database Rights. + +Where the Licensed Rights include Sui Generis Database Rights that +apply to Your use of the Licensed Material: + + a. for the avoidance of doubt, Section 2(a)(1) grants You the right + to extract, reuse, reproduce, and Share all or a substantial + portion of the contents of the database; + + b. if You include all or a substantial portion of the database + contents in a database in which You have Sui Generis Database + Rights, then the database in which You have Sui Generis Database + Rights (but not its individual contents) is Adapted Material; and + + c. You must comply with the conditions in Section 3(a) if You Share + all or a substantial portion of the contents of the database. + +For the avoidance of doubt, this Section 4 supplements and does not +replace Your obligations under this Public License where the Licensed +Rights include other Copyright and Similar Rights. + + +Section 5 -- Disclaimer of Warranties and Limitation of Liability. + + a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE + EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS + AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF + ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, + IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, + WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, + ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT + KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT + ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. + + b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE + TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, + NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, + INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, + COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR + USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR + DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR + IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. + + c. The disclaimer of warranties and limitation of liability provided + above shall be interpreted in a manner that, to the extent + possible, most closely approximates an absolute disclaimer and + waiver of all liability. + + +Section 6 -- Term and Termination. + + a. This Public License applies for the term of the Copyright and + Similar Rights licensed here. However, if You fail to comply with + this Public License, then Your rights under this Public License + terminate automatically. + + b. Where Your right to use the Licensed Material has terminated under + Section 6(a), it reinstates: + + 1. automatically as of the date the violation is cured, provided + it is cured within 30 days of Your discovery of the + violation; or + + 2. upon express reinstatement by the Licensor. + + For the avoidance of doubt, this Section 6(b) does not affect any + right the Licensor may have to seek remedies for Your violations + of this Public License. + + c. For the avoidance of doubt, the Licensor may also offer the + Licensed Material under separate terms or conditions or stop + distributing the Licensed Material at any time; however, doing so + will not terminate this Public License. + + d. Sections 1, 5, 6, 7, and 8 survive termination of this Public + License. + + +Section 7 -- Other Terms and Conditions. + + a. The Licensor shall not be bound by any additional or different + terms or conditions communicated by You unless expressly agreed. + + b. Any arrangements, understandings, or agreements regarding the + Licensed Material not stated herein are separate from and + independent of the terms and conditions of this Public License. + + +Section 8 -- Interpretation. + + a. For the avoidance of doubt, this Public License does not, and + shall not be interpreted to, reduce, limit, restrict, or impose + conditions on any use of the Licensed Material that could lawfully + be made without permission under this Public License. + + b. To the extent possible, if any provision of this Public License is + deemed unenforceable, it shall be automatically reformed to the + minimum extent necessary to make it enforceable. If the provision + cannot be reformed, it shall be severed from this Public License + without affecting the enforceability of the remaining terms and + conditions. + + c. No term or condition of this Public License will be waived and no + failure to comply consented to unless expressly agreed to by the + Licensor. + + d. Nothing in this Public License constitutes or may be interpreted + as a limitation upon, or waiver of, any privileges and immunities + that apply to the Licensor or You, including from the legal + processes of any jurisdiction or authority. + + +======================================================================= + +Creative Commons is not a party to its public +licenses. Notwithstanding, Creative Commons may elect to apply one of +its public licenses to material it publishes and in those instances +will be considered the “Licensor.” The text of the Creative Commons +public licenses is dedicated to the public domain under the CC0 Public +Domain Dedication. Except for the limited purpose of indicating that +material is shared under a Creative Commons public license or as +otherwise permitted by the Creative Commons policies published at +creativecommons.org/policies, Creative Commons does not authorize the +use of the trademark "Creative Commons" or any other trademark or logo +of Creative Commons without its prior written consent including, +without limitation, in connection with any unauthorized modifications +to any of its public licenses or any other arrangements, +understandings, or agreements concerning use of licensed material. For +the avoidance of doubt, this paragraph does not form part of the +public licenses. + +Creative Commons may be contacted at creativecommons.org. diff --git a/Makefile b/Makefile deleted file mode 100644 index 41b4666..0000000 --- a/Makefile +++ /dev/null @@ -1,92 +0,0 @@ -.SHELLFLAGS := -eu -o pipefail -c -.ONESHELL: -.DELETE_ON_ERROR: - -brotli := @brotli --force --no-copy-stat -gzip := @gzip --best --keep --force -zstd := @zstd --force --no-pass-through -19 --quiet --stdout -pr := @printf "%4s %s\n" - -format: .formatstamp - -.formatstamp: - @echo "Formatting HTML..." - @prettier --write --parser html --print-width 120 "public/**/*.html" > /dev/null - @touch .formatstamp - -clean: - rm -rf ./public - rm -rf ./.*stamp - -to_compress := $(shell fd . public --type=file -e html -e xml -e xsl -e txt -e asc) -brotli_files := $(patsubst %, %.br, $(to_compress)) -gzip_files := $(patsubst %, %.gz, $(to_compress)) -zstd_files := $(patsubst %, %.zst, $(to_compress)) - -%.html.br: %.html - @echo $@ - $(brotli) $< - -%.xml.br: %.xml - @echo $@ - $(brotli) $< - -%.xsl.br: %.xsl - @echo $@ - $(brotli) $< - -%.txt.br: %.txt - @echo $@ - $(brotli) $< - -%.asc.br: %.asc - @echo $@ - $(brotli) $< - -%.html.gz: %.html - @echo $@ - $(gzip) $< - -%.xml.gz: %.xml - @echo $@ - $(gzip) $< - -%.xsl.gz: %.xsl - @echo $@ - $(gzip) $< - -%.txt.gz: %.txt - @echo $@ - $(gzip) $< - -%.asc.gz: %.asc - @echo $@ - $(gzip) $< - -%.html.zst: %.html - @echo $@ - $(zstd) $< > $@ - -%.xml.zst: %.xml - @echo $@ - $(zstd) $< > $@ - -%.xsl.zst: %.xsl - @echo $@ - $(zstd) $< > $@ - -%.txt.zst: %.txt - @echo $@ - $(zstd) $< > $@ - -%.asc.zst: %.asc - @echo $@ - $(zstd) $< > $@ - -compress: .compressstamp - -.compressstamp: .formatstamp $(brotli_files) $(gzip_files) $(zstd_files) - @echo "Compressing output files..." - @touch .compressstamp - -.PHONY: all clean format compress diff --git a/README.md b/README.md deleted file mode 100644 index 34f3f42..0000000 --- a/README.md +++ /dev/null @@ -1,23 +0,0 @@ -# homestead - -## Goals - -1. Static web server with prometheus-based analytics -2. Dynamic web server capable of generating Zola-based websites -3. More indieweb features - -## Installing - -To install dependencies: - -```bash -bun install -``` - -To run: - -```bash -bun run src/index.ts -``` - -This project was created using `bun init` in bun v0.8.1. [Bun](https://bun.sh) is a fast all-in-one JavaScript runtime. diff --git a/bin/build.ts b/bin/build.ts deleted file mode 100755 index 69cfd6c..0000000 --- a/bin/build.ts +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env bun -import fs from "node:fs"; -import log from "loglevel"; - -import generateSite from "../src/templates"; - -log.setLevel((import.meta.env["LOG_LEVEL"] || "info") as log.LogLevelDesc); - -fs.mkdirSync("public", { recursive: true }); -log.info("Generating site..."); -try { - await generateSite(); -} catch (error) { - log.error("Error generating site", error); - process.exit(1); -} - -log.info("Copying static files..."); -if (!fs.existsSync("static")) { - log.error("static directory not found"); - process.exit(1); -} -fs.readdirSync("static").map((file) => { - log.debug(`Copying static/${file}`); - fs.cpSync(`static/${file}`, `public/${file}`, { - dereference: true, - recursive: true, - preserveTimestamps: true, - }); -}); diff --git a/bun.lockb b/bun.lockb deleted file mode 100755 index 1b07b2e..0000000 --- a/bun.lockb +++ /dev/null Binary files differdiff --git a/config.toml b/config.toml index cd71cbf..292dc6f 100644 --- a/config.toml +++ b/config.toml @@ -1,6 +1,5 @@ default_language = "en-GB" base_url = "https://alanpearce.eu" -redirect_other_hostnames = true title = "Alan Pearce" email = "alan@alanpearce.eu" @@ -8,47 +7,101 @@ description = "Developer, Emacs User" domain_start_date = "2014-06-07" original_domain = "alanpearce.eu" +domains = [ + "alanpearce.eu", + "www.alanpearce.eu", + "alanpearce.uk", + "www.alanpearce.uk", + "aln.pe", +] + +oidc_host = "https://id.alanpearce.eu/" + +goatcounter = "https://stats.alanpearce.eu/count" + +wildcard_domain = "aln.pe" [[taxonomies]] -name = "tags" -feed = true + name = "tags" + feed = true + +[content-security-policy] + default-src = [ + "'none'", + ] + img-src = [ + "'self'", + ] + form-action = [ + "'none'", + ] + base-uri = [ + "'none'", + ] + image-src = [ + "'self'", + "https://stats.alanpearce.eu", + ] + script-src = [ + "'self'", + "https://stats.alanpearce.eu", + ] + style-src = [ + ## index.html style + "'sha256-dCSzNS1o8vygl80V2G2nPTiSOUNvyDnW+06hHS4ZdHQ='", + ## atom.xml style + "'sha256-CFhPA4p8skr5MyhReF+Tk2GzmYzXdECg8zm+o7EOVPI=", + ## cv style + "'sha256-FzrPQ6x2ugtwEN5peA8OqpIvrV3uXqkpfUMHG8P2uT0='", + ] + frame-ancestors = [ + "https://kagi.com", + ] + connect-src = [ + "https://stats.alanpearce.eu/count", + ] + require-trusted-types-for = [ + "'script'", + ] [extra.headers] -cache-control = "max-age=14400" -x-content-type-options = "nosniff" -content-security-policy = "default-src 'none'; img-src 'self'; object-src 'none'; script-src 'self'; style-src 'unsafe-inline'; form-action 'none'; base-uri 'self'; frame-ancestors https://kagi.com;" + cache-control = "max-age=14400" + x-content-type-options = "nosniff" + referrer-policy = "strict-origin-when-cross-origin" + strict-transport-security = "max-age=63072000; includeSubDomains; preload" + cross-origin-resource-policy = "same-site" [[menus.main]] - name = "Home" - url = "/" + name = "Home" + url = "/" [[menus.main]] - name = "Posts" - url = "/post/" + name = "Posts" + url = "/post/" [[menus.main]] - name = "Feed" - url = "/atom.xml" + name = "Feed" + url = "/atom.xml" [[menus.main]] - name = "Tags" - url = "/tags/" + name = "Tags" + url = "/tags/" [[menus.main]] - name = "Repositories" - url = "https://git.alanpearce.eu" + name = "Repositories" + url = "https://git.alanpearce.eu" [[menus.me]] + name = "Sourcehut" + url = "https://sr.ht/~alanpearce/" +[[menus.me]] name = "Codeberg" url = "https://codeberg.org/alanpearce" [[menus.me]] - name = "GitHub" - url = "https://github.com/alanpearce/" -[[menus.me]] name = "GitLab" url = "https://gitlab.com/alanpearce/" [[menus.me]] - name = "LinkedIn" - url = "https://www.linkedin.com/in/alanpearceeu/" + name = "GitHub" + url = "https://github.com/alanpearce/" [[menus.me]] name = "Mastodon" url = "https://ieji.de/@alanpearce" [[menus.me]] - name = "BlueSky" + name = "Bluesky" url = "https://bsky.app/profile/alanpearce.eu" diff --git a/static/cv/index.html b/cv.html index 4fef4cc..4fef4cc 100644 --- a/static/cv/index.html +++ b/cv.html diff --git a/default.nix b/default.nix deleted file mode 100644 index 2cccff2..0000000 --- a/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -(import - ( - let lock = builtins.fromJSON (builtins.readFile ./flake.lock); in - fetchTarball { - url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz"; - sha256 = lock.nodes.flake-compat.locked.narHash; - } - ) - { src = ./.; } -).defaultNix diff --git a/flake.lock b/flake.lock deleted file mode 100644 index 34ed9ad..0000000 --- a/flake.lock +++ /dev/null @@ -1,78 +0,0 @@ -{ - "nodes": { - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1712757991, - "narHash": "sha256-kR7C7Fqt3JP40h0mzmSZeWI5pk1iwqj4CSeGjnUbVHc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d6b3ddd253c578a7ab98f8011e59990f21dc3932", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/flake.nix b/flake.nix deleted file mode 100644 index 67bcc1f..0000000 --- a/flake.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - description = "My website, alanpearce.eu"; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - inputs.flake-utils.url = "github:numtide/flake-utils"; - inputs.flake-compat = { - url = "github:edolstra/flake-compat"; - flake = false; - }; - - outputs = { nixpkgs, flake-utils, ... }: - flake-utils.lib.eachDefaultSystem - (system: - let - pkgs = nixpkgs.legacyPackages.${system}; - nativeBuildInputs = with pkgs; [ - nodePackages.prettier - fd - brotli - gzip - zstd - git - ]; - in - rec { - devShells = { - default = pkgs.mkShell { - packages = with pkgs; [ - bun - flyctl - ] ++ nativeBuildInputs; - }; - }; - }); -} diff --git a/fly.toml b/fly.toml deleted file mode 100644 index 77017b1..0000000 --- a/fly.toml +++ /dev/null @@ -1,31 +0,0 @@ -# fly.toml app configuration file generated for homestead on 2023-09-14T11:40:37+02:00 -# -# See https://fly.io/docs/reference/configuration/ for information about how to use this file. -# - -app = "alanpearce-eu" -primary_region = "ams" - -[build] - -[metrics] - port = 9091 - path = "/metrics" - -[http_service] - internal_port = 3000 - force_https = true - auto_stop_machines = false - auto_start_machines = true - min_machines_running = 3 - processes = ["app"] -[http_service.http_options.response.headers] - Strict-Transport-Security = "max-age=31536000; includeSubdomains; preload" -[[http_service.checks]] - grace_period = "15s" - interval = "30s" - method = "GET" - timeout = "1s" - path = "/health" - [http_service.checks.headers] - Host = "fly-internal" diff --git a/content/_index.md b/index.md index 7239667..7239667 100644 --- a/content/_index.md +++ b/index.md diff --git a/package.json b/package.json deleted file mode 100644 index 84bf38c..0000000 --- a/package.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "name": "homestead", - "module": "src/index.ts", - "scripts": { - "start": "bun run .", - "dev": "bun run --preload ./bin/build.ts --watch src/app.ts", - "build": "bun run bin/build.ts" - }, - "devDependencies": { - "@types/bun": "^1.0.12", - "cheerio": "1.0.0-rc.12", - "highlight.js": "^11.8.0", - "marked": "^9.0.3", - "marked-highlight": "^2.0.6", - "purgecss": "^6.0.0", - "toml-matter": "^1.0.0" - }, - "peerDependencies": { - "typescript": "^5.0.0" - }, - "type": "module", - "dependencies": { - "@sentry/node": "^7.70.0", - "bun-prometheus-client": "^0.0.2", - "loglevel": "^1.8.1", - "toml": "^3.0.0" - } -} diff --git a/content/post/a-new-site.md b/post/a-new-site.md index af61143..af61143 100644 --- a/content/post/a-new-site.md +++ b/post/a-new-site.md diff --git a/content/post/back-again.md b/post/back-again.md index 9529415..9529415 100644 --- a/content/post/back-again.md +++ b/post/back-again.md diff --git a/content/post/cedit-and-paredit.md b/post/cedit-and-paredit.md index 89f8cb3..89f8cb3 100644 --- a/content/post/cedit-and-paredit.md +++ b/post/cedit-and-paredit.md diff --git a/content/post/emacs-package-archive-statistics.md b/post/emacs-package-archive-statistics.md index 6efa5bd..6efa5bd 100644 --- a/content/post/emacs-package-archive-statistics.md +++ b/post/emacs-package-archive-statistics.md diff --git a/content/post/git-cloning-similar-repositories.md b/post/git-cloning-similar-repositories.md index 8f1eb43..8f1eb43 100644 --- a/content/post/git-cloning-similar-repositories.md +++ b/post/git-cloning-similar-repositories.md diff --git a/content/post/homesteading.md b/post/homesteading.md index 52ce713..52ce713 100644 --- a/content/post/homesteading.md +++ b/post/homesteading.md diff --git a/content/post/nixos-on-nanopi-r5s.md b/post/nixos-on-nanopi-r5s.md index 825d6b4..185bd30 100644 --- a/content/post/nixos-on-nanopi-r5s.md +++ b/post/nixos-on-nanopi-r5s.md @@ -2,7 +2,7 @@ title = "Running NixOS on a NanoPi R5S" date = 2023-07-30T08:51:46Z [taxonomies] -tags = ["NixOS", "home-networking", "infrastructure"] +tags = ["nixos", "home-networking", "infrastructure"] +++ I managed to get [NixOS](https://nixos.org) running on my [NanoPi R5S](https://www.friendlyelec.com/index.php?route=product/product&product_id=287) ([FriendlyElec Wiki](https://wiki.friendlyelec.com/wiki/index.php/NanoPi_R5S)). diff --git a/content/post/now-on-three-continents.md b/post/now-on-three-continents.md index 1a2828a..1a2828a 100644 --- a/content/post/now-on-three-continents.md +++ b/post/now-on-three-continents.md diff --git a/content/post/opening-projects-with-projectile.md b/post/opening-projects-with-projectile.md index b44c5e8..b44c5e8 100644 --- a/content/post/opening-projects-with-projectile.md +++ b/post/opening-projects-with-projectile.md diff --git a/content/post/postfix-as-null-client-with-external-catchall.md b/post/postfix-as-null-client-with-external-catchall.md index b3fd5a4..b3fd5a4 100644 --- a/content/post/postfix-as-null-client-with-external-catchall.md +++ b/post/postfix-as-null-client-with-external-catchall.md diff --git a/content/post/repository-management-with-ghq.md b/post/repository-management-with-ghq.md index dd21db9..dd21db9 100644 --- a/content/post/repository-management-with-ghq.md +++ b/post/repository-management-with-ghq.md diff --git a/post/searchix.md b/post/searchix.md new file mode 100644 index 0000000..6e1962b --- /dev/null +++ b/post/searchix.md @@ -0,0 +1,33 @@ +--- +title: "Announcing Searchix: Nix ecosystem search" +date: 2024-07-11T15:05:00+02:00 +taxonomies: + tags: [nix, searchix] +--- + +I decided to create a search tool for NixOS, nix-darwin and +home-manager options and packages, potentially with more sources to +come. + +I called it [Searchix](https://searchix.alanpearce.eu/) + +For NixOS options and packages, +[search.nixos.org](https://search.nixos.org) already exists (and works +better than Searchix), whereas for home-manager and nix-darwin, I +couldn't manage to find a web-based search tool that's still +online[^1]. So I wrote one. + +What I'm happy about with it is that it doesn't _require_ JavaScript, +but, if it's enabled, makes things a little bit better. It's only my +second project in Golang, so I still have things to learn, but I +definitely think I will enjoy using this language further. + +It still has quite a bit of room for improvement, but I've been using +it quite a lot recently, which leads me to think that other people +might like to use it, too. + +If anyone would like to contribute, raise an issue, or host an +instance themselves, the [project site and source code are on sr.ht](https://sr.ht/~alanpearce/searchix/). + +[^1]: I found [Home Manager Option Search](https://home-manager-options.extranix.com/) after I + started this project, but nothing for nix-darwin. diff --git a/content/post/self-hosted-git.md b/post/self-hosted-git.md index d0ac370..ab88e78 100644 --- a/content/post/self-hosted-git.md +++ b/post/self-hosted-git.md @@ -144,4 +144,4 @@ I want, without consuming many system resources with daemons. [dotfiles-github]:https://github.com/alanpearce/dotfiles [wildrepos]:http://gitolite.com/gitolite/wild/ [ghq]:https://github.com/motemen/ghq -[using-ghq]:@/post/repository-management-with-ghq.md "Repository management with ghq" +[using-ghq]:/post/repository-management-with-ghq/ "Repository management with ghq" diff --git a/post/when-tailscale-magicdns-isn't.md b/post/when-tailscale-magicdns-isn't.md new file mode 100644 index 0000000..2c611a4 --- /dev/null +++ b/post/when-tailscale-magicdns-isn't.md @@ -0,0 +1,200 @@ +--- +title: When Tailscale MagicDNS isn’t +description: Frustrations of a NixOS user +date: 2024-06-23T10:57:00+02:00 +taxonomies: + tags: [nixos] +--- + +On a router, I have [dnsmasq](https://dnsmasq.org/doc.html) and [kresd](https://knot-resolver.readthedocs.io/en/stable/) as DNS servers. Dnsmasq is accessible on the LAN interface and forwards queries to kresd, which is accessible on the loopback interface. This has been working for a long time. + +I recently set up [Tailscale](https://tailscale.com/) and was confused as to why [MagicDNS](https://tailscale.com/kb/1081/magicdns) wasn’t working on this one device (I have two other NixOS devices that didn’t have any problems). I’m no stranger to investigating these problems, after using and tinkering with networking on Linux/FreeBSD for many years and if there’s a problem, [it’s always DNS](https://isitdns.com/). + +My first look at `/etc/resolv.conf` suggested things should be fine, I thought. + +``` +# Generated by resolvconf +search my-network.ts.net +nameserver 127.0.0.1 +nameserver ::1 +``` + +:::{.aside} +‘why is this even generated by `resolvconf`?’, I ask myself: this is a router with a static networking configuration and custom upstream nameservers. I’ll investigate that later, I tell myself. +::: + +I eventually realised that it should be using 100.100.100.100 for two reasons. + +1. A working machine’s `/etc/resolv.conf` contains: + + ``` + # Generated by resolvconf + search my-network.ts.net + nameserver 100.100.100.100 + options edns0 + ``` + +2. The Tailscale dashboard gives me a *hint* under the nameservers section: +> ### Nameservers +> Set the nameservers used by devices on your network to resolve DNS queries. [Learn more ↗](https://tailscale.com/kb/1054/dns) +> +> *my-network*.ts.net ✨MagicDNS\ +> 100.100.100.100 + +The [linked documentation (DNS in Tailscale)](https://tailscale.com/kb/1054/dns) doesn’t even mention 100.100.100.100, nor does the documentation for [MagicDNS](https://tailscale.com/kb/1081/magicdns). It is explained as [part of a blog post under the heading ‘how MagicDNS works’](https://tailscale.com/blog/2021-09-private-dns-with-magicdns#how-magicdns-works), but that’s not the first place I’d look. + +This led me to try to find what might be responsible for the `nameserver 127.0.0.1` setting: +- I checked for systemd-resolved, but it wasn’t that (the nameserver would have been 127.0.0.53 if it were). +- I didn’t think it was anything to do with dnsmasq because that’s configured to use the LAN interface, not the loopback. +- I didn’t think it was kresd either, since another device uses kresd, but does not have the problem. kresd is not listening on a loopback address on the default port 53 on either machine, meaning that if it were doing this, DNS resolution would have been broken on both machines for a long time. + +Eventually I stumbled upon something that worked: setting `networking.resolvconf.useLocalResolver = false`. I then started to investigate in order to open an issue with NixOS, but found things got more confusing and I forgot why I was shaving a yak[^7]. + +--- + +### Unexpected behaviours + +1. The NixOS kresd module [blindly sets `networking.resolvconf.useLocalResolver` to default to `true`](https://github.com/NixOS/nixpkgs/blob/bfb7a882678e518398ce9a31a881538679f6f092/nixos/modules/services/networking/kresd.nix#L113) because [someone ran into resolver loops](https://github.com/NixOS/nixpkgs/pull/124391) and this was accepted on the grounds that it’s [‘good to be consistent’ (with pdns-recursor, for example)](https://github.com/NixOS/nixpkgs/pull/124391#pullrequestreview-667950510). + - I consider this ["spooky action at a distance"](https://en.wikipedia.org/wiki/Action_at_a_distance#%22Spooky_action_at_a_distance%22). I do not think it should do this, but I can see how it *could* be helpful. In enough cases, though? I’m not sure. + - In my case, kresd was *never even listening* on localhost port 53, meaning that this default setting would have led to a broken DNS setup, which at least would at least have led me to investigate the right thing at that time. + :::{.aside} + Why didn’t it, then? + ::: + +2. The NixOS dnsmasq module sets [`networking.resolvconf.useLocalResolver = true` if `services.dnsmasq.resolveLocalQueries = true`](https://github.com/NixOS/nixpkgs/blob/7780e5160e011b39019797a4c4b1a4babc80d1bf/nixos/modules/services/networking/dnsmasq.nix#L150-L151). This is at least less spooky and distant, but still faulty. + + 1. I had indeed set `services.dnsmasq.resolveLocalQueries = true`, because I would like to be able to `ping foo.lan` on the router and it made that possible. + 2. My erroneous assumption was likely that this setting changes the system nameserver to match the listen address of dnsmasq, rather than setting `networking.resolvconf.useLocalResolver`. Setting `resolveLocalQueries = false` was one of the first things I tried and it didn’t make a difference, which was unexpected (because kresd was setting it). + :::{.aside} + If that weren’t enough, [`services.dnsmasq.resolveLocalQueries` sets `networking.nameservers` to include 127.0.0.1](https://github.com/NixOS/nixpkgs/blob/7780e5160e011b39019797a4c4b1a4babc80d1bf/nixos/modules/services/networking/dnsmasq.nix#L138-L139), which makes things more confusing, and is wrong because I haven’t configured dnsmasq to listen on this address. + ::: + 3. dnsmasq’s `--interface=<interface name>` setting doesn’t work either as I expected or as it is [documented](https://dnsmasq.org/docs/dnsmasq-man.html). + + > **-i, --interface=\<interface name\>**\ + > Listen only on the specified interface(s). + + I had this set to listen _only_ on the LAN interface and I could see it nevertheless listening on `*:53` in `lsof`, rather than the addresses of the LAN interface. + + 1. This behaviour *is* mentioned, under a different option, `--bind-interfaces`: + + > On systems which support it, dnsmasq binds the wildcard address, even when it is listening on only some interfaces. It then discards requests that it shouldn’t reply to. This has the advantage of working even when interfaces come and go and change address. This option forces dnsmasq to really bind only the interfaces it is listening on. *About the only time when this is useful is when running another nameserver (or another instance of dnsmasq) on the same machine*. + + I had enabled this setting when I set up kresd on the machine, because the last sentence applies to my case and interfaces are not ‘coming and going’[^4]. The naming is weird as it would suggest it works like `--interface`; namely that `--bind-interfaces=<interface name>` would be a reasonable use. Alas, it is a boolean flag and takes no value. + + 2. Even when `--interface` and `--bind-interfaces` *are* set, dnsmasq decides to ignore my intent and explicitly listen on loopback. This is weird, but, guess what, documented back under `--interface`: + + > Dnsmasq automatically adds the loopback (local) interface to the list of interfaces to use when the **--interface** option is used. + + :::{.aside} + This explains why enabling kresd didn’t break things before; dnsmasq was listening on 127.0.0.1, even though I thought I had told it not to. + ::: + +3. The option name `networking.resolvconf.useLocalResolver` and its [documentation](https://search.nixos.org/options?channel=unstable&show=networking.resolvconf.useLocalResolver&from=0&size=50&sort=relevance&type=packages&query=uselocalresolver) are unclear. + + > Use local DNS server for resolving. + + This sentence adds no additional data not present in the option name. Local to what? I’m on a *Local* Area Network and wish to use a DNS server on the LAN, should I enable this? No, that’s not what this option is for. It could mean local to *this host*, looking at [its usage](https://github.com/NixOS/nixpkgs/blob/bfb7a882678e518398ce9a31a881538679f6f092/nixos/modules/config/resolvconf.nix#L29-L32). (I deliberately avoided combining the words ‘local’ and ‘host’, for reasons below) + - Even if it had a clearer name like `useLocalhostResolver`, the inaccuracy would remain, as `getent hosts localhost` and `getent ahosts localhost` both prefer ::1 over 127.0.0.1, not the other way around. + - What would have happened if I had enabled this setting with a server listening on ::1 and *not* 127.0.0.1? It would work, but not be the best setting as applications would attempt to reach a nameserver that is not listening on 127.0.0.1. + - It might be confusing to reference a hostname when talking about nameserver reachability, since an IP address is required to reach a nameserver and a nameserver <del>is</del> <ins>could be</ins> required to resolve a hostname. Setting `nameserver localhost` in `/etc/resolv.conf` won’t work, I _thought_. + + - I tried it. Neovim didn’t highlight it as an error[^2] and it did **not** break name resolution, presumably because [`localhost` is added to `/etc/hosts`](https://github.com/NixOS/nixpkgs/blob/bfb7a882678e518398ce9a31a881538679f6f092/nixos/modules/config/networking.nix#L179-L182) *and* is a [special case in `nss-myhostname`](https://www.man7.org/linux/man-pages/man8/nss-myhostname.8.html), the existence of which I might not have known had I not set up [multicast DNS](https://en.wikipedia.org/wiki/Multicast_DNS) to resolve `.local` hostnames in `/etc/nsswitch.conf` in the past, + + > The hostnames "localhost" and "localhost.localdomain" (as + well as any hostname ending in ".localhost" or + ".localhost.localdomain") are resolved to the IP addresses + 127.0.0.1 and ::1. + + Why is localhost added to `/etc/hosts` if it’s handled by `nss-myhostname` in `/etc/nsswitch.conf?`? The man page of `nsswitch.conf` ([mirror](https://www.man7.org/linux/man-pages/man5/nsswitch.conf.5.html)) gives a small clue: + + > `/etc/nsswitch.conf` is used by the GNU C Library and certain + other applications[^5] + + Why isn’t even the choice of a name resolution mechanism for *localhost* unified in 2024? + + - I tried on macOS and iOS. Both allow setting a named nameserver in the GUI, which surprised me. I remember that on earlier versions of Windows (at least on XP, Vista and 7) there were special input boxes that exclusively allowed an IPv4 address, although there was a separate dialogue to input IPv6 addresses. I wonder if that allows hostnames or not, but I don’t have Windows running at the moment to check. + +4. Setting `networking.resolvconf.enable = false` doesn’t appear to do.. well.. anything. + - The *generated by resolvconf* comment in `/etc/resolv.conf` remains, as do the previous nameserver entries. + - `/run/current-system/sw/bin/resolvconf` is not removed. + - `man resolvconf` has content (because it’s a link to `man resolvectl`, which is part of `systemd-resolved`, which isn’t even enabled on this system) + - I was surprised that `/etc/resolv.conf` was writable at all, as <del>all</del> <ins>many</ins> files under `/etc/` are symlinks to their namesakes under `/etc/static`, which itself is a symlink to a folder in the nix store which contains… more symlinks. Here I use `resolvconf.conf` as an example, i.e. the configuration of `resolvconf`, the program that manages `resolv.conf`. + + ``` + rwxrwxrwx 1 root root 27 May 26 23:14 /etc/resolvconf.conf -> /etc/static/resolvconf.conf + lrwxrwxrwx 1 root root 51 May 26 23:14 /etc/static -> /nix/store/pm0yi93ak5kcvfmidv5lckzfixrh2gck-etc/etc/ + lrwxrwxrwx 4 root root 63 Jan 1 1970 /nix/store/pm0yi93ak5kcvfmidv5lckzfixrh2gck-etc/etc/resolvconf.conf -> /nix/store/kf0lrhiqqqrc6w96h4qm0sysffnccx2d-etc-resolvconf.conf + -r--r--r-- 3 root root 518 Jan 1 1970 /nix/store/kf0lrhiqqqrc6w96h4qm0sysffnccx2d-etc-resolvconf.conf + ``` + + That’s too much indirection for me. If [‘we can solve any problem by introducing an extra level of indirection’](https://en.wikipedia.org/wiki/Fundamental_theorem_of_software_engineering), this suggests that *at least three* problems have been solved here. + + Isn’t it odd that the symlinks are writable to all? I know that `/nix/store` is a read-only filesystem, but it looks odd. Upon searching the web for information, I was directed to the [coreutils `chmod` documentation](https://www.gnu.org/software/coreutils/manual/html_node/chmod-invocation.html): + + > `chmod` doesn’t change the permissions of symbolic links; the `chmod` system call cannot change their permissions on most systems, and most systems ignore permissions of symbolic links + + _Most_ systems? What does this mean? Is it based on the filesystem used? I would assume that it doesn’t mean ’this is the case on Linux’ given the reference to the system call of the same name and that Linux was not mentioned. The man page for the system call mentions + + > *flags* can either be 0, or include the following flag: + > \ + > **AT_SYMLINK_NOFOLLOW**\ + > If pathname is a symbolic link, do not dereference it: + > instead operate on the link itself. This flag is not + > currently implemented. + + - The default value of `networking.resolvconf.enable` is [`!(config.environment.etc ? "resolv.conf")`](https://search.nixos.org/options?channel=unstable&show=networking.resolvconf.enable&from=0&size=50&sort=relevance&type=packages&query=networking.resolvconf.enable), which I understand as _if the content of `resolv.conf` isn’t otherwise assigned_. + - There are values in `networking.nameservers`, but these aren’t used as content for `resolv.conf`, which I thought would have been reasonable. + + What *is* the point of `networking.resolvconf.enable`, then? And what about `networking.nameservers`? Where do its values even go? [^6] + +4. This issue pushed me to drop flakes on the router so that `nixos-option` would help me as [it does not support flakes](https://github.com/NixOS/nixpkgs/issues/97855)[^3]. + +5. The Tailscale module [adds `resolvconf` to its path conditionally](https://github.com/NixOS/nixpkgs/blob/7780e5160e011b39019797a4c4b1a4babc80d1bf/nixos/modules/services/networking/tailscale.nix#L87). The [commit adding this condition](https://github.com/NixOS/nixpkgs/commit/922351ec866dcfe1dca4d190bfd3c360933e5cd0) explains that ‘trying to use [resolvconf] always fails because +`/etc/resolvconf.conf` contains an `exit 1`’, which sounds perfectly reasonable. + - If `resolvconf` weren’t in tailscaled’s path, Tailscale would fall back to overwriting resolv.conf, which I found out about because it is a common enough problem/question to warrant [a heading and its own page](https://tailscale.com/kb/1235/resolv-conf). + + This document is the most concise and informative clarification of my original issue; the last paragraph tells me everything I needed to know: + + > Even if you set `--accept-dns=false`, Tailscale’s MagicDNS server still replies at `100.100.100.100` (or `fd7a:115c:a1e0::53`), as long as MagicDNS is enabled on the tailnet. If you’d like to manually configure your DNS configuration, you can point `*.ts.net` queries at `100.100.100.100`. + + Sadly I didn’t look at this page earlier as Tailscale isn’t the one overwriting `/etc/resolv.conf`: it would have set the nameserver to be `100.100.100.100` in that case. Its behaviour is reasonable as ‘there are [an incredible number of ways](https://tailscale.com/blog/sisyphean-dns-client-linux) to configure DNS on Linux’. + + - This blog post suggests that the upcoming (as of April 2021) Tailscale 1.8 will use/prefer using `systemd-resolved` to configure the system resolver + - It convinced me that `systemd-resolved` would be the right choice even on a router as the nameserver should depend on the interface. Thanks [Xe](https://xeiaso.net/), I always like your posts! + +This should be the end of my issues now then, right? + +What happens when I enable `systemd-resolved` and disable `resolvconf`? The hilarity continues: + +``` +# resolv.conf(5) file generated by tailscale +# For more info, see https://tailscale.com/s/resolvconf-overwrite +# DO NOT EDIT THIS FILE BY HAND -- CHANGES WILL BE OVERWRITTEN +nameserver 100.100.100.100 +search my-network.ts.net lan my-network.ts.net +``` + +I expected Tailscale not to overwrite `resolv.conf` in this scenario, but instead configure `systemd-resolved` (Adding the tailnet to the search domains without checking its presence is yet another issue). I think it’s a race condition that `tailscaled` won that might have been caused by NixOS starting the services at the same time, however `tailscaled.service` has `After=systemd-resolved.service`. Restarting `systemd-resolved` _then_ `tailscaled` explicitly did the right thing: + +``` +# This is /run/systemd/resolve/stub-resolv.conf managed by man:systemd-resolved(8). +# Do not edit. +# [...] +nameserver 127.0.0.53 +options edns0 trust-ad +search lan my-network.ts.net +``` + +DNS can be confusing sometimes! + +[^2]: vim’s syntax highlighting in `/etc/resolv.conf` marks `nameserver localhost` as an error, which is neat, but somewhat inaccurate here, as this does not appear to be invalid. + +[^3]: After reading through the issue, the title does not appear to be accurate given that there are workarounds, however, upon loading the page and seeing that the issue is open since 2020 and has a small scroll bar, indicating many comments, it’s easy to be drawn to the assumption that it continues to be an issue. + +[^4]: Since the router has a dynamic <del>public</del> <ins>CGNAT</ins> IP address, it’s true that the addresses are changing, but that’s not relevant to dnsmasq given that it was not ever configured to listen on this interface. + +[^5]: As a Wikipedia editor would ask, _which_? + +[^6]: I [searched nixpkgs on Github](https://github.com/search?q=repo%3ANixOS%2Fnixpkgs+networking.nameservers&type=code) and found it amusing that all the results where it is set correctly are *in tests*, but the other results show hardcoded definitions. + +[^7]: Whilst checking to see if [yak shaving](https://en.wiktionary.org/wiki/yak_shaving) was the right turn of phrase, Wiktionary suggested [‘when you're up to your neck in alligators, it's hard to remember that your initial objective was to drain the swamp’](https://en.wiktionary.org/wiki/when_you%27re_up_to_your_neck_in_alligators,_it%27s_hard_to_remember_that_your_initial_objective_was_to_drain_the_swamp#English) which would be more fitting, but I first learned of this expression today and don’t think it’s as widely-known. diff --git a/static/public_key.asc b/public_key.asc index f081429..f081429 100644 --- a/static/public_key.asc +++ b/public_key.asc diff --git a/src/app.ts b/src/app.ts deleted file mode 100644 index a51e235..0000000 --- a/src/app.ts +++ /dev/null @@ -1,272 +0,0 @@ -import path from "node:path"; -import fs from "node:fs/promises"; -import type { Stats } from "node:fs"; -import type { BunFile, Serve } from "bun"; -import * as Sentry from "@sentry/node"; -import prom from "bun-prometheus-client"; -import log from "loglevel"; - -import config from "./config"; - -log.setLevel((import.meta.env["LOG_LEVEL"] || "info") as log.LogLevelDesc); - -Sentry.init({ - release: `homestead@${import.meta.env["FLY_MACHINE_VERSION"]}`, - tracesSampleRate: 1.0, -}); - -const expectedHostURL = new URL( - import.meta.env.NODE_ENV === "production" - ? config.base_url - : "http://localhost:3000", -); -const defaultHeaders = { - ...config.extra.headers, - vary: "Accept-Encoding", -}; - -type File = { - filename: string; - handle: BunFile; - relPath: string; - type: string; - size: number; - mtime: Date; - etag: string; -}; - -const metrics = { - requests: new prom.Counter({ - name: "homestead_requests", - help: "Number of requests by path, status code, and method", - labelNames: ["status_code", "content_encoding", "cache_basis"] as const, - }), - requestDuration: new prom.Histogram({ - name: "homestead_request_duration_seconds", - help: "Request duration in seconds", - labelNames: ["path"] as const, - }), -}; - -let files = new Map<string, File>(); - -async function hashFile(file: BunFile): Promise<string> { - return new Bun.CryptoHasher("sha256") - .update(await file.arrayBuffer()) - .digest("base64"); -} - -async function registerFile( - path: string, - pathname: string, - filename: string, - stat: Stats, -): Promise<void> { - pathname = "/" + (pathname === "." || pathname === "./" ? "" : pathname); - - if (files.get(pathname) !== undefined) { - log.warn("File already registered:", pathname); - } - const handle = Bun.file(filename); - - files.set(pathname, { - filename, - relPath: "/" + path, - handle: handle, - type: pathname.startsWith("/feed-styles.xsl") ? "text/xsl" : handle.type, - size: stat.size, - mtime: stat.mtime, - etag: `W/"${await hashFile(handle)}"`, - }); -} - -async function walkDirectory(root: string) { - for (let relPath of await fs.readdir(root, { recursive: true })) { - const absPath = path.join(root, relPath); - const stat = await fs.stat(absPath); - if (stat.isFile()) { - if (relPath.includes("index.html")) { - const dir = relPath.replace("index.html", ""); - await registerFile(relPath, dir, absPath, stat); - } else { - await registerFile(relPath, relPath, absPath, stat); - } - } - } -} - -await walkDirectory("public/"); - -async function serveFile( - file: File, - statusCode: number = 200, - extraHeaders: Record<string, string> = {}, -): Promise<Response> { - return new Response(await file.handle.arrayBuffer(), { - headers: { - "last-modified": file.mtime.toUTCString(), - ...extraHeaders, - ...defaultHeaders, - }, - status: statusCode, - }); -} - -function parseIfModifiedSinceHeader(header: string | null): number { - return header ? new Date(header).getTime() + 999 : 0; -} - -export const metricsServer = { - port: 9091, - fetch: async function (request) { - const pathname = new URL(request.url).pathname; - switch (pathname) { - case "/metrics": - return new Response(await prom.register.metrics()); - default: - return new Response("", { status: 404 }); - } - }, -} satisfies Serve; - -export const server = { - fetch: async function (request) { - const url = new URL(request.url); - const pathname = url.pathname.replace(/\/\/+/g, "/"); - const hostname = request.headers.get("host")?.toLowerCase() || "unknown"; - const endTimer = metrics.requestDuration.startTimer({ path: pathname }); - let status; - let newpath; - try { - if (pathname === "/health") { - return new Response("OK", { status: (status = 200) }); - } else if ( - config.redirect_other_hostnames && - hostname !== expectedHostURL.host - ) { - metrics.requests.inc({ - content_encoding: "identity", - status_code: (status = 301), - }); - return new Response("", { - status, - headers: { - location: new URL(pathname, expectedHostURL).toString(), - }, - }); - } - const { base, ext } = path.parse(pathname); - const file = files.get(pathname); - let contentEncoding = "identity"; - let suffix = ""; - if ( - ![".br", ".zst", ".gz"].includes(ext || base) && - !pathname.startsWith("/404.html") && - file && - (await file.handle.exists()) - ) { - let etagMatch = request.headers.get("if-none-match") === file.etag; - let mtimeMatch = - parseIfModifiedSinceHeader( - request.headers.get("if-modified-since"), - ) >= file?.mtime.getTime(); - if (etagMatch || mtimeMatch) { - metrics.requests.inc({ - content_encoding: contentEncoding, - status_code: (status = 304), - cache_basis: etagMatch ? "etag" : "mtime", - }); - return new Response("", { status: status, headers: defaultHeaders }); - } - const encodings = (request.headers.get("accept-encoding") || "") - .split(",") - .map((x) => x.trim().toLowerCase()); - if (encodings.includes("br") && files.has(pathname + ".br")) { - contentEncoding = "br"; - suffix = ".br"; - } else if (encodings.includes("zstd") && files.has(pathname + ".zst")) { - contentEncoding = "zstd"; - suffix = ".zst"; - } else if (encodings.includes("gzip") && files.has(pathname + ".gz")) { - contentEncoding = "gzip"; - suffix = ".gz"; - } - - status = 200; - metrics.requests.inc({ - status_code: status, - content_encoding: contentEncoding, - }); - const endFile = files.get(pathname + suffix); - if (!endFile) { - throw new Error(`File ${pathname} not found`); - } - return serveFile(endFile, status, { - "content-encoding": contentEncoding, - "content-type": file.type, - // weak etags can be used for multiple equivalent representations - etag: file.etag, - }); - } else { - if (files.has(pathname + "/")) { - newpath = pathname + "/"; - metrics.requests.inc({ - content_encoding: contentEncoding, - status_code: (status = 302), - }); - return new Response("", { - status: status, - headers: { location: newpath }, - }); - } else if ( - pathname.endsWith("index.html") && - files.has(pathname.replace(/index.html$/, "")) - ) { - newpath = pathname.replace(/index.html$/, ""); - metrics.requests.inc({ - content_encoding: contentEncoding, - status_code: (status = 302), - }); - return new Response("", { - status: status, - headers: { location: newpath }, - }); - } - status = 404; - const notfound = files.get("/404.html"); - if (!request.headers.get("accept")?.split(",").includes("text/html")) { - return new Response("404 Not Found", { - status, - headers: defaultHeaders, - }); - } - if (notfound) { - return serveFile(notfound, status, { - "content-type": "text/html; charset=utf-8", - }); - } else { - log.warn("404.html not found"); - return new Response("404 Not Found", { - status: status, - headers: { "content-type": "text/plain", ...defaultHeaders }, - }); - } - } - } catch (error) { - metrics.requests.inc({ - status_code: status, - content_encoding: "identity", - }); - Sentry.captureException(error); - log.error("Error", error); - return new Response("Something went wrong", { status: status }); - } finally { - if (status === 200) { - const seconds = endTimer(); - metrics.requestDuration.observe(seconds); - } - } - }, -} satisfies Serve; - -export default server; diff --git a/src/config.ts b/src/config.ts deleted file mode 100644 index 428d63c..0000000 --- a/src/config.ts +++ /dev/null @@ -1,8 +0,0 @@ -import fs from "node:fs"; -import toml from "toml"; - -const config = toml.parse(fs.readFileSync("config.toml", "utf-8")); -if (import.meta.env.NODE_ENV === "development") { - config.base_url = "http://localhost:3000"; -} -export default config; diff --git a/src/index.ts b/src/index.ts deleted file mode 100644 index 30a6f34..0000000 --- a/src/index.ts +++ /dev/null @@ -1,36 +0,0 @@ -import { performance } from "node:perf_hooks"; - -performance.mark("startup-begin"); - -import log from "loglevel"; - -import { server, metricsServer } from "./app"; - -log.setLevel((import.meta.env["LOG_LEVEL"] || "info") as log.LogLevelDesc); - -const metricsServed = Bun.serve(metricsServer); -log.info(`Metrics server started on port ${metricsServed.port}`); - -const served = Bun.serve(server); -log.info(`Serving website on ${served.url}`); - -process.on("SIGTERM", function () { - log.info("SIGTERM received, shutting down..."); - metricsServed.stop(); - served.stop(); - process.exit(0); -}); - -process.on("SIGINT", function () { - log.info("SIGINT received, shutting down..."); - metricsServed.stop(); - served.stop(); - process.exit(0); -}); - -performance.mark("startup-end"); - -performance.measure("startup", "startup-begin", "startup-end"); -for (const entry of performance.getEntriesByName("startup")) { - log.info(`Startup took ${entry.duration} ms`); -} diff --git a/src/posts.ts b/src/posts.ts deleted file mode 100644 index 2b678b9..0000000 --- a/src/posts.ts +++ /dev/null @@ -1,61 +0,0 @@ -import path from "node:path"; -import fs from "node:fs/promises"; - -import { matter } from "toml-matter"; - -type MatterFile = ReturnType<typeof matter>; - -export type Post = { - input: string; - output: string; - basename: string; - url: string; - title: string; - date: Date; - description: string | undefined; - taxonomies: Record<string, string[]>; -}; - -export async function getPost(filename: string): Promise<MatterFile> { - return matter(await fs.readFile(filename, "utf8")); -} - -export async function readPosts( - root: string, - inputDir: string, - outputDir: string, -): Promise<{ posts: Array<Post>; tags: Set<string> }> { - let tags = new Set<string>(); - let posts = new Array<Post>(); - const subdir = path.join(root, inputDir); - for (let pathname of await fs.readdir(subdir)) { - const pathFromRoot = path.join(subdir, pathname); - const stat = await fs.stat(pathFromRoot); - if (stat.isFile() && path.extname(pathname) === ".md") { - if (pathname !== "_index.md") { - const input = pathFromRoot; - const output = pathFromRoot - .replace(root, outputDir) - .replace(".md", "/index.html"); - const url = pathFromRoot.replace(root, "").replace(".md", "/"); - - const file = await getPost(input); - - (file.data["taxonomies"] as any)?.tags?.map((t: string) => - tags.add(t.toLowerCase()), - ); - posts.push({ - input, - output, - basename: path.basename(pathname, ".md"), - url, - ...file.data, - } as Post); - } - } - } - return { - posts: posts.sort((a, b) => b.date.getTime() - a.date.getTime()), - tags, - }; -} diff --git a/src/templates.ts b/src/templates.ts deleted file mode 100644 index 8099065..0000000 --- a/src/templates.ts +++ /dev/null @@ -1,290 +0,0 @@ -import * as fs from "node:fs/promises"; -import * as cheerio from "cheerio"; -import { matter } from "toml-matter"; -import { Marked } from "marked"; -import { PurgeCSS } from "purgecss"; -import log from "loglevel"; - -import config from "./config"; -import { getPost, readPosts, type Post } from "./posts"; - -const css = await Bun.file("templates/style.css").text(); - -const marked = new Marked(); -marked.use({ - gfm: true, -}); - -const purgeCSS = new PurgeCSS(); - -function addMenu( - parent: cheerio.Cheerio<cheerio.AnyNode>, - child: cheerio.Cheerio<cheerio.AnyNode>, -) { - parent.empty(); - for (const link of config.menus.main) { - parent.append(child.clone().attr("href", link.url).text(link.name)); - } -} - -export async function layout( - html: string, - pageTitle: string, -): Promise<cheerio.CheerioAPI> { - const ccss = ( - await purgeCSS.purge({ - content: [ - { - raw: html, - extension: ".html", - }, - ], - css: [{ raw: css }], - }) - )[0].css; - const $ = cheerio.load(html); - $("html").attr("lang", config.default_language); - $("head > link[rel=alternate]").attr("title", config.title); - addMenu($("nav"), $("nav a")); - $(".title").text(config.title); - $("title").text(pageTitle); - $(".p-name").text(pageTitle); - $("head").children("style").text(ccss); - return $; -} - -async function render404Page(): Promise<string> { - const $ = await layout( - await fs.readFile("templates/404.html", "utf-8"), - "404 Not Found", - ); - return $.html(); -} - -async function renderHomepage(posts: Array<Post>): Promise<string> { - const file = matter(await fs.readFile("content/_index.md", "utf-8")); - const $ = await layout( - await fs.readFile("templates/homepage.html", "utf-8"), - config.title, - ); - - $("body").addClass("h-card"); - $(".title").addClass("p-name").addClass("u-url"); - $("#content").html(await marked.parse(file.content)); - const $feed = $(".h-feed"); - const $entry = $(".h-entry").remove(); - - for (const post of posts) { - const $post = $entry.clone(); - $post.find(".p-name").text(post.title); - $post.find(".u-url").attr("href", post.url); - $post - .find(".dt-published") - .attr("datetime", post.date.toISOString().replace(/\.\d{3}/, "")) - .text(post.date.toISOString().slice(0, 10)); - $post.appendTo($feed); - } - - $(".u-email").attr("href", `mailto:${config.email}`).text(config.email); - const $elsewhere = $(".elsewhere"); - const $linkRelMe = $elsewhere.find(".u-url[rel=me]").parentsUntil("ul"); - $linkRelMe.remove(); - for (const link of config.menus.me) { - const $link = $linkRelMe.clone(); - $link.find("a").attr("href", link.url).text(link.name); - $link.appendTo($elsewhere); - } - return $.html(); -} - -async function renderPost(file: Post, content: string) { - const $ = await layout( - await fs.readFile("templates/post.html", "utf-8"), - file.title, - ); - - $(".title").addClass("h-card p-author").attr("rel", "author"); - $(".h-entry .dt-published") - .attr("datetime", file.date.toISOString().replace(/\.\d{3}/, "")) - .text(file.date.toISOString().slice(0, 10)); - $(".h-entry .e-content").html(content); - const categories = $(".h-entry .p-categories"); - const cat = categories.find(".p-category").parentsUntil(categories); - cat.remove(); - for (const tag of file.taxonomies["tags"].sort()) { - categories.append( - cat - .clone() - .find(".p-category") - .attr("href", `/tags/${tag}/`) - .text(`#${tag}`) - .parent(), - ); - } - - return $.html(); -} - -async function renderListPage(tag: string, posts: Post[]) { - const $ = await layout( - await fs.readFile("templates/list.html", "utf-8"), - tag || config.title, - ); - const $feed = $(".h-feed"); - const $tpl = $(".h-entry").remove(); - $(".title").addClass("p-author h-card").attr("rel", "author"); - if (tag === "") { - $(".filter").remove(); - } else { - $(".filter").find("h3").text(`#${tag}`); - } - - for (const post of posts) { - const $post = $tpl.clone(); - $post.find(".p-name").text(post.title); - $post.find(".u-url").attr("href", post.url); - $post - .find(".dt-published") - .attr("datetime", post.date.toISOString().replace(/\.\d{3}/, "")) - .text(post.date.toISOString().slice(0, 10)); - $post.appendTo($feed); - } - return $.html(); -} - -async function renderTags(tags: string[]) { - const $ = await layout( - await fs.readFile("templates/tags.html", "utf-8"), - config.title, - ); - const $tags = $(".tags"); - const $tpl = $(".h-feed"); - $tpl.remove(); - for (const tag of tags) { - const $tag = $tpl.clone(); - $tag.find("a").attr("href", `/tags/${tag}/`).text(`#${tag}`); - $tag.appendTo($tags); - } - return $.html(); -} - -const makeTagURI = (specific: string) => - `tag:${config.original_domain},${config.domain_start_date}:${specific}`; - -async function renderFeed(title: string, posts: Post[], tag?: string) { - const $ = cheerio.load(await fs.readFile("templates/feed.xml", "utf-8"), { - xml: true, - }); - const $feed = $("feed"); - $feed.children("title").text(title); - $feed.children("link").attr("href", config.base_url); - $feed.children("id").text(makeTagURI(tag || "feed")); - $feed - .children("updated") - .text(posts[0].date.toISOString().replace(/\.\d{3}/, "")); - - const $tpl = $("feed > entry").remove(); - for (const post of posts) { - const $post = $tpl.clone(); - $post.children("title").text(post.title); - $post - .children("link") - .attr("href", new URL(post.url, config.base_url).href); - $post.children("id").text(makeTagURI(post.basename)); - $post - .children("updated") - .text(post.date.toISOString().replace(/\.\d{3}/, "")); - $post.find("author > name").text(config.title); - $post.children("summary").text(post.description || ""); - const content = marked.parse((await getPost(post.input)).content); - $post.children("content").html(await content); - $post.appendTo($feed); - } - - return $.xml(); -} - -async function renderFeedStyles() { - const $ = cheerio.load( - await fs.readFile("templates/feed-styles.xsl", "utf-8"), - { - xml: true, - }, - ); - $("style").text(css); - return $.xml(); -} - -export default async function generateSite() { - const tasks = []; - const { posts, tags } = await readPosts("content", "post", "public"); - await fs.mkdir("public/post", { recursive: true }); - for (const post of posts) { - const content = await marked.parse((await getPost(post.input)).content); - await fs.mkdir(`public/post/${post.basename}`, { recursive: true }); - tasks.push(async () => { - log.debug(`Rendering post ${post.basename} to ${post.output}`); - return fs.writeFile(post.output, await renderPost(post, content)); - }); - } - await fs.mkdir("public/tags", { recursive: true }); - tasks.push(async () => { - log.debug("Rendering tags page to public/tags/index.html"); - return fs.writeFile( - "public/tags/index.html", - await renderTags([...tags].sort()), - ); - }); - for (const tag of tags) { - log.debug(`Processing tag ${tag}`); - const matchingPosts = posts.filter((p) => - p.taxonomies["tags"].includes(tag), - ); - await fs.mkdir(`public/tags/${tag}`, { recursive: true }); - tasks.push(async () => { - log.debug(`Rendering tag ${tag} to public/tags/${tag}/index.html`); - return fs.writeFile( - `public/tags/${tag}/index.html`, - await renderListPage(tag, matchingPosts), - ); - }); - - tasks.push(async () => { - log.debug(`Rendering tag ${tag} feed to public/tags/${tag}/atom.xml`); - return fs.writeFile( - `public/tags/${tag}/atom.xml`, - await renderFeed(`${config.title} - ${tag}`, matchingPosts, tag), - ); - }); - } - tasks.push(async () => { - log.debug("Rendering posts page to public/post/index.html"); - return fs.writeFile( - "public/post/index.html", - await renderListPage("", posts), - ); - }); - tasks.push(async () => { - log.debug("Rendering site feed to public/atom.xml"); - return fs.writeFile( - "public/atom.xml", - await renderFeed(config.title, posts), - ); - }); - tasks.push(async () => { - log.debug("Rendering feed styles to public/feed-styles.xsl"); - return fs.writeFile("public/feed-styles.xsl", await renderFeedStyles()); - }); - tasks.push(async () => { - log.debug("Rendering homepage to public/index.html"); - return fs.writeFile( - "public/index.html", - await renderHomepage(posts.slice(0, 3)), - ); - }); - tasks.push(async () => { - log.debug("Rendering 404 page to public/404.html"); - return fs.writeFile("public/404.html", await render404Page()); - }); - return Promise.all(tasks.map((f) => f())); -} diff --git a/static/robots.txt b/static/robots.txt deleted file mode 100644 index a0e9740..0000000 --- a/static/robots.txt +++ /dev/null @@ -1,4 +0,0 @@ -User-agent: * -Disallow: -Host: alanpearce.eu - diff --git a/taplo.toml b/taplo.toml new file mode 100644 index 0000000..7da1868 --- /dev/null +++ b/taplo.toml @@ -0,0 +1,7 @@ +#:schema taplo://taplo.toml + +[formatting] + indent_tables = true + indent_entries = true + array_auto_collapse = false + compact_arrays = false diff --git a/templates/404.html b/templates/404.html deleted file mode 100644 index 4e64fcc..0000000 --- a/templates/404.html +++ /dev/null @@ -1,37 +0,0 @@ -<!doctype html> -<html> - <head> - <meta charset="utf-8" /> - <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <title>Site Title</title> - <meta name="referrer" content="no-referrer-when-downgrade" /> - <link - rel="alternate" - type="application/atom+xml" - title="" - href="/atom.xml" - /> - <style></style> - </head> - <body> - <a class="skip" href="#main">Skip to main content</a> - <header> - <h2> - <a href="/" class="title">Site title</a> - </h2> - <nav> - <a href="/">Home</a> - </nav> - </header> - <main id="main"> - <h1>404</h1> - <h2>ʕノ•ᴥ•ʔノ ︵ ┻━┻</h2> - </main> - <footer> - Licensed under a - <a rel="license" href="http://creativecommons.org/licenses/by/4.0/" - >Creative Commons Attribution 4.0 International License</a - >. - </footer> - </body> -</html> diff --git a/templates/atom.xml b/templates/atom.xml deleted file mode 100644 index 81c9a76..0000000 --- a/templates/atom.xml +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="/feed-styles.xsl" type="text/xsl"?> -<feed xmlns="http://www.w3.org/2005/Atom" xml:lang="{{ lang }}"> - <title>{{ config.title }} - {%- if term %} - {{ term.name }} - {%- elif section.title %} - {{ section.title }} - {%- endif -%} - </title> - {%- if config.description %} - <subtitle>{{ config.description }}</subtitle> - {%- endif %} - <link href="{{ feed_url | safe }}" rel="self" type="application/atom+xml"/> - <link href=" - {%- if section -%} - {{ section.permalink | escape_xml | safe }} - {%- else -%} - {{ config.base_url | escape_xml | safe }} - {%- endif -%} - "/> - <generator uri="https://www.getzola.org/">Zola</generator> - <updated>{{ last_updated | date(format="%+") }}</updated> - <id>{{ feed_url | safe }}</id> - {%- for page in pages %} - <entry xml:lang="{{ page.lang }}"> - <title>{{ page.title }}</title> - <published>{{ page.date | date(format="%+") }}</published> - <updated>{{ page.updated | default(value=page.date) | date(format="%+") }}</updated> - <author> - <name> - {%- if page.authors -%} - {{ page.authors[0] }} - {%- elif config.author -%} - {{ config.author }} - {%- else -%} - Unknown - {%- endif -%} - </name> - </author> - <link rel="alternate" href="{{ page.permalink | safe }}" type="text/html"/> - <id>{{ page.permalink | safe }}</id> - {% if page.summary %} - <summary type="html">{{ page.summary }}</summary> - {% else %} - <content type="html">{{ page.content }}</content> - {% endif %} - </entry> - {%- endfor %} -</feed> diff --git a/templates/feed-styles.xsl b/templates/feed-styles.xsl deleted file mode 100644 index 5953f89..0000000 --- a/templates/feed-styles.xsl +++ /dev/null @@ -1,82 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<xsl:stylesheet - version="3.0" - xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:atom="http://www.w3.org/2005/Atom" -> - <xsl:output method="html" version="1.0" encoding="UTF-8" indent="yes" /> - <xsl:template match="/"> - <html xmlns="http://www.w3.org/1999/xhtml" lang="en"> - <head> - <title>RSS Feed | <xsl:value-of select="/atom:feed/atom:title"/></title> - <meta charset="utf-8" /> - <meta http-equiv="content-type" content="text/html; charset=utf-8" /> - <meta name="viewport" content="width=device-width, initial-scale=1" /> - <style></style> - </head> - <body> - <main> - <div class="helptext"> - <strong>This is an RSS feed</strong>. Subscribe by copying the URL - from the address bar into your newsreader. Visit - <a href="https://aboutfeeds.com">About Feeds</a> - to learn more and get started. It's free. - </div> - <div> - <h1> - <!-- https://commons.wikimedia.org/wiki/File:Feed-icon.svg --> - <svg - xmlns="http://www.w3.org/2000/svg" - version="1.1" - style="width: 1.5ex; height: 1.5ex" - viewBox="0 0 256 256" - > - <rect width="256" height="256" x="0" y="0" fill="#7F7F7F" /> - <rect width="246" height="246" x="5" y="5" fill="#A0A0A0" /> - <rect width="236" height="236" x="10" y="10" fill="#A6A6A6" /> - <circle cx="68" cy="189" r="24" fill="#FFF" /> - <path - d="M160 213h-34a82 82 0 0 0 -82 -82v-34a116 116 0 0 1 116 116z" - fill="#FFF" - /> - <path - d="M184 213A140 140 0 0 0 44 73 V 38a175 175 0 0 1 175 175z" - fill="#FFF" - /> - </svg> - RSS Feed Preview | - <span> - <xsl:value-of select="/atom:feed/atom:title" /> - </span> - </h1> - <nav> - <a> - <xsl:attribute name="href"> - <xsl:value-of select="/atom:feed/atom:link[1]/@href" /> - </xsl:attribute> - Visit Website - </a> - </nav> - <ul class="h-feed"> - <xsl:for-each select="/atom:feed/atom:entry"> - <li class="h-entry"> - <span> - <time class="dt-published"> - <xsl:value-of select="substring(atom:updated, 0, 11)" /> - </time> - </span> - <a class="p-name u-url"> - <xsl:attribute name="href"> - <xsl:value-of select="atom:link/@href" /> - </xsl:attribute> - <xsl:value-of select="atom:title" /> - </a> - </li> - </xsl:for-each> - </ul> - </div> - </main> - </body> - </html> - </xsl:template> -</xsl:stylesheet> diff --git a/templates/feed.xml b/templates/feed.xml deleted file mode 100644 index ddc90dd..0000000 --- a/templates/feed.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<?xml-stylesheet href="/feed-styles.xsl" type="text/xsl"?> -<feed xmlns="http://www.w3.org/2005/Atom"> - <title>Example Feed</title> - <link href="http://example.org/"></link> - <id>urn:uuid:60a76c80-d399-11d9-b91C-0003939e0af6</id> - <updated>2003-12-13T18:30:02Z</updated> - <entry> - <title>Atom-Powered Robots Run Amok</title> - <link rel="alternate" type="text/html" href="http://example.org/2003/12/13/atom03.html"></link> - <id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</id> - <updated>2003-12-13T18:30:02Z</updated> - <summary>Some text.</summary> - <content type="html"> - <div> - <p>This is the entry content.</p> - </div> - </content> - <author> - <name>John Doe</name> - </author> - </entry> - -</feed> diff --git a/templates/homepage.html b/templates/homepage.html deleted file mode 100644 index 5004340..0000000 --- a/templates/homepage.html +++ /dev/null @@ -1,65 +0,0 @@ -<!doctype html> -<html> - <head> - <meta charset="utf-8" /> - <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <title>Site Title</title> - <meta name="referrer" content="no-referrer-when-downgrade" /> - <link - rel="alternate" - type="application/atom+xml" - title="" - href="/atom.xml" - /> - <style></style> - </head> - <body> - <a class="skip" href="#main">Skip to main content</a> - <header> - <h2> - <a href="/" class="title">Site title</a> - </h2> - <nav> - <a href="/">Home</a> - </nav> - </header> - <main id="main"> - <div id="content"></div> - <section> - <h2>Latest Posts</h2> - <ul class="h-feed"> - <li class="h-entry"> - <span> - <time - class="dt-published" - datetime="2000-12-31T12:33:02+02:00" - pubdate - > - 2000-12-31 - </time> - </span> - <a class="p-name u-url" href="/post/lorem-ipsum/">Lorem Ipsum</a> - </li> - </ul> - </section> - <section> - <h2>Elsewhere on the Internet</h2> - <ul class="elsewhere"> - <li> - <a class="u-email" rel="me" href="mailto:user@example.com" - >user@example.com</a></li> - <li> - <a class="u-url" rel="me" href="http://example.com">Example</a> - </li> - </li> - </ul> - </section> - </main> - <footer> - Licensed under a - <a rel="license" href="http://creativecommons.org/licenses/by/4.0/" - >Creative Commons Attribution 4.0 International License</a - >. - </footer> - </body> -</html> diff --git a/templates/list.html b/templates/list.html deleted file mode 100644 index 77415ba..0000000 --- a/templates/list.html +++ /dev/null @@ -1,55 +0,0 @@ -<!doctype html> -<html lang="en-GB"> - <head> - <meta charset="utf-8" /> - <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <title>Site Title</title> - <meta name="referrer" content="no-referrer-when-downgrade" /> - <link - rel="alternate" - type="application/atom+xml" - title="Site Title" - href="/atom.xml" - /> - <style></style> - </head> - <body> - <a class="skip" href="#content">Skip to main content</a> - <header> - <h2> - <a href="/" class="title">Site Title</a> - </h2> - <nav> - <a href="/">Home</a> - </nav> - </header> - <main id="content"> - <div class="filter"> - <h3 class="filter">Tag</h3> - <small> - <a href="../">Remove filter</a> - </small> - </div> - <ul class="h-feed"> - <li class="h-entry"> - <span> - <time - class="dt-published" - datetime="2000-12-31T12:33:02+02:00" - pubdate - > - 2000-12-31 - </time> - </span> - <a class="p-name u-url" href="/post/lorem-ipsum/">Lorem Ipsum</a> - </li> - </ul> - </main> - <footer> - Licensed under a - <a rel="license" href="http://creativecommons.org/licenses/by/4.0/" - >Creative Commons Attribution 4.0 International License</a - >. - </footer> - </body> -</html> diff --git a/templates/post.html b/templates/post.html deleted file mode 100644 index 1262ee0..0000000 --- a/templates/post.html +++ /dev/null @@ -1,75 +0,0 @@ -<!doctype html> -<html lang="en-GB"> - <head> - <meta charset="utf-8" /> - <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <title></title> - <meta name="referrer" content="no-referrer-when-downgrade" /> - <link - rel="alternate" - type="application/atom+xml" - title="" - href="/atom.xml" - /> - <style></style> - </head> - <body> - <a class="skip" href="#main">Skip to main content</a> - <header> - <h2> - <a href="/" class="title"></a> - </h2> - <nav> - <a href="/">Home</a> - </nav> - </header> - <main id="main"> - <article class="h-entry"> - <h1 class="p-name">Post Title</h1> - <p> - <time class="dt-published" pubdate>2000-12-31</time> - </p> - <div class="e-content"> - Enim lobortis scelerisque fermentum dui faucibus in ornare quam - viverra. Eget egestas purus viverra accumsan in nisl nisi, scelerisque - eu ultrices vitae, auctor eu augue ut lectus arcu, bibendum at. - - <code>/bin/test</code> - - <pre> - <code class="language-conf"> -foo=bar - </code> - </pre> - - <table> - <thead> - <tr> - <th>One</th> - <th>Two</th> - <th>Three</th> - </tr> - </thead> - <tbody> - <tr> - <td>1</td> - <td>2</td> - <td>3</td> - </tr> - </tbody> - </table> - </div> - <ul class="p-categories tags"> - Tags: - <li><a class="p-category" href="/tags/sample/">#sample</a></li> - </ul> - </article> - </main> - <footer> - Licensed under a - <a rel="license" href="http://creativecommons.org/licenses/by/4.0/" - >Creative Commons Attribution 4.0 International License</a - >. - </footer> - </body> -</html> diff --git a/templates/style.css b/templates/style.css deleted file mode 100644 index 5c55ef4..0000000 --- a/templates/style.css +++ /dev/null @@ -1,191 +0,0 @@ -body { - font-family: Verdana, sans-serif; - margin: auto; - padding: 1em; - max-width: 50rem; - text-align: left; - background-color: #fff; - word-wrap: break-word; - overflow-wrap: break-word; - line-height: 1.5; - color: #444; -} - -.skip { - position: absolute; - top: -3em; - background: #fff; -} -.skip:focus { - top: 0; -} - -h1, -h2, -h3, -h4, -h5, -h6, -strong, -b { - color: #222; -} - -a { - color: #3273dc; -} - -.title { - color: #222; - text-decoration: none; - border: 0; -} - -.filter { - margin-bottom: 0; -} - -time { - font-style: italic; -} - -nav a { - margin-right: 1ex; -} - -.tags { - padding: unset; - font-size: small; -} - -.tags > li { - list-style: none; - display: inline-block; - padding-right: 1ex; -} - -textarea { - width: 100%; - font-size: 1rem; -} - -input { - font-size: 1rem; -} - -main, -article { - line-height: 1.6; -} - -table { - width: 100%; -} - -img { - max-width: 100%; -} - -code { - padding: 2px 5px; - background-color: #f2f2f2; -} - -pre code { - color: #222; - display: block; - padding: 20px; - white-space: pre-wrap; - font-size: 0.875rem; - overflow-x: auto; -} - -div.highlight pre { - background-color: initial; - color: initial; -} - -div.highlight code { - background-color: unset; - color: unset; -} - -blockquote { - border-left: 1px solid #999; - color: #222; - padding-left: 20px; - font-style: italic; -} - -footer { - padding: 25px; - text-align: center; -} - -.helptext { - color: #777; - font-size: small; -} - -/* blog posts */ -ul.h-feed { - list-style-type: none; - padding: unset; -} - -ul.h-feed li { - display: flex; -} - -ul.h-feed li span { - flex: 0 0 130px; -} - -ul.h-feed li a:visited { - color: #8b6fcb; -} - -@media (prefers-color-scheme: dark) { - body { - background-color: #333; - color: #ddd; - } - - h1, - h2, - h3, - h4, - h5, - h6, - strong, - b, - .title { - color: #eee; - } - - a { - color: #8cc2dd; - } - - code { - background-color: #777; - } - - pre code { - color: #ddd; - } - - blockquote { - color: #ccc; - } - - textarea, - input { - background-color: #252525; - color: #ddd; - } - - .helptext { - color: #aaa; - } -} diff --git a/templates/tags.html b/templates/tags.html deleted file mode 100644 index 406f8d7..0000000 --- a/templates/tags.html +++ /dev/null @@ -1,41 +0,0 @@ -<!doctype html> -<html lang="en-GB"> - <head> - <meta charset="utf-8" /> - <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <title>Site Title</title> - <meta name="referrer" content="no-referrer-when-downgrade" /> - <link - rel="alternate" - type="application/atom+xml" - title="Site title" - href="/atom.xml" - /> - <style></style> - </head> - <body> - <a class="skip" href="#content">Skip to main content</a> - <header> - <h2> - <a href="/" class="title">Site title</a> - </h2> - <nav> - <a href="/">Home</a> - </nav> - </header> - <main id="content"> - <h3 class="filter">Tags</h3> - <ul class="tags"> - <li class="h-feed"> - <a href="/tags/tag">#tag</a> - </li> - </ul> - </main> - <footer> - Licensed under a - <a rel="license" href="http://creativecommons.org/licenses/by/4.0/" - >Creative Commons Attribution 4.0 International License</a - >. - </footer> - </body> -</html> diff --git a/test/index.test.ts b/test/index.test.ts deleted file mode 100644 index 6e29e3d..0000000 --- a/test/index.test.ts +++ /dev/null @@ -1,97 +0,0 @@ -import { type Server } from "bun"; -import { expect, test, beforeAll, afterAll } from "bun:test"; - -import { server as app } from "../src/app"; - -const port = 33000; -const base = `http://localhost:${port}/`; -let server: Server; - -beforeAll(async function () { - server = Bun.serve(Object.assign({}, app, { port })); -}); - -afterAll(function () { - server.stop(); -}); - -test("/ returns 200", async function () { - const res = await fetch(base); - expect(res.status).toBe(200); -}); - -test("/asdf returns 404", async function () { - const res = await fetch(`${base}asdf`); - expect(res.status).toBe(404); -}); - -test("/ returns 304 with newer if-modified-since header", async function () { - const res = await fetch(base, { - headers: { - "if-modified-since": new Date().toUTCString(), - }, - }); - expect(res.status).toBe(304); - expect(res.headers.get("vary")).toBe("Accept-Encoding"); -}); - -test("/ returns 200 with older if-modified-since header", async function () { - const res = await fetch(base, { - headers: { - "if-modified-since": new Date(0).toUTCString(), - }, - }); - expect(res.status).toBe(200); -}); - -test("/ returns gzipped content with accept-encoding: gzip", async function () { - const res = await fetch(base, { - headers: { - "accept-encoding": "gzip", - }, - }); - expect(res.status).toBe(200); - // Bun 0.8.1 this doesn't work, but `verbose` shows it's there - // expect(res.headers.get("content-encoding")).toBe("gzip"); - // response is automatically gunzipped - const body = await res.text(); - expect(body.length).toBeGreaterThan( - Number(res.headers.get("content-length")), - ); -}); - -test("/ returns uncompressed content with accept-encoding: identity", async function () { - const res = await fetch(base, { - headers: { - "accept-encoding": "identity", - }, - }); - expect(res.status).toBe(200); - const body = await res.text(); - expect(body.length).toBe(Number(res.headers.get("content-length"))); -}); - -test("/ returns brotli-compressed content with accept-encoding: br", async function () { - const res = await fetch(base, { - headers: { - "accept-encoding": "br", - }, - }); - expect(res.status).toBe(200); - expect(res.headers.get("content-encoding")).toBe("br"); - const body = await res.text(); - expect(body.length).toBeLessThan(Number(res.headers.get("content-length"))); -}); - -test("/ returns zstd-compressed content with accept-encoding: zstd", async function () { - const res = await fetch(base, { - headers: { - "accept-encoding": "zstd", - }, - }); - expect(res.status).toBe(200); - expect(res.headers.get("content-encoding")).toBe("zstd"); - expect(res.headers.get("vary")).toBe("Accept-Encoding"); - const body = await res.text(); - expect(body.length).toBeLessThan(Number(res.headers.get("content-length"))); -}); diff --git a/tsconfig.json b/tsconfig.json deleted file mode 100644 index fdcb3f0..0000000 --- a/tsconfig.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "compilerOptions": { - "tsBuildInfoFile": ".cache/tsconfig.tsbuildinfo", - - // Enable latest features - "lib": ["ESNext"], - "target": "ESNext", - "module": "ESNext", - "moduleDetection": "force", - - // Bundler mode - "moduleResolution": "bundler", - "allowImportingTsExtensions": true, - "verbatimModuleSyntax": true, - "noEmit": true, - - // Best practices - "strict": true, - "skipLibCheck": true, - "noFallthroughCasesInSwitch": true, - - // Some stricter flags - "noUnusedLocals": true, - "noUnusedParameters": true, - "noPropertyAccessFromIndexSignature": true, - "paths": { - "toml-matter": ["./node_modules/toml-matter"] - }, - "types": [] - } -} |