From 51ce3374b9fc3c92eb22b3135b57c2d91660613f Mon Sep 17 00:00:00 2001 From: Joe Carstairs Date: Tue, 30 Jun 2026 09:36:12 +0100 Subject: [PATCH] adds ln module --- Makefile | 2 +- config.mk | 1 + ln/install.mk | 13 +++++++++++++ ln/public/milehouse.html | 1 + nginx/http.d/ln.joeac.net.conf | 25 +++++++++++++++++++++++++ 5 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 ln/install.mk create mode 100644 ln/public/milehouse.html create mode 100644 nginx/http.d/ln.joeac.net.conf diff --git a/Makefile b/Makefile index cb6415d..8dcb622 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ CPU_ARCH := $(if $(shell which arch 2>/dev/null),\ IMAGE_PREFIX := $(if $(filter armv7%,$(CPU_ARCH)),armv7/) REGISTRY_DOMAIN := git.joeac.net REGISTRY_USER := joeac -MODULES := http gemini smtp vaultwarden etherpad +MODULES := http gemini smtp vaultwarden etherpad ln COMPOSE_SERVICES := $(shell podman-compose config \ | yq ".services | keys" \ | sed "s/[,[\"]//g" \ diff --git a/config.mk b/config.mk index 5193f93..91548bb 100644 --- a/config.mk +++ b/config.mk @@ -1,3 +1,4 @@ SUBDOMAIN_http := @ SUBDOMAIN_vaultwarden := pwd SUBDOMAIN_etherpad := docs +SUBDOMAIN_ln := ln diff --git a/ln/install.mk b/ln/install.mk new file mode 100644 index 0000000..f36f6d8 --- /dev/null +++ b/ln/install.mk @@ -0,0 +1,13 @@ +LN_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST)))) + +.PHONY: install +install: /var/ln.joeac.net/public + +/var/ln.joeac.net/public: $(LN_DIR)/public + sudo rm -rf /var/ln.joeac.net/public + sudo mkdir -p /var/ln.joeac.net/public + sudo cp -r $(LN_DIR)/public + +.PHONY: uninstall +uninstall: + sudo rm -rf /var/ln.joeac.net diff --git a/ln/public/milehouse.html b/ln/public/milehouse.html new file mode 100644 index 0000000..3464d64 --- /dev/null +++ b/ln/public/milehouse.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/nginx/http.d/ln.joeac.net.conf b/nginx/http.d/ln.joeac.net.conf new file mode 100644 index 0000000..5e21c32 --- /dev/null +++ b/nginx/http.d/ln.joeac.net.conf @@ -0,0 +1,25 @@ +server { + server_name ln.joeac.net; + + location / { + root /var/ln.joeac.net/public; + try_files $uri $uri.html $uri/index.html =404; + error_page 404 /index.html; + } + + listen 443 ssl; # managed by Certbot + ssl_certificate /etc/letsencrypt/live/ln.joeac.net/fullchain.pem; # managed by Certbot + ssl_certificate_key /etc/letsencrypt/live/ln.joeac.net/privkey.pem; # managed by Certbot + include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot + ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot +} + +server { + if ($host = ln.joeac.net) { + return 301 https://$host$request_uri; + } # managed by Certbot + + server_name ln.joeac.net; + listen 80; + return 404; # managed by Certbot +}