pub-solar/infra
6
1
Fork 3
Code Issues 24 Pull requests 10 Actions Packages Projects 1 Releases Wiki Activity

Merge pull request 'fix: nginx config for pub.solar website' (#22) from fix-nginx into main

Browse source 
Reviewed-on: pub-solar/infra-new#22
Reviewed-by: hensoko <hensoko@gssws.de>
This commit is contained in:
teutat3s 2023-10-28 18:22:40 +02:00
parent f804de372c 5ffc4f67ff
commit 8a0ac64eac
Signed by: pub.solar gitea
GPG key ID: F0332B04B7054873
3 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
hosts/nachtigall/apps/nginx-website.nix
View file

@ -1,12 +1,25 @@
{ ... }: { ... }:
{ {
systemd.tmpfiles.rules = [
"d '/srv/www/pub.solar' 0750 hakkonaut hakkonaut - -"
];
services.nginx.virtualHosts = { services.nginx.virtualHosts = {
"www.pub.solar".locations."/".extraConfig = "return 301 https://pub.solar$request_uri"; "www.pub.solar" = {
enableACME = true;
addSSL = true;
locations."/" = {
extraConfig = ''
return 301 https://pub.solar$request_uri;
'';
};
};
"pub.solar" = { "pub.solar" = {
default = true; default = true;
enableACME = true; enableACME = true;
forceSSL = true;
locations = { locations = {
# serve base domain pub.solar for mastodon.pub.solar # serve base domain pub.solar for mastodon.pub.solar
@ -21,7 +34,7 @@
"/.well-known/webfinger" = { "/.well-known/webfinger" = {
# Redirect requests that match /.well-known/webfinger?resource=* to Mastodon # Redirect requests that match /.well-known/webfinger?resource=* to Mastodon
extraConfig = '' extraConfig = ''
if ($arg_resource) = { if ($arg_resource) {
return 301 https://mastodon.pub.solar$request_uri; return 301 https://mastodon.pub.solar$request_uri;
} }
@ -32,14 +45,14 @@
"/satzung" = { "/satzung" = {
extraConfig = '' extraConfig = ''
return 302 /satzung https://cloud.pub.solar/s/2tRCP9aZFCiWxQy; return 302 https://cloud.pub.solar/s/2tRCP9aZFCiWxQy;
''; '';
}; };
"/" = { "/" = {
root = "/srv/www/pub.solar"; root = "/srv/www/pub.solar";
index = "index.html"; index = "index.html";
tryFiles = "$uri $uri/"; tryFiles = "$uri $uri/ =404";
}; };
}; };
}; };

4
hosts/nachtigall/apps/nginx.nix
View file

@ -20,8 +20,4 @@ in {
}; };
networking.firewall.allowedTCPPorts = [80 443]; networking.firewall.allowedTCPPorts = [80 443];
systemd.tmpfiles.rules = [
"d '/srv/www/pub.solar' 0750 hakkonaut hakkonaut - -"
];
} }

3
hosts/nachtigall/configuration.nix
View file

@ -41,7 +41,8 @@
users.users.hakkonaut = { users.users.hakkonaut = {
description = "CI and automation user"; description = "CI and automation user";
home = "/var/nix/iso-cache"; home = "/home/hakkonaut";
createHome = true;
useDefaultShell = true; useDefaultShell = true;
uid = 998; uid = 998;
group = "hakkonaut"; group = "hakkonaut";