migrated channel 24.05 to unstable

2024-10-27 17:10:31 -06:00
parent 6b6b7e39b1
commit 37aa35daed
22 changed files with 131 additions and 557 deletions
--- a/modules/servers/shiori.nix
+++ b/modules/servers/shiori.nix
@@ -4,8 +4,6 @@ let
  setup = import ./setup.nix { inherit lib config; };
 in
 {
-  disabledModules = [ "services/web-apps/shiori.nix" ];
-  imports = [ ../../pkgs/shiori-service.nix ];
  options.my.servers.shiori = setup.mkOptions "shiori" "bookmarks" 4368;
  config = lib.mkIf (config.my.servers.shiori.enable && config.my.servers.postgres.enable) {
    networking.firewall.allowedTCPPorts = lib.mkIf (!cfg.isLocal) [ cfg.port ];