Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/infra
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 47d26b22928a
Choose a base ref
...
head repository: NixOS/infra
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 14eaa5f01eed
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Aug 19, 2019

  1. fixup! check port 9100

    @edolstra
    edolstra committed Aug 19, 2019
    Copy the full SHA
    e0ab378 View commit details

  2. Remove chef's endpoint, and change ceres to use an IP

    @edolstra
    edolstra committed Aug 19, 2019
    Copy the full SHA
    14eaa5f View commit details
Showing with 4 additions and 4 deletions.
  1. +1 −1 macs/host/qemu.nix
  2. +3 −3 modules/wireguard.nix
2 changes: 1 addition & 1 deletion macs/host/qemu.nix
View file
Original file line number Diff line number Diff line change
@@ -90,7 +90,7 @@ in {
enable = true;

script = ''
if ${pkgs.curl}/bin/curl ${config.macosGuest.network.interiorNetworkPrefix}.2 > /dev/null; then
if ${pkgs.curl}/bin/curl ${config.macosGuest.network.interiorNetworkPrefix}.2:9100 > /dev/null; then
echo "Appears to be up!"
else
echo "Appears to be down, restarting run-macos-vm"
6 changes: 3 additions & 3 deletions modules/wireguard.nix
View file
Original file line number Diff line number Diff line change
@@ -15,14 +15,14 @@ let

chef = {
ip = "10.254.1.2";
endpoint = "hydra.nixos.org";
port = 51820;
# endpoint = "hydra.nixos.org";
# port = 51820;
publicKey = "Y/RHgJ7Znh9vyWlXd2g8p9Zz1YEE50TYgqDduluhjmU=";
};

ceres = {
ip = "10.254.1.3";
endpoint = "ceres.nixos.org";
endpoint = "46.4.66.184";
port = 51820;
publicKey = "wkUjkjJtJ9yC1xh2pSbTfyuPkeUnvgxGIHFKxVCGJT8=";
};