diff --git a/flake.nix b/flake.nix index 547cda9..10cbe22 100755 --- a/flake.nix +++ b/flake.nix @@ -53,7 +53,7 @@ ./modules/vaultwarden.nix ./modules/website.nix ./modules/zsh.nix - ./modules/course-management + ./modules/course-management.nix ./modules/courses-phil.nix ./modules/gitea.nix { diff --git a/modules/course-management/default.nix b/modules/course-management.nix similarity index 92% rename from modules/course-management/default.nix rename to modules/course-management.nix index 75cd1ce..d5ed99a 100644 --- a/modules/course-management/default.nix +++ b/modules/course-management.nix @@ -1,4 +1,4 @@ -{ pkgs, config, lib, ... }: +{ config, lib, ... }: let hostName = "kurse.${config.networking.domain}"; in @@ -15,11 +15,7 @@ in services.course-management = { inherit hostName; enable = true; - package = (pkgs.course-management.overrideAttrs (_: { - patches = [ - ./0001-show-participants-again.patch - ]; - })); + settings = { secretKeyFile = config.sops.secrets."course-management/secret-key".path; adminPassFile = config.sops.secrets."course-management/adminpass".path; diff --git a/modules/course-management/0001-show-participants-again.patch b/modules/course-management/0001-show-participants-again.patch deleted file mode 100644 index be88b1e..0000000 --- a/modules/course-management/0001-show-participants-again.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2f0cb978f180d073f02c2327bb627698116135e0 Mon Sep 17 00:00:00 2001 -From: Rouven Seifert -Date: Fri, 29 Sep 2023 17:37:01 +0200 -Subject: [PATCH] show-participants-again - ---- - course-management/course/templates/subject/info.html | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/course-management/course/templates/subject/info.html b/course-management/course/templates/subject/info.html -index 55f1620..d1724a4 100644 ---- a/course-management/course/templates/subject/info.html -+++ b/course-management/course/templates/subject/info.html -@@ -55,7 +55,7 @@ - {% if course.saturated %} - {% trans 'full' %} - {% else %} -- {% trans 'free places' %} -+ {{ course.enrolled_students }}/{{ course.max_participants }} - {% endif %} - {% else %} - {% trans 'unavailable' %} --- -2.42.0 -