From 9a0f47d8d927a32f66d567e6ccdf327e7837e0f8 Mon Sep 17 00:00:00 2001 From: Miraty Date: Thu, 22 Dec 2022 02:07:26 +0100 Subject: [PATCH] Add support for subdomain and subpath --- mkosi.default.d/arch/mkosi.default | 1 + mkosi.extra/etc/nginx/sites/subdomain.conf | 12 ++++++++++++ mkosi.extra/etc/nginx/sites/subpath.conf | 12 ++++++++++++ mkosi.postinst | 4 ++-- mkosi.skeleton/srv/niver/subdomain/.gitkeep | 0 mkosi.skeleton/srv/niver/subpath/.gitkeep | 0 6 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 mkosi.extra/etc/nginx/sites/subdomain.conf create mode 100644 mkosi.extra/etc/nginx/sites/subpath.conf create mode 100644 mkosi.skeleton/srv/niver/subdomain/.gitkeep create mode 100644 mkosi.skeleton/srv/niver/subpath/.gitkeep diff --git a/mkosi.default.d/arch/mkosi.default b/mkosi.default.d/arch/mkosi.default index ac48903..3ba07f3 100644 --- a/mkosi.default.d/arch/mkosi.default +++ b/mkosi.default.d/arch/mkosi.default @@ -11,6 +11,7 @@ Packages = nginx-mod-headers-more certbot-nginx php-sqlite + php-sodium go openssh iputils diff --git a/mkosi.extra/etc/nginx/sites/subdomain.conf b/mkosi.extra/etc/nginx/sites/subdomain.conf new file mode 100644 index 0000000..1c932f8 --- /dev/null +++ b/mkosi.extra/etc/nginx/sites/subdomain.conf @@ -0,0 +1,12 @@ +server { + listen [::1]:42443 ssl http2; + listen 127.0.0.1:42443 ssl http2; + server_name "~^(?[a-z0-9]{1,32})\.ht\.niver\.test$"; + + include inc/ht-tls.conf; + + ssl_certificate /etc/ssl/certs/niver.crt; + ssl_certificate_key /etc/ssl/private/niver.key; + + root /srv/niver/subdomain/${subdomain}/; +} diff --git a/mkosi.extra/etc/nginx/sites/subpath.conf b/mkosi.extra/etc/nginx/sites/subpath.conf new file mode 100644 index 0000000..18b900a --- /dev/null +++ b/mkosi.extra/etc/nginx/sites/subpath.conf @@ -0,0 +1,12 @@ +server { + listen [::1]:42443 ssl http2; + listen 127.0.0.1:42443 ssl http2; + server_name ht.niver.test; + + include inc/ht-tls.conf; + + ssl_certificate /etc/ssl/certs/niver.crt; + ssl_certificate_key /etc/ssl/private/niver.key; + + root /srv/niver/subpath/; +} diff --git a/mkosi.postinst b/mkosi.postinst index 54448a6..530da13 100755 --- a/mkosi.postinst +++ b/mkosi.postinst @@ -20,8 +20,8 @@ chmod -R u=rwX,g=rwX,o= /srv/niver/ns chown -R niver:knot /srv/niver/reg chmod -R u=rwX,g=rwX,o= /srv/niver/reg -chown -R niver:nginx /srv/niver/nginx -chmod -R u=rwX,g=rX,o= /srv/niver/nginx +chown -R niver:nginx /srv/niver/nginx /srv/niver/subpath /srv/niver/subdomain +chmod -R u=rwX,g=rX,o= /srv/niver/nginx /srv/niver/subpath /srv/niver/subdomain chown -R sftpgo:sftpgo /etc/sftpgo chmod -R u=rX,g=rX,o=rX /etc/sftpgo diff --git a/mkosi.skeleton/srv/niver/subdomain/.gitkeep b/mkosi.skeleton/srv/niver/subdomain/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/mkosi.skeleton/srv/niver/subpath/.gitkeep b/mkosi.skeleton/srv/niver/subpath/.gitkeep new file mode 100644 index 0000000..e69de29