Clean up of configurators

bin/terranix

@@ -177,6 +177,7 @@ _init() {
 # CLI commands
 
 init() {
+  mkdir -p .terranix
   cat > .terranix/input-transform.nix <<EOF
 { lib, ... }: with builtins; with lib; let
   requiredKeys = [ "name" "ip" "authorized_keys" ];
@@ -197,16 +198,20 @@ EOF
 }
 
 initFromJSON() {
-  [ -f ./terranix-input.json ] || { echo >&2 "Error: couldn't find input JSON at $PWD/terranix-input.json"; return 6; }
+  [ -f ./terranix-input.json ] \
+    || { echo >&2 "Error: couldn't find input JSON at $PWD/terranix-input.json"; return 6; }
+  mkdir -p .terranix
   cat > .terranix/input-transform.nix <<EOF
 { lib, ... }: lib.importJSON ../terranix-input.json;
 EOF
   _init
 }
 
 state() {
+  [ -f ./.terranix/input-transform.nix ] \
+    || { echo >&2 "Error: couldn't find input transform, try running: terranix init"; return 6; }
   nix-instantiate --eval-only --strict --json \
-    -E 'with import <nixpkgs> {};import .terranix/input-transform.nix {inherit lib;}' \
+    -E 'with import <nixpkgs> {};import ./.terranix/input-transform.nix {inherit lib;}' \
     || { echo >&2 "Error: input transform failed"; return 6; }
 }
 

default.nix

@@ -1,7 +1,7 @@
 let
   terranix = {
     stdenv, makeWrapper, lib, shellcheck,
-    glibcLocales, coreutils, jq, openssh, nix, git
+    glibcLocales, coreutils, gzip, gnutar, jq, openssh, nix, git
   }: stdenv.mkDerivation rec {
     name = "terranix-${version}";
     version = "0.0.0";
@@ -14,7 +14,7 @@ let
     buildPhase = "true";
     installPhase = let
       path = lib.makeBinPath [
-        coreutils jq openssh nix git
+        coreutils gzip gnutar jq openssh nix git
       ];
       locales = lib.optionalString (glibcLocales != null)
         "--set LOCALE_ARCHIVE \"${glibcLocales}\"/lib/locale/locale-archive";

examples/README.md

@@ -29,7 +29,7 @@ Init Terraform plugins and apply plan:
 
 ```sh
 terraform init
-terraform apply -auto-approve
+terraform apply
 ```
 
 Initialize TerraNix using Terraform state and push config to instances:
@@ -45,5 +45,5 @@ terranix push
 Check result by browsing to web server:
 
 ```sh
-xdg-open http://$(jq -r '."nixos-1".ip' < terranix-state.json)
+xdg-open http://$(terranix state | jq -r '."node-1".ip')
 ```

examples/aws/aws_nixos/main.tf

@@ -11,7 +11,6 @@ resource "aws_key_pair" "terranix" {
 
 resource "aws_instance" "nixos" {
   ami = "ami-0022b8ea9efde5de4" #nixos
-  #ami = "ami-0cddf7994f6cbae36" # ubuntu 16.04
   instance_type = "t2.micro"
   key_name = "${aws_key_pair.terranix.key_name}"
   security_groups = ["${var.sg}"]

examples/aws/main.tf

@@ -3,8 +3,8 @@ provider "aws" {
   region  = "eu-central-1"
 }
 
-resource "aws_security_group" "nixos" {
-  name = "allow-all-sg"
+resource "aws_security_group" "default" {
+  name = "allow-ssh-http-sg"
 
   ingress {
     cidr_blocks = [ "0.0.0.0/0" ]
@@ -31,6 +31,6 @@ resource "aws_security_group" "nixos" {
 module "aws-1" {
   source  = "./aws_nixos"
   name    = "aws-1"
-  sg = "${aws_security_group.nixos.name}"
+  sg = "${aws_security_group.default.name}"
   authorized_keys = [ "${file("${path.module}/../ssh_key.pub")}" ]
 }

examples/aws/terranix.nix

@@ -1,24 +1 @@
-let
-  httpServer = content: { pkgs, ... }: {
-    networking.firewall.allowedTCPPorts = [ 80 443 ];
-    services.nginx = {
-      enable = true;
-      virtualHosts.localhost = {
-        locations."/" = {
-          root = pkgs.runCommand "hej" {} ''
-            mkdir -p $out
-            printf %s '${content}' > $out/index.html
-          '';
-        };
-      };
-    };
-  };
-in {
-  "aws-1" = { config, ... }: {
-    require = [
-      (httpServer ''
-        hej hej Im nixos-1 : ${config.terranix.aws-1.ip}
-      '')
-    ];
-  };
-}
+import ../network-1-node.nix

examples/common.nix

@@ -0,0 +1,30 @@
+{
+  http-server = content: { pkgs, ... }: {
+    networking.firewall.allowedTCPPorts = [ 80 443 ];
+    services.nginx = {
+      enable = true;
+      virtualHosts.localhost = {
+        locations."/" = {
+          root = pkgs.runCommand "http-server-content" {} ''
+            mkdir -p $out
+            cat > $out/index.html <<EOF
+            <pre>
+            ${content}
+            </pre>
+            EOF
+            '';
+        };
+      };
+    };
+  };
+
+  info = with builtins; cfg:
+    concatStringsSep "" (map (x: ''
+
+      ${x.name}
+      ==============
+      provider: ${x.provider}
+      ip: ${x.ip}
+      '') (attrValues cfg)
+    );
+}

examples/do/terranix.nix

@@ -1,24 +1 @@
-let
-  httpServer = content: { pkgs, ... }: {
-    networking.firewall.allowedTCPPorts = [ 80 443 ];
-    services.nginx = {
-      enable = true;
-      virtualHosts.localhost = {
-        locations."/" = {
-          root = pkgs.runCommand "hej" {} ''
-            mkdir -p $out
-            printf %s '${content}' > $out/index.html
-          '';
-        };
-      };
-    };
-  };
-in {
-  "do-1" = { config, ... }: {
-    require = [
-      (httpServer ''
-        hej hej Im nixos-1 : ${config.terranix.do-1.ip}
-      '')
-    ];
-  };
-}
+import ../network-1-node.nix

examples/hcloud/hcloud_nixos/main.tf

@@ -0,0 +1,32 @@
+variable "name" {}
+variable "authorized_keys" {
+  type = "list"
+}
+
+resource "hcloud_ssh_key" "default" {
+  name       = "Some SSH key"
+  public_key = "${var.authorized_keys[0]}"
+}
+
+resource "hcloud_server" "ubuntu" {
+  name = "terranix-${var.name}"
+  server_type = "cx11"
+  image = "ubuntu-18.04"
+  ssh_keys = ["${hcloud_ssh_key.default.id}"]
+}
+
+output "provider" {
+  value = "hcloud"
+}
+
+output "name" {
+  value = "${var.name}"
+}
+
+output "ip" {
+  value = "${hcloud_server.ubuntu.ipv4_address}"
+}
+
+output "authorized_keys" {
+  value = ["${var.authorized_keys[0]}"]
+}

examples/hcloud/main.tf

@@ -0,0 +1,11 @@
+variable "hcloud_token" {}
+
+provider "hcloud" {
+  token = "${var.hcloud_token}"
+}
+
+module "node-1" {
+  source  = "./hcloud_nixos"
+  name    = "node-1"
+  authorized_keys = [ "${file("${path.module}/../ssh_key.pub")}" ]
+}

examples/hcloud/terranix.nix

@@ -0,0 +1 @@
+import ../network-1-node.nix

examples/libvirt/main.tf

@@ -2,14 +2,14 @@ provider "libvirt" {
   uri = "qemu:///system"
 }
 
-module "nixos-1" {
+module "node-1" {
   source  = "./libvirt_nixos"
-  name    = "nixos-1"
+  name    = "node-1"
   authorized_keys = [ "${file("${path.module}/../ssh_key.pub")}" ]
 }
 
-module "nixos-2" {
+module "node-2" {
   source  = "./libvirt_nixos"
-  name    = "nixos-2"
+  name    = "node-2"
   authorized_keys = [ "${file("${path.module}/../ssh_key.pub")}" ]
 }

examples/libvirt/terranix.nix

@@ -1,26 +1 @@
-let
-  # libvirt specific configuration
-  virtlib = ./libvirt_nixos/conf.nix;
-
-  httpServer = content: { pkgs, ... }: {
-    networking.firewall.allowedTCPPorts = [ 80 443 ];
-    services.nginx = {
-      enable = true;
-      virtualHosts.localhost = {
-        locations."/" = {
-          root = pkgs.runCommand "hej" {} ''
-            mkdir -p $out
-            printf %s '${content}' > $out/index.html
-          '';
-        };
-      };
-    };
-  };
-in {
-  "nixos-1" = { config, ... }: { require = [ virtlib (httpServer ''
-    hej hej Im nixos-1 : ${config.terranix.nixos-1.ip}
-  '') ]; };
-  "nixos-2" = { config, ... }: { require = [ virtlib (httpServer ''
-    hello my name is nixos-2 and my IP is ${config.terranix.nixos-2.ip}
-  '') ]; };
-}
+import ../network-2-nodes.nix

examples/network-1-node.nix

@@ -0,0 +1,10 @@
+let
+  common = import ./common.nix;
+in {
+  "node-1" = { config, ... }: {
+    require = [ (common.http-server ''
+      hej hej I'm node-1
+      ${common.info config.terranix}
+    '') ];
+  };
+}

examples/network-2-nodes.nix

@@ -0,0 +1,16 @@
+let
+  common = import ./common.nix;
+in {
+  "node-1" = { config, ... }: {
+    require = [ (common.http-server ''
+      hej hej I'm node-1
+      ${common.info config.terranix}
+    '') ];
+  };
+  "node-2" = { config, ... }: {
+    require = [ (common.http-server ''
+      hello my name is node-2
+      ${common.info config.terranix}
+    '') ];
+  };
+}

examples/shell.nix

@@ -7,11 +7,10 @@
 
 let
   pkgs = (import nixpkgs {});
-  inherit (pkgs.lib.strings) concatStringsSep;
 
   terranix = import ./.. { inherit pkgs; };
   terraform = pkgs.terraform_0_11.withPlugins (p: with p; [
-    libvirt template digitalocean aws
+    libvirt template digitalocean aws hcloud
   ]);
 in
   pkgs.mkShell rec {