From nobody Sat Jun 20 03:28:54 2026 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gj0LN0fT3z6hb9x for ; Sat, 20 Jun 2026 03:29:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gj0LM70vWz3nPr for ; Sat, 20 Jun 2026 03:28:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781926140; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IQnACT+7q3KczBIrJNzW2LlLQT2S3BnvMLjPBYuTRQY=; b=lsdYAlrxyfhnbPsgeG9IgJb12fgAsaG/5t1m51zdqOoTCHW5MbI2u6WerUa9DlWQZdSkGB 1opX9P0qW7+rI8gme5Ye1q++66U3yMLrMi5tHo5fTRBdIwzZyi4i+A5/0hKCMLVH3N3vle wuiCHhvFCO32Jc5sH4jbZyXUS4z+IifreRkNH9sQkvQ36Bs2iEnkPptmYYyvHwGmMwyhmF p4Q+Z+p3wMeqAbDC3QdBOO5baWIGVJrkVvDY64aEQcaGFiSvrs0l9QAfC6XliJaxJ+ZCLQ mpBQrrePZqEeowF50dmieGbdj9Vq/qs4oLBGdsLxWdIValUNU2JU89XQenZ1YA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781926140; a=rsa-sha256; cv=none; b=IHJ3Z2HBMhfWFlDk6Ik+saSWVG6Lb66TdjQFxTDUfIQJvBPPn+gT99SIS6vqlLxgDnpQ4F P/GAs7tfQhwktAS6lW3Nql7/WjN7GGS9vE8AIgBfQp2GwE2sCHefxAydgSPmjkF6fqY8mB oqw/1jFOxH4HA4CvW0vpycaxIKzbivYin/D1u0LfhauEHzkPFqpsLNy5trO9TvC56db5il mgrkyKKhG2IMfiDV0v32ba7g2BZzvLVMqjzXVDV7MLEAY371HoWDZrZhk89m8HXoEn7HSD Gp2k6a3raoHvE4eHlN2ap1DXYW2LaPCIXSOWpWLxyxHgFaMrhbaSxLF0rwVRpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781926140; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IQnACT+7q3KczBIrJNzW2LlLQT2S3BnvMLjPBYuTRQY=; b=cRazGWzEzDlI0wDDar2ZZS0Q45rzm2rM8cYE+kTPNxQXdQ6TnhZXStOOJYOec5d7UKhDNI FDtXqayX3Dwnc5L5ISL+iGaoFzB4rGD4ZLBDG/QLHMGpmT4BsiJa/NbBzwl70DteHaI0mv 1Yp6js1TiV9fS66MTCA9QUCBL0YFzC4jGB9RM4mN3js2cIjOVgNE52eyVTrQWlkocCZ8WE EgTbJisLzBLrVPnznHGMYAA/EViTEdmjZSl6JkDLf9fA28O+8UA9T+8Qm3rdWtJUGgT51J oiZ6dqilnjwqlJFX4MCXGMKHYnLCMuIARs+o9f9bTiR1OdBD+lg2TcPkCAS5hw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gj0LM5r39z1CwT for ; Sat, 20 Jun 2026 03:28:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f821 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 20 Jun 2026 03:28:54 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Dave Cottlehuber Subject: git: 28b246c825 - main - Teach hugo to listen over TLS without a port appended List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dch X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 28b246c8258ce8497f0aa1b1f5d4e093aeb4ce04 Auto-Submitted: auto-generated Date: Sat, 20 Jun 2026 03:28:54 +0000 Message-Id: <6a3608f6.3f821.549301d5@gitrepo.freebsd.org> The branch main has been updated by dch: URL: https://cgit.FreeBSD.org/doc/commit/?id=28b246c8258ce8497f0aa1b1f5d4e093aeb4ce04 commit 28b246c8258ce8497f0aa1b1f5d4e093aeb4ce04 Author: Dave Cottlehuber AuthorDate: 2026-06-20 03:23:45 +0000 Commit: Dave Cottlehuber CommitDate: 2026-06-20 03:27:48 +0000 Teach hugo to listen over TLS without a port appended Add targets to documentation & website, to serve the website over TLS, with nice clean URLs. You will need to provide the TLS terminating proxy yourself. Differential Revision: https://reviews.freebsd.org/D53930 Approved by: ziaee Reviewed by: kevans Event: BSDCan 2026 Sponsored by: SkunkWerks, GmbH --- documentation/Makefile | 8 ++++++++ website/Makefile | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/documentation/Makefile b/documentation/Makefile index df6587f487..b4b7bfa6e3 100644 --- a/documentation/Makefile +++ b/documentation/Makefile @@ -9,6 +9,9 @@ # PDFs or EPUBs. # clean - Remove generated files. # run - Serve the built documentation site locally. +# run-tls - Serve the built documentation site over TLS. +# Note this requires a TLS terminating proxy. +# # pdf - Build PDF versions of the articles and books. # html - Build HTML versions of the articles and books. # If the DOC_HTML_ARCHIVE variable is set, all @@ -111,6 +114,7 @@ SKIP_LANGS+= ${a} all: requirements starting-message generate-pgpkeys-txt build run: requirements starting-message generate-pgpkeys-txt run-local +run-tls: requirements starting-message generate-pgpkeys-txt run-tls-local # clean does not call pdf-clean as that is a subset of hugo-clean clean: hugo-clean pgp-clean @@ -148,6 +152,10 @@ run-local: .PHONY HUGO_DISABLELANGUAGES="${SKIP_LANGS}" ${HUGO_CMD} server \ ${HUGO_ARGS} -D $(BIND:D--bind=$(BIND)) --baseURL="http://$(.HOST):1313" +run-tls-local: .PHONY + HUGO_DISABLELANGUAGES="${SKIP_LANGS}" ${HUGO_CMD} server \ + ${HUGO_ARGS} -D $(BIND:D--bind=$(BIND)) --baseURL="https://$(.HOST)" + build: .PHONY HUGO_DISABLELANGUAGES="${SKIP_LANGS}" ${HUGO_CMD} ${HUGO_ARGS} diff --git a/website/Makefile b/website/Makefile index 25b69804e1..3f096c47c0 100644 --- a/website/Makefile +++ b/website/Makefile @@ -7,6 +7,8 @@ # # all (default) - Generate releases.toml and compile the website. # run - Serve the built website for local browsing. +# run-tls - Serve the built documentation site over TLS. +# Note this requires a TLS terminating proxy. # # The run target uses hugo's built-in webserver to make the built # website available for local browsing. The website should have been @@ -65,6 +67,7 @@ SKIP_LANGS+= ${a} all: starting-message generate-releases cgi-pre-permissions build post-build end-message run: starting-message generate-releases cgi-pre-permissions run-local +run-tls: starting-message generate-releases cgi-pre-permissions run-tls-local clean: hugo-clean releases-clean starting-message: .PHONY @@ -87,6 +90,9 @@ data/releases.toml: run-local: .PHONY HUGO_DISABLELANGUAGES="${SKIP_LANGS}" ${HUGO_CMD} server \ ${HUGO_ARGS} -D $(BIND:D--bind=$(BIND)) --baseURL="http://$(.HOST):1313" +run-tls-local: .PHONY + HUGO_DISABLELANGUAGES="${SKIP_LANGS}" ${HUGO_CMD} server \ + ${HUGO_ARGS} -D $(BIND:D--bind=$(BIND)) --baseURL="https://$(.HOST)" build: .PHONY HUGO_DISABLELANGUAGES="${SKIP_LANGS}" ${HUGO_CMD} ${HUGO_ARGS}