diff --git a/services/crowdsec.nix b/services/crowdsec.nix index 5c3e279..9f3f6d8 100644 --- a/services/crowdsec.nix +++ b/services/crowdsec.nix @@ -44,6 +44,8 @@ }; }; + users.users."${config.services.crowdsec.user}".extraGroups = [ "adm" ]; + systemd.tmpfiles.rules = let cfg = config.services.crowdsec; in [ "d /var/lib/crowdsec 0755 ${cfg.user} ${cfg.group}" ]; } diff --git a/services/fireflyiii.nix b/services/fireflyiii.nix index 5174cc2..c029444 100644 --- a/services/fireflyiii.nix +++ b/services/fireflyiii.nix @@ -155,8 +155,8 @@ in { networks = [ networks."${user}".ref ]; publishPorts = [ "127.0.0.1:${port}:${containerPort}" ]; }; - unitConfig.Requires = [ secrets.ref containers."${user}".ref ]; - unitConfig.After = [ secrets.ref containers."${user}".ref ]; + unitConfig.Requires = [ secrets.ref containers."${user}-db".ref ]; + unitConfig.After = [ secrets.ref containers."${user}-db".ref ]; }; }; }; diff --git a/services/openssh.nix b/services/openssh.nix new file mode 100644 index 0000000..a315eac --- /dev/null +++ b/services/openssh.nix @@ -0,0 +1,9 @@ +{ ... }: { + services.openssh = { + enable = true; + settings = { + PermitRootLogin = "no"; + PasswordAuthentication = false; + }; + }; +} diff --git a/services/vaultwarden.nix b/services/vaultwarden.nix index 0156254..54ea31e 100644 --- a/services/vaultwarden.nix +++ b/services/vaultwarden.nix @@ -60,6 +60,15 @@ in { } ''; + services.crowdsec = { + localConfig.acquisitions = [{ + source = "journalctl"; + journalctl_filter = [ "_SYSTEMD_USER_UNIT=${user}.service" ]; + labels.type = "bitwarden"; + }]; + hub.collections = [ "MariuszKociubinski/bitwarden" ]; + }; + users.users."${user}" = { group = user; isNormalUser = true; @@ -146,8 +155,8 @@ in { networks = [ networks."${user}".ref ]; publishPorts = [ "127.0.0.1:${port}:${containerPort}" ]; }; - unitConfig.Requires = [ secrets.ref containers."${user}".ref ]; - unitConfig.After = [ secrets.ref containers."${user}".ref ]; + unitConfig.Requires = [ secrets.ref containers."${user}-db".ref ]; + unitConfig.After = [ secrets.ref containers."${user}-db".ref ]; }; }; }; diff --git a/systems/linux/mcentire.nix b/systems/linux/mcentire.nix index 95cb563..bf03719 100644 --- a/systems/linux/mcentire.nix +++ b/systems/linux/mcentire.nix @@ -12,6 +12,7 @@ ./../../services/fireflyiii.nix ./../../services/freshrss.nix ./../../services/navidrome.nix + ./../../services/openssh.nix ./../../services/vaultwarden.nix ];