diff --git a/flake.nix b/flake.nix index 3297afe..ec4a597 100644 --- a/flake.nix +++ b/flake.nix @@ -79,8 +79,6 @@ "vscode-extension-ms-vscode-cpptools" "zoom" ]; - # testing purposes till https://github.com/NixOS/nixpkgs/issues/224505 is resolved - permittedInsecurePackages = [ "openssl-1.1.1t" ]; }; channels.nixpkgs.overlaysBuilder = channels: [ diff --git a/modules/server/grocy.nix b/modules/server/grocy.nix index f7b42ed..e485105 100644 --- a/modules/server/grocy.nix +++ b/modules/server/grocy.nix @@ -9,21 +9,22 @@ with lib; { cfg = config.elss.server.grocy; in mkIf cfg.enable { - services.grocy = { - enable = true; - hostName = "grocy.ellmauthaler.net"; - settings = { - currency = "EUR"; - culture = "de"; - calendar = { - showWeekNumber = true; - firstDayOfWeek = 1; + services = { + grocy = { + enable = true; + hostName = "grocy.ellmauthaler.net"; + settings = { + currency = "EUR"; + culture = "de"; + calendar = { + showWeekNumber = true; + firstDayOfWeek = 1; + }; }; }; - }; - services.nginx.virtualHosts."grocy.ellmauthaler.net" = { - forceSSL = true; + nginx.virtualHosts."grocy.ellmauthaler.net" = {forceSSL = true;}; + phpfpm.pools.grocy.phpPackage = mkForce pkgs.php81; }; }; }