diff --git a/hosts/binary-cache/configuration.nix b/hosts/binary-cache/configuration.nix index dc28e679..6d5f3c75 100644 --- a/hosts/binary-cache/configuration.nix +++ b/hosts/binary-cache/configuration.nix @@ -66,7 +66,7 @@ } # Proxy a subset of requests to rclone. - https://{$SITE_ADDRESS} { + https://ghaf-binary-cache.northeurope.cloudapp.azure.com { handle /nix-cache-info { reverse_proxy unix///run/rclone-http/socket } @@ -90,8 +90,6 @@ "" "${pkgs.caddy}/bin/caddy run --environ --config ${config.services.caddy.configFile}/Caddyfile" ]; - systemd.services.caddy.serviceConfig.EnvironmentFile = "/run/caddy.env"; - # Wait for cloud-init mounting before we start caddy. systemd.services.caddy.after = ["cloud-init.service"]; systemd.services.caddy.requires = ["cloud-init.service"]; diff --git a/terraform/jenkins/binary_cache.tf b/terraform/jenkins/binary_cache.tf index 07246b89..25e46015 100644 --- a/terraform/jenkins/binary_cache.tf +++ b/terraform/jenkins/binary_cache.tf @@ -41,10 +41,6 @@ module "binary_cache_vm" { content = "AZURE_STORAGE_ACCOUNT_NAME=${azurerm_storage_account.binary_cache.name}", "path" = "/var/lib/rclone-http/env" }, - { - content = "SITE_ADDRESS=ghaf-binary-cache.northeurope.cloudapp.azure.com", - "path" = "/run/caddy.env" - }, ], })])