diff --git a/machines/okarin/configuration.nix b/machines/okarin/configuration.nix index 7aa8874..3624de1 100644 --- a/machines/okarin/configuration.nix +++ b/machines/okarin/configuration.nix @@ -9,7 +9,6 @@ ./hardware-configuration.nix ../../modules - ./services/static-sites.nix ./services/proxy.nix ]; diff --git a/machines/okarin/services/static-sites.nix b/machines/okarin/services/static-sites.nix deleted file mode 100644 index 5c11532..0000000 --- a/machines/okarin/services/static-sites.nix +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-FileCopyrightText: 2023-2024 Simon Bruder -# -# SPDX-License-Identifier: AGPL-3.0-or-later - -{ config, ... }: - -{ - sbruder.static-webserver.vhosts = { - "maggus.bayern".user = { - name = "maggus"; - keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAWGXaMijpnm3RSH/PIVxkBRDIi1f5nMW/aS26g3b71M nils" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJEF8o2ezSEXwWoAcdoeJs+wsZM/u8x+vtRNU3FXOMIT nils" - ] ++ config.sbruder.pubkeys.trustedKeys; - }; - "arbeitskampf.work".user = { - name = "arbeitskampf"; - }; - }; -} diff --git a/machines/yuzuru/services/static-sites.nix b/machines/yuzuru/services/static-sites.nix index 33abf3d..9889e18 100644 --- a/machines/yuzuru/services/static-sites.nix +++ b/machines/yuzuru/services/static-sites.nix @@ -1,7 +1,9 @@ -# SPDX-FileCopyrightText: 2024 Simon Bruder +# SPDX-FileCopyrightText: 2023-2024 Simon Bruder # # SPDX-License-Identifier: AGPL-3.0-or-later +{ config, ... }: + { services.nginx.virtualHosts = { "brennende.autos" = { @@ -19,6 +21,18 @@ }; sbruder.static-webserver.vhosts = { + "arbeitskampf.work".user = { + name = "arbeitskampf"; + }; + + "maggus.bayern".user = { + name = "maggus"; + keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAWGXaMijpnm3RSH/PIVxkBRDIi1f5nMW/aS26g3b71M nils" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJEF8o2ezSEXwWoAcdoeJs+wsZM/u8x+vtRNU3FXOMIT nils" + ] ++ config.sbruder.pubkeys.trustedKeys; + }; + "psycho-power-papagei.de" = { user.name = "papagei"; imprint.enable = true;