diff --git a/machines/renge/configuration.nix b/machines/renge/configuration.nix index 7fc78a3..4069d62 100644 --- a/machines/renge/configuration.nix +++ b/machines/renge/configuration.nix @@ -19,7 +19,6 @@ ./services/matrix ./services/prometheus.nix ./services/sbruder.xyz - ./services/schabernack.nix ]; sbruder = { diff --git a/machines/renge/services/schabernack.nix b/machines/renge/services/schabernack.nix deleted file mode 100644 index 99141b1..0000000 --- a/machines/renge/services/schabernack.nix +++ /dev/null @@ -1,48 +0,0 @@ -# SPDX-FileCopyrightText: 2021-2022 Simon Bruder -# -# SPDX-License-Identifier: AGPL-3.0-or-later - -{ config, lib, pkgs, ... }: -let - domain = "schulischer-schabernack.de"; -in -{ - services.nginx = { - commonHttpConfig = '' - # privacy-aware log format - log_format schabernack '$remote_addr_schabernack - - [$time_local] "$request" $status $body_bytes_sent "-" "$http_user_agent"'; - - # anonymise ip address - map $remote_addr $remote_addr_schabernack { - ~(?P\d+\.\d+)\. $ip.0.0; - ~(?P[^:]+:[^:]+): $ip::; - default 0.0.0.0; - } - ''; - - virtualHosts = { - ${domain} = { - forceSSL = true; - enableACME = true; - - root = "/var/www/schabernack"; - - # only log page views, rss feed access, media file download and embed views - extraConfig = '' - location ~ index\.html|rss\.xml|\.(opus|m4a|ogg|mp3|\.podlove.json)$ { - access_log /var/log/nginx/schabernack.log schabernack; - } - ''; - }; - "www.${domain}" = { - forceSSL = true; - enableACME = true; - globalRedirect = domain; - - extraConfig = '' - access_log off; - ''; - }; - }; - }; -} diff --git a/machines/yuzuru/services/static-sites.nix b/machines/yuzuru/services/static-sites.nix index 16c76ca..c0c54a6 100644 --- a/machines/yuzuru/services/static-sites.nix +++ b/machines/yuzuru/services/static-sites.nix @@ -53,6 +53,14 @@ user.name = "salespoint"; }; + "schulischer-schabernack.de" = { + redirects = [ + "www.schulischer-schabernack.de" + "staging.schulischer-schabernack.de" + ]; + user.name = "schabernack"; + }; + "share.sbruder.de" = { redirects = [ ]; user.name = "share";