commit 4b758e374e19774509a5c93726d79dde4744a8bc · pyrox.dev/nixpkgs

+1 -1

nixos/maintainers/scripts/ec2/amazon-base-config.nix

···

       1
       1
        
       { modulesPath, ...}:

     

       2
       2
        
       {

     

       3
       3
       -
         imports = [ "${modulesPath}/virtualisation/amazon-image.nix" ];

     

       3
       3
       +
         imports = [ "${modulesPath}/virtualisation/amazon-init.nix" ];

     

       4
       4
        
         services.journald.rateLimitBurst = 0;

     

       5
       5
        
       }

+52

nixos/modules/virtualisation/amazon-init.nix

···

       1
       1
       +
       { config, pkgs, modulesPath, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       # This attempts to pull a nix expression from this EC2 instance's user-data.

     

       4
       4
       +
       

     

       5
       5
       +
       let

     

       6
       6
       +
         bootScript = pkgs.writeScript "bootscript.sh" ''

     

       7
       7
       +
           #!${pkgs.stdenv.shell} -eux

     

       8
       8
       +
       

     

       9
       9
       +
           echo "attempting to fetch configuration from user-data..."

     

       10
       10
       +
       

     

       11
       11
       +
           export PATH=${pkgs.nix}/bin:${pkgs.wget}/bin:${pkgs.systemd}/bin:${pkgs.gnugrep}/bin:${pkgs.gnused}/bin:${config.system.build.nixos-rebuild}/bin:$PATH

     

       12
       12
       +
           export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix/profiles/per-user/root/channels

     

       13
       13
       +
       

     

       14
       14
       +
           userData="$(mktemp)"

     

       15
       15
       +
           wget -q --wait=1 --tries=0 --retry-connrefused -O - http://169.254.169.254/2011-01-01/user-data > "$userData"

     

       16
       16
       +
       

     

       17
       17
       +
           if [[ $? -eq 0 ]]; then

     

       18
       18
       +
             echo "user-data fetched"

     

       19
       19
       +
             # If the user-data looks like it could be a nix expression,

     

       20
       20
       +
             # copy it over. Also, look for a magic three-hash comment and set

     

       21
       21
       +
             # that as the channel.

     

       22
       22
       +
             if sed '/^\(#\|SSH_HOST_.*\)/d' < "$userData" | grep -q '\S'; then

     

       23
       23
       +
               channels="$(grep '^###' "$userData" | sed 's|###\s*||')"

     

       24
       24
       +
               printf "%s" "$channels" | while read channel; do

     

       25
       25
       +
                 echo "writing channel: $channel"

     

       26
       26
       +
               done

     

       27
       27
       +
       

     

       28
       28
       +
               if [[ -n "$channels" ]]; then

     

       29
       29
       +
                 printf "%s" "$channels" > /root/.nix-channels

     

       30
       30
       +
                 nix-channel --update

     

       31
       31
       +
               fi

     

       32
       32
       +
       

     

       33
       33
       +
               echo "setting configuration"

     

       34
       34
       +
               cp "$userData" /etc/nixos/configuration.nix

     

       35
       35
       +
             else

     

       36
       36
       +
               echo "user-data does not appear to be a nix expression; ignoring"

     

       37
       37
       +
             fi

     

       38
       38
       +
           else

     

       39
       39
       +
             echo "failed to fetch user-data"

     

       40
       40
       +
           fi

     

       41
       41
       +
       

     

       42
       42
       +
           type -f nixos-rebuild

     

       43
       43
       +
       

     

       44
       44
       +
           nixos-rebuild switch

     

       45
       45
       +
         '';

     

       46
       46
       +
       in {

     

       47
       47
       +
         imports = [ "${modulesPath}/virtualisation/amazon-image.nix" ];

     

       48
       48
       +
         ec2.metadata = true;

     

       49
       49
       +
         boot.postBootCommands = ''

     

       50
       50
       +
           ${bootScript} &

     

       51
       51
       +
         '';

     

       52
       52
       +
       }

+2 -1

nixos/release.nix

···

       247
       247
        
         tests.docker = hydraJob (import tests/docker.nix { system = "x86_64-linux"; });

     

       248
       248
        
         tests.dockerRegistry = hydraJob (import tests/docker-registry.nix { system = "x86_64-linux"; });

     

       249
       249
        
         tests.etcd = hydraJob (import tests/etcd.nix { system = "x86_64-linux"; });

     

       250
       250
       -
         tests.ec2 = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).bootEc2NixOps;

     

       250
       250
       +
         tests.ec2-nixops = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-nixops;

     

       251
       251
       +
         tests.ec2-config = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-config;

     

       251
       252
        
         tests.firefox = callTest tests/firefox.nix {};

     

       252
       253
        
         tests.firewall = callTest tests/firewall.nix {};

     

       253
       254
        
         tests.fleet = hydraJob (import tests/fleet.nix { system = "x86_64-linux"; });

+24 -1

nixos/tests/ec2.nix

···

       62
       62
        
           "9ZcDMiWaEhoAR6FGoaGI04ff7CS+1yybQ= snakeoil"

     

       63
       63
        
         ];

     

       64
       64
        
       in {

     

       65
       65
       -
         bootEc2NixOps = makeEc2Test {

     

       65
       65
       +
         boot-ec2-nixops = makeEc2Test {

     

       66
       66
        
           name         = "nixops-userdata";

     

       67
       67
        
           sshPublicKey = snakeOilPublicKey; # That's right folks! My user's key is also the host key!

     

       68
       68
        
       

     
···

       91
       91
        
             $machine->succeed("ssh -o BatchMode=yes localhost exit");

     

       92
       92
        
       

     

       93
       93
        
             $machine->shutdown;

     

       94
       94
       +
           '';

     

       95
       95
       +
         };

     

       96
       96
       +
       

     

       97
       97
       +
         boot-ec2-config = makeEc2Test {

     

       98
       98
       +
           name         = "config-userdata";

     

       99
       99
       +
           sshPublicKey = snakeOilPublicKey;

     

       100
       100
       +
       

     

       101
       101
       +
           userData = ''

     

       102
       102
       +
             ### http://nixos.org/channels/nixos-unstable nixos

     

       103
       103
       +
             {

     

       104
       104
       +
               imports = [

     

       105
       105
       +
                 <nixpkgs/nixos/modules/virtualisation/amazon-image.nix>

     

       106
       106
       +
                 <nixpkgs/nixos/modules/testing/test-instrumentation.nix>

     

       107
       107
       +
               ];

     

       108
       108
       +
               environment.etc.testFile = {

     

       109
       109
       +
                 text = "whoa";

     

       110
       110
       +
               };

     

       111
       111
       +
             }

     

       112
       112
       +
           '';

     

       113
       113
       +
           script = ''

     

       114
       114
       +
             $machine->start;

     

       115
       115
       +
             $machine->waitForFile("/etc/testFile");

     

       116
       116
       +
             $machine->succeed("cat /etc/testFile | grep -q 'whoa'");

     

       94
       117
        
           '';

     

       95
       118
        
         };

     

       96
       119
        
       }