diff options
| author | sils <sils@sils.li> | 2023-04-11 10:55:18 +0200 |
|---|---|---|
| committer | sils <sils@sils.li> | 2023-04-11 10:55:18 +0200 |
| commit | 5a6dd9797b67c08d58236956fbb43b7fe57f5730 (patch) | |
| tree | 27418564bc75d03c66c0e5cf5209f0b66e625998 /services | |
| parent | Fix(services): Remove Minecraft (diff) | |
| parent | Chore(flake): Update (diff) | |
| download | nixos-server-5a6dd9797b67c08d58236956fbb43b7fe57f5730.tar.gz nixos-server-5a6dd9797b67c08d58236956fbb43b7fe57f5730.zip | |
Merge pull request 'server1_develop' (#22) from server1_develop into server1
Reviewed-on: https://git.sils.li/vhack.eu/nixos-server/pulls/22 Reviewed-by: sils <sils@sils.li>
Diffstat (limited to '')
| -rw-r--r-- | services/default.nix | 7 | ||||
| -rw-r--r-- | system/services/minecraft/default.nix (renamed from services/services/minecraft.nix) | 0 | ||||
| -rw-r--r-- | system/services/nix/default.nix (renamed from services/services/nix.nix) | 0 | ||||
| -rw-r--r-- | system/services/opensshd/default.nix (renamed from services/services/opensshd.nix) | 1 | ||||
| -rw-r--r-- | system/services/rust-motd/default.nix (renamed from services/services/rust-motd.nix) | 28 |
5 files changed, 20 insertions, 16 deletions
diff --git a/services/default.nix b/services/default.nix deleted file mode 100644 index 8029ee2..0000000 --- a/services/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{config, ...}: { - imports = [ - ./services/nix.nix - ./services/opensshd.nix - ./services/rust-motd.nix - ]; -} diff --git a/services/services/minecraft.nix b/system/services/minecraft/default.nix index 754c974..754c974 100644 --- a/services/services/minecraft.nix +++ b/system/services/minecraft/default.nix diff --git a/services/services/nix.nix b/system/services/nix/default.nix index bd562ec..bd562ec 100644 --- a/services/services/nix.nix +++ b/system/services/nix/default.nix diff --git a/services/services/opensshd.nix b/system/services/opensshd/default.nix index cb9f2ba..75c5aef 100644 --- a/services/services/opensshd.nix +++ b/system/services/opensshd/default.nix @@ -8,7 +8,6 @@ passwordAuthentication = false; hostKeys = [ { - comment = "key comment"; path = "/srv/sshd/ssh_host_ed25519_key"; rounds = 1000; type = "ed25519"; diff --git a/services/services/rust-motd.nix b/system/services/rust-motd/default.nix index 21bc1cd..1a41b32 100644 --- a/services/services/rust-motd.nix +++ b/system/services/rust-motd/default.nix @@ -3,6 +3,15 @@ pkgs, ... }: { + systemd.services.rust-motd = { + path = builtins.attrValues { + inherit + (pkgs) + bash + fail2ban # Needed for rust-motd fail2ban integration + ; + }; + }; programs.rust-motd = { enable = true; enableMotdInSSHD = true; @@ -45,17 +54,20 @@ # [user_service_status] # gpg-agent = "gpg-agent" - #s_s_l_certs = { - # sort_method = "manual" - # - # certs = { - # CertName1 = "/path/to/cert1.pem" - # CertName2 = "/path/to/cert2.pem" - # } - #}; + s_s_l_certs = { + sort_method = "manual"; + + certs = { + "server1.vhack.eu" = "/var/lib/acme/server1.vhack.eu/cert.pem"; + "vhack.eu" = "/var/lib/acme/vhack.eu/cert.pem"; + }; + }; filesystems = { root = "/"; + persistent = "/srv"; + store = "/nix"; + boot = "/boot"; }; memory = { |