Skip to content

Commit

Permalink
Updated JF docs and added openssh vpn option
Browse files Browse the repository at this point in the history
  • Loading branch information
rasmus-kirk committed Feb 26, 2024
1 parent 81db952 commit 10c6746
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 3 deletions.
9 changes: 6 additions & 3 deletions nixarr/jellyfin/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ in {

expose = {
enable = mkEnableOption ''
Enable expose for Jellyfin, exposing the web service to the internet.
Expose the Jellyfin web service to the internet.
**Important:** Do _not_ enable this without setting up Jellyfin
authentication through localhost first!
'';

upnp.enable = mkEnableOption ''
Expand All @@ -35,13 +38,13 @@ in {
domainName = mkOption {
type = types.nullOr types.str;
default = null;
description = "REQUIRED! The domain name to host Jellyfin on.";
description = "**REQUIRED:** The domain name to host Jellyfin on.";
};

acmeMail = mkOption {
type = types.nullOr types.str;
default = null;
description = "REQUIRED! The ACME mail required for the letsencrypt bot.";
description = "**REQUIRED:** The ACME mail required for the letsencrypt bot.";
};
};
};
Expand Down
42 changes: 42 additions & 0 deletions nixarr/openssh/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# TODO: Dir creation and file permissions in nix
{
config,
lib,
...
}:
with lib; let
cfg = config.nixarr.openssh;
in {
options.nixarr.openssh.vpn.enable = {
type = types.bool;
default = false;
description = ''
Run the openssh service through a vpn.
**Note:** This option does _not_ enable the sshd service you still
need to setup sshd in your nixos configuration, fx:
```nix
services.openssh = {
enable = true;
settings.PasswordAuthentication = false;
};
users.extraUsers.username.openssh.authorizedKeys.keyFiles = [
./path/to/public/key/machine.pub}
];
```
'';
};

config = mkIf cfg.enable {
systemd.services.openssh = mkIf (cfg.vpn.enable && config.services.openssh.enable) {
bindsTo = [ "[email protected]" ];
requires = [ "network-online.target" ];
after = [ "wg.service" ];
serviceConfig = {
NetworkNamespacePath = "/var/run/netns/wg";
};
};
};
}

0 comments on commit 10c6746

Please sign in to comment.