diff --git a/machines/renge/configuration.nix b/machines/renge/configuration.nix index 53c9fcf..e28148a 100644 --- a/machines/renge/configuration.nix +++ b/machines/renge/configuration.nix @@ -20,6 +20,7 @@ ./services/onlypain.icu ./services/prometheus.nix ./services/sbruder.xyz + ./services/schabernack.nix ]; sbruder = { diff --git a/machines/yuzuru/services/schabernack.nix b/machines/renge/services/schabernack.nix similarity index 66% rename from machines/yuzuru/services/schabernack.nix rename to machines/renge/services/schabernack.nix index 9c51a95..47d1918 100644 --- a/machines/yuzuru/services/schabernack.nix +++ b/machines/renge/services/schabernack.nix @@ -21,7 +21,7 @@ in forceSSL = true; enableACME = true; - root = "/var/www/schabernack/production"; + root = "/var/www/schabernack"; # only log page views, rss feed access, media file download and embed views extraConfig = '' @@ -41,21 +41,4 @@ in }; }; }; - - systemd.tmpfiles.rules = [ - "d /var/www/schabernack/production 0755 schabernack root -" - ]; - - users = { - users.schabernack = { - isSystemUser = true; - group = "schabernack"; - shell = "/bin/sh"; - - openssh.authorizedKeys.keys = map - (key: "command=\"${pkgs.rrsync}/bin/rrsync -wo /var/www/schabernack/\",no-agent-forwarding,no-port-forwarding,no-pty,no-user-rc,no-X11-forwarding ${key}") - config.sbruder.pubkeys.trustedKeys; - }; - groups.schabernack = { }; - }; } diff --git a/machines/yuzuru/configuration.nix b/machines/yuzuru/configuration.nix index 0f3b11d..766c05c 100644 --- a/machines/yuzuru/configuration.nix +++ b/machines/yuzuru/configuration.nix @@ -4,8 +4,6 @@ imports = [ ./hardware-configuration.nix ../../modules - - ./services/schabernack.nix ]; sbruder = {