From dbcdd7b4199b46140d8010642d6dc84d5f7e3f8c Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 10 Sep 2018 13:56:24 +0200
Subject: [PATCH 1/3] ma iso.euer.krebsco.de: init
---
1systems/iso/config.nix | 1 +
2configs/nginx/iso.euer.nix | 25 +++++++++++++++++++++++++
2 files changed, 26 insertions(+)
create mode 100644 2configs/nginx/iso.euer.nix
diff --git a/1systems/iso/config.nix b/1systems/iso/config.nix
index f863321..34a75db 100644
--- a/1systems/iso/config.nix
+++ b/1systems/iso/config.nix
@@ -11,6 +11,7 @@ with import <stockholm/lib>;
# TODO: NIX_PATH and nix.nixPath are being set by default.nix right now
# cd ~/stockholm ; nix-build -A config.system.build.isoImage -I nixos-config=makefu/1systems/iso.nix -I secrets=/home/makefu/secrets/iso /var/src/nixpkgs/nixos
krebs.build.host = config.krebs.hosts.iso;
+ isoImage.isoBaseName = lib.mkForce "stockholm";
krebs.hidden-ssh.enable = true;
environment.systemPackages = with pkgs; [
aria2
diff --git a/2configs/nginx/iso.euer.nix b/2configs/nginx/iso.euer.nix
new file mode 100644
index 0000000..63ef380
--- /dev/null
+++ b/2configs/nginx/iso.euer.nix
@@ -0,0 +1,25 @@
+{config, pkgs, ... }:
+let
+ system = builtins.currentSystem; #we can also build for other platforms
+ iso = (import <nixpkgs/nixos/lib/eval-config.nix>
+ { inherit system;
+ modules = [ ../../1systems/iso/config.nix ]; }
+
+ );
+ image = iso.config.system.build.isoImage;
+ name = iso.config.isoImage.isoName;
+in
+{
+ services.nginx = {
+ virtualHosts = {
+ "iso.euer.krebsco.de" = {
+ enableACME = true;
+ forceSSL = true;
+ locations."/" = {
+ root = "${image}/iso";
+ index = name;
+ };
+ };
+ };
+ };
+}
From e5a5a1fed63ce3512d5fab57866ce81a8375160b Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 10 Sep 2018 14:56:24 +0200
Subject: [PATCH 2/3] ma iso.euer.krebsco.de: expose iso as drivedroid repo
---
2configs/nginx/iso.euer.nix | 27 ++++++++++++++++++++++-----
1 file changed, 22 insertions(+), 5 deletions(-)
diff --git a/2configs/nginx/iso.euer.nix b/2configs/nginx/iso.euer.nix
index 63ef380..522b7f6 100644
--- a/2configs/nginx/iso.euer.nix
+++ b/2configs/nginx/iso.euer.nix
@@ -1,4 +1,4 @@
-{config, pkgs, ... }:
+{ config, pkgs, ... }:
let
system = builtins.currentSystem; #we can also build for other platforms
iso = (import <nixpkgs/nixos/lib/eval-config.nix>
@@ -8,6 +8,25 @@ let
);
image = iso.config.system.build.isoImage;
name = iso.config.isoImage.isoName;
+
+ drivedroid-cfg = builtins.toJSON [{
+ id = "stockholm";
+ name = "stockholm";
+ tags = [ "hybrid" ];
+ url = http://krebsco.de;
+ releases = [
+ { version = iso.config.system.nixos.label;
+ url = "/stockholm.iso";
+ arch = system; }
+ ];
+ # size = TODO;
+ }];
+ web = pkgs.linkFarm "web" [{
+ name = "drivedroid.json";
+ path = pkgs.writeText "drivedroid.json" drivedroid-cfg; }
+ { name = "stockholm.iso";
+ path = "${image}/iso/${name}"; }
+ ];
in
{
services.nginx = {
@@ -15,10 +34,8 @@ in
"iso.euer.krebsco.de" = {
enableACME = true;
forceSSL = true;
- locations."/" = {
- root = "${image}/iso";
- index = name;
- };
+ root = web;
+ locations."/".index = "drivedroid.json";
};
};
};
From 884b356e2e2c445b40750ab3ce313c28708c2b61 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 10 Sep 2018 17:13:24 +0200
Subject: [PATCH 3/3] ma iso.euer: add imageUrl
---
2configs/nginx/iso.euer.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/2configs/nginx/iso.euer.nix b/2configs/nginx/iso.euer.nix
index 522b7f6..701609d 100644
--- a/2configs/nginx/iso.euer.nix
+++ b/2configs/nginx/iso.euer.nix
@@ -11,6 +11,7 @@ let
drivedroid-cfg = builtins.toJSON [{
id = "stockholm";
+ imageUrl = http://krebsco.de/krebs-v2.png;
name = "stockholm";
tags = [ "hybrid" ];
url = http://krebsco.de;