From b98d18bb3dc8e80eb1a12bb855d5d2161b87011b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 16 Dec 2023 16:42:34 +0100 Subject: [PATCH] drone: also listen on drone.c3d2.de --- hosts/drone/default.nix | 8 +++----- hosts/public-access-proxy/default.nix | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/hosts/drone/default.nix b/hosts/drone/default.nix index 40e94575..4a38d5e5 100644 --- a/hosts/drone/default.nix +++ b/hosts/drone/default.nix @@ -1,8 +1,5 @@ { config, libC, pkgs, ... }: -let - hostname = "drone.hq.c3d2.de"; -in { c3d2.deployment.server = "server10"; @@ -13,11 +10,12 @@ in services = { nginx = { enable = true; - virtualHosts.${hostname} = { + virtualHosts."drone.hq.c3d2.de" = { forceSSL = true; enableACME = true; listen = libC.defaultListen; locations."/".proxyPass = "http://localhost:5000"; + serverAliases = [ "drone.c3d2.de" ]; }; }; @@ -71,7 +69,7 @@ in "DRONE_DATADOG_ENABLED=false" "DRONE_DATADOG_ENDPOINT=null" "DRONE_GITEA_SERVER=https://gitea.c3d2.de" - "DRONE_SERVER_HOST=${hostname}" + "DRONE_SERVER_HOST=drone.c3d2.de" "DRONE_SERVER_PORT=:5000" "DRONE_SERVER_PROTO=https" "DRONE_USER_CREATE=username:sandro,admin:true" diff --git a/hosts/public-access-proxy/default.nix b/hosts/public-access-proxy/default.nix index 45236e38..e01b8a2e 100644 --- a/hosts/public-access-proxy/default.nix +++ b/hosts/public-access-proxy/default.nix @@ -142,7 +142,7 @@ hostNames = [ "relay.fedi.buzz" ]; proxyTo.host = zentralwerk.lib.config.site.net.serv.hosts4.buzzrelay; } { - hostNames = [ "drone.hq.c3d2.de" ]; + hostNames = [ "drone.c3d2.de" "drone.hq.c3d2.de" ]; proxyTo.host = hostRegistry.drone.ip4; proxyProtocol = true; } {