Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into anemish/coinbase
- Loading branch information
Showing
74 changed files
with
8,376 additions
and
8,158 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| nix/stack.materialized | ||
| nix/sources.nix |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,46 +1,48 @@ | ||
| { machines, stdOverlays, nixpkgsLocation, ... }: node: pkgs: | ||
| { | ||
| nixpkgs.overlays = stdOverlays; | ||
| nix = { | ||
| nixPath = [ "nixpkgs=${nixpkgsLocation}" | ||
| ]; | ||
| binaryCaches = [ https://hydra.iohk.io https://cache.nixos.org ]; | ||
| requireSignedBinaryCaches = false; | ||
| extraOptions = '' | ||
| build-cores = 8 | ||
| auto-optimise-store = true | ||
| ''; | ||
| trustedBinaryCaches = [ https://hydra.iohk.io ]; | ||
| binaryCachePublicKeys = [ | ||
| "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" | ||
| ]; | ||
| gc.automatic = true; | ||
| gc.options = "--delete-older-than 7d"; | ||
| }; | ||
|
|
||
| ## This was temporarily required when upgrading to 20.03 (weirdly from 19.09) | ||
| ## In future upgrades you may need to set this to 20.03 (or 29.03, not sure) and deploy then remove and deploy again | ||
| # system.stateVersion = "19.03"; | ||
|
|
||
| imports = [ <nixpkgs/nixos/modules/virtualisation/amazon-image.nix> ]; | ||
|
|
||
| systemd.services.amazon-init.wantedBy = pkgs.lib.mkForce [ ]; | ||
|
|
||
| ec2.hvm = true; | ||
|
|
||
| networking.timeServers = [ "1.amazon.pool.ntp.org" "2.amazon.pool.ntp.org" "3.amazon.pool.ntp.org" ]; | ||
|
|
||
| ## Disable journald ratelimiting. | ||
| services.journald.rateLimitBurst = 0; | ||
|
|
||
| ## This makes our networking stack ignore the AWS MTU advertisement of 9001, | ||
| ## that silently breaks intra-VPC, for some reason. | ||
| ## The intent of this is to reduce the MTU to 1500. | ||
| networking.dhcpcd.extraConfig = '' | ||
| nooption interface_mtu | ||
| ''; | ||
|
|
||
| users.extraUsers.root.openssh.authorizedKeys.keys = machines.rootSshKeys; | ||
| services.fail2ban.enable = true; | ||
| nixpkgs.overlays = stdOverlays; | ||
| nix = { | ||
| nixPath = [ | ||
| "nixpkgs=${nixpkgsLocation}" | ||
| ]; | ||
| binaryCaches = [ https://hydra.iohk.io https://cache.nixos.org ]; | ||
| requireSignedBinaryCaches = false; | ||
| extraOptions = '' | ||
| build-cores = 8 | ||
| auto-optimise-store = true | ||
| ''; | ||
| trustedBinaryCaches = [ https://hydra.iohk.io ]; | ||
| binaryCachePublicKeys = [ | ||
| "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" | ||
| "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" | ||
| ]; | ||
| gc.automatic = true; | ||
| gc.options = "--delete-older-than 7d"; | ||
| }; | ||
|
|
||
| ## This was temporarily required when upgrading to 20.03 (weirdly from 19.09) | ||
| ## In future upgrades you may need to set this to 20.03 (or 29.03, not sure) and deploy then remove and deploy again | ||
| # system.stateVersion = "19.03"; | ||
|
|
||
| imports = [ <nixpkgs/nixos/modules/virtualisation/amazon-image.nix> ]; | ||
|
|
||
| systemd.services.amazon-init.wantedBy = pkgs.lib.mkForce [ ]; | ||
|
|
||
| ec2.hvm = true; | ||
|
|
||
| networking.timeServers = [ "1.amazon.pool.ntp.org" "2.amazon.pool.ntp.org" "3.amazon.pool.ntp.org" ]; | ||
|
|
||
| ## Disable journald ratelimiting. | ||
| services.journald.rateLimitBurst = 0; | ||
|
|
||
| ## This makes our networking stack ignore the AWS MTU advertisement of 9001, | ||
| ## that silently breaks intra-VPC, for some reason. | ||
| ## The intent of this is to reduce the MTU to 1500. | ||
| networking.dhcpcd.extraConfig = '' | ||
| nooption interface_mtu | ||
| ''; | ||
|
|
||
| users.extraUsers.root.openssh.authorizedKeys.keys = machines.rootSshKeys; | ||
| services.fail2ban.enable = true; | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,19 @@ | ||
| let | ||
| playground = import ../../. {}; | ||
| playground = import ../../. { }; | ||
| machines = (playground.pkgs.lib.importJSON ./machines.json); | ||
| mkInstance = node: | ||
| { | ||
| { | ||
| deployment.targetHost = node.ip; | ||
| deployment.hasFastConnection = true; | ||
| }; | ||
| }; | ||
| playgroundA = mkInstance machines.playgroundA; | ||
| playgroundB = mkInstance machines.playgroundB; | ||
| webGhcA = mkInstance machines.webghcA; | ||
| webGhcB = mkInstance machines.webghcB; | ||
| nixops = { deployment.targetHost = "localhost"; }; | ||
| in | ||
| { inherit playgroundA playgroundB webGhcA webGhcB nixops; | ||
| network.description = "Plutus Playground"; | ||
| network.enableRollback = true; | ||
| } | ||
| { | ||
| inherit playgroundA playgroundB webGhcA webGhcB nixops; | ||
| network.description = "Plutus Playground"; | ||
| network.enableRollback = true; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.