diff --git a/hosts/harbor/configuration.nix b/hosts/harbor/configuration.nix index f022c7f..f54a167 100644 --- a/hosts/harbor/configuration.nix +++ b/hosts/harbor/configuration.nix @@ -104,6 +104,9 @@ hive.korrosync.enable = true; hive.korrosync.localPort = 7416; hive.korrosync.instanceFQDN = "korrosync.jroeger.de"; + hive.wallabag.enable = true; + hive.wallabag.localPort = 39184; + hive.wallabag.instanceFQDN = "wallabag.jroeger.de"; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions diff --git a/hosts/harbor/default.nix b/hosts/harbor/default.nix index 6c3296f..2902d62 100644 --- a/hosts/harbor/default.nix +++ b/hosts/harbor/default.nix @@ -23,6 +23,7 @@ self.nixosModules.matrix self.nixosModules.calibre self.nixosModules.korrosync-hive + self.nixosModules.wallabag ]; }; } diff --git a/modules/services/wallabag.nix b/modules/services/wallabag.nix index 02ced9d..aafc6f3 100644 --- a/modules/services/wallabag.nix +++ b/modules/services/wallabag.nix @@ -11,7 +11,7 @@ localPort = lib.mkOption { type = lib.types.int; example = 8080; - default = 39128; + default = 8088; description = "Specify the local port wallabag server uses."; }; instanceFQDN = lib.mkOption { @@ -30,7 +30,7 @@ enableACME = true; }; - # Virtual host for korrosync + # Virtual host for wallabag services.nginx.virtualHosts."${cfg.instanceFQDN}" = { forceSSL = true; enableACME = true; @@ -45,7 +45,7 @@ "wallabag-images:/var/www/wallabag/web/assets/images" ]; environment = { - "SYMFONY__ENV__DOMAIN_NAME" = "https://${cfg.instanceFQDN}:${toString cfg.localPort}"; + "SYMFONY__ENV__DOMAIN_NAME" = "https://${cfg.instanceFQDN}"; }; }; };