diff --git a/machines/gerd.nix b/machines/gerd.nix index e2d670b..3fe01d6 100644 --- a/machines/gerd.nix +++ b/machines/gerd.nix @@ -22,7 +22,6 @@ ./gerd/services/stalwart ./gerd/services/wger ./gerd/services/searx.nix - ./gerd/services/miniflux.nix ./gerd/services/element.nix ./gerd/services/matrix-synapse.nix diff --git a/machines/gerd/services/lldap/default.nix b/machines/gerd/services/lldap/default.nix index 57f9afc..3866f61 100644 --- a/machines/gerd/services/lldap/default.nix +++ b/machines/gerd/services/lldap/default.nix @@ -19,7 +19,7 @@ index 6f42473..b3746a1 100644 &config, ''; - pkgLLDAPCli = pkgs.callPackage ./../../../../shared/pkgs/lldap-cli.nix {}; + pkgLLDAPCli = pkgs.callPackage ./../../../shared/pkgs/lldap-cli.nix {}; in { environment.systemPackages = [ pkgLLDAPCli diff --git a/machines/gerd/services/miniflux.nix b/machines/gerd/services/miniflux.nix deleted file mode 100644 index 672ebe6..0000000 --- a/machines/gerd/services/miniflux.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ config, lib, pkgs, ... }: - -let - svc_domain = "miniflux.${config.mine.shared.settings.domain}"; - port = 6466; -in { - services.miniflux = { - enable = true; - - config = { - LISTEN_ADDR = "localhost:${builtins.toString port}"; - - # disable admin account, disable local auth - CREATE_ADMIN = 0; - DISABLE_LOCAL_AUTH = "true"; - - # use auth proxy - # TODO: This should be configureable - AUTH_PROXY_HEADER = "Remote-User"; - AUTH_PROXY_USER_CREATION = "true"; - }; - }; - - # nginx - services.nginx.virtualHosts."${svc_domain}" = config.mine.shared.lib.authelia.mkProtectedWebsite { - forceSSL = true; - enableACME = true; - - locations."/" = config.mine.shared.lib.authelia.mkProtectedLocation { - proxyPass = "http://localhost:${builtins.toString port}"; - }; - }; - - # meta - mine.shared.meta.miniflux = { - name = "Miniflux"; - description = "We host our own miniflux, use it to read all your feeds!"; - url = "https://${svc_domain}"; - - package = let - pkg = config.services.miniflux.package; - in { - name = pkg.pname; - version = pkg.version; - meta = pkg.meta; - }; - }; -} diff --git a/shared/applications/server/postgresql.nix b/shared/applications/server/postgresql.nix index e043820..39ea88b 100644 --- a/shared/applications/server/postgresql.nix +++ b/shared/applications/server/postgresql.nix @@ -11,7 +11,7 @@ compression = "zstd"; - # default to backup all databases + # default to backup all databadatabases databases = config.services.postgresql.ensureDatabases; };