From 5821402d13f71b5f00c0ee3379c05fddb58f1d73 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Thu, 12 Nov 2020 23:50:09 +0100 Subject: [PATCH] terraform dummy server improvement --- images/translate-setup/README.md | 14 ++++++++++++++ terranix/dummy_server/config.nix | 23 +++++++++++++++++++---- terranix/dummy_server/shell.nix | 5 ++--- 3 files changed, 35 insertions(+), 7 deletions(-) diff --git a/images/translate-setup/README.md b/images/translate-setup/README.md index d69c570..d90ff40 100644 --- a/images/translate-setup/README.md +++ b/images/translate-setup/README.md @@ -19,3 +19,17 @@ nixos-generate -f vmware -c config.nix ``` nixos-generate --run -c config.nix ``` + +## how to install nixos-generators + +``` +nix-shell -I nixpkgs=channel:nixos-unstable -p nixos-generators +``` + +## how to start download service + +``` +iptables -F # kill firewall +python -m http.server 80 # nix-shell -p python3Full +``` + diff --git a/terranix/dummy_server/config.nix b/terranix/dummy_server/config.nix index 85ff990..3565d4a 100644 --- a/terranix/dummy_server/config.nix +++ b/terranix/dummy_server/config.nix @@ -2,9 +2,15 @@ let hcloud-modules = pkgs.fetchgit { url = "https://github.com/mrVanDalo/terranix-hcloud.git"; - rev = "c3571f76664e1813f90d97b8c194a1e0149e895e"; - sha256 = "0plld74wincyy3c5gdfqh78pzrqibxh6r839dm0c717fajr9imwb"; + rev = "5fa359a482892cd973dcc6ecfc607f4709f24495"; + sha256 = "0smgmdiklj98y71fmcdjsqjq8l41i66hs8msc7k4m9dpkphqk86p"; }; + + #nixosInfect = pkgs.fetchgit { + # "url" = "https://github.com/elitak/nixos-infect.git"; + # rev = "928f9e5e1d63e77a91f2ca57ffa2be1fef3078ec"; + #sha256 = "0rs84c549l863vbnnqgnx7v6m2zlq0wz46jbhm4v1l1a25d966s1"; + #}; in { imports = [ (toString hcloud-modules) ]; @@ -20,6 +26,17 @@ in { hcloud.nixserver = { playground = { enable = true; + channel = "nixos-20.09"; + provisioners = [ + #{ + # file.source = "${nixosInfect}/nixos-infect"; + # file.destination = "/root/nixos-infect"; + #} + { + file.source = "${toString ./../../images/translate-setup}"; + file.destination = "/root/translate-setup"; + } + ]; configurationFile = pkgs.writeText "configuration.nix" '' { pkgs, lib, config, ... }: { environment.systemPackages = [ pkgs.git ]; } @@ -27,6 +44,4 @@ in { }; }; - hcloud.export.nix = null; - } diff --git a/terranix/dummy_server/shell.nix b/terranix/dummy_server/shell.nix index 8b33b71..779d3ef 100644 --- a/terranix/dummy_server/shell.nix +++ b/terranix/dummy_server/shell.nix @@ -1,10 +1,9 @@ { pkgs ? import { } }: let - terranix = pkgs.callPackage (pkgs.fetchgit { url = "https://github.com/mrVanDalo/terranix.git"; - rev = "dfbf4d1fae08da8052ff880c5d02b2eb5857d54c"; - sha256 = "1qilbvldlq7ybxa3yx99hb8vbmj0sk5x9qqxa4f1czpzj2mja0fn"; + rev = "2.3.0"; + sha256 = "030067h3gjc02llaa7rx5iml0ikvw6szadm0nrss2sqzshsfimm4"; }) { }; terraform = pkgs.writers.writeBashBin "terraform" ''