From 606c7185e008f1d1a6d6f9642f86464dbf4de8bb Mon Sep 17 00:00:00 2001 From: quitte Date: Wed, 16 Aug 2023 14:21:56 +0200 Subject: [PATCH] on-metal updates - grav fixes - course management migration --- modules/course-management.nix | 3 ++- modules/website.nix | 9 ++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/course-management.nix b/modules/course-management.nix index ea99658..77ed9c4 100644 --- a/modules/course-management.nix +++ b/modules/course-management.nix @@ -1,6 +1,7 @@ { config, lib, pkgs, ... }: let - hostName = "kurse.${config.fsr.domain}"; + # hostName = "kurse.${config.fsr.domain}"; + hostName = "kurse.ifsr.de"; in { sops.secrets = diff --git a/modules/website.nix b/modules/website.nix index bc02110..468b847 100644 --- a/modules/website.nix +++ b/modules/website.nix @@ -30,13 +30,20 @@ in }; services.nginx = { + + virtualHosts."www.${config.fsr.domain}" = { + enableACME = true; + forceSSL = true; + locations."/".return = "301 $scheme://ifsr.de$request_uri"; + + }; virtualHosts."${config.fsr.domain}" = { enableACME = true; forceSSL = true; root = "/srv/web/ifsrde"; locations = { "/" = { - tryFiles = "$uri $uri/ /index.php?$query_string;"; + tryFiles = "$uri $uri/ /index.php?$query_string"; }; "~ \.php$" = { extraConfig = ''