From 7e7eacb5812aeb7fad143c9096fa8432db3fd043 Mon Sep 17 00:00:00 2001
From: Tom Prince <tom.prince@private.storage>
Date: Wed, 25 Aug 2021 21:49:32 -0600
Subject: [PATCH] stuff
---
morph/grid/local/arion-compose.nix | 22 +++++++++++++++++-----
nixpkgs-2105.nix | 4 +++-
nixpkgs-ps.json | 4 ++--
nixpkgs-ps.nix | 4 +++-
shell.nix | 8 +++++---
5 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/morph/grid/local/arion-compose.nix b/morph/grid/local/arion-compose.nix
index 1f8eb209..b8c7f879 100644
--- a/morph/grid/local/arion-compose.nix
+++ b/morph/grid/local/arion-compose.nix
@@ -27,7 +27,11 @@ let
node = { monitor-ip, public-ip }: { pkgs, lib, ...}: {
image.name = "localhost/nixos-test";
nixos.useSystemd = true;
- service.useHostStore = true;
+
+ #service.useHostStore = true;
+ image.includeStorePaths = false;
+ service.volumes = ["nix:/nix:ro"];
+
out.service = {
networks.privatestorage.ipv4_address = public-ip;
};
@@ -43,16 +47,17 @@ let
config = {
system.stateVersion = lib.mkDefault "19.09";
monitoringvpnIPv4 = monitor-ip;
+ services.openssh.enable = lib.mkForce false;
};
};
};
-
+
storage-node = { monitor-ip, public-ip }@args: { pkgs, lib, ...}: {
imports = [ (node args) ];
nixos.configuration = {
imports = [
gridlib.storage
- (gridlib.customize-storage config)
+ (gridlib.customize-storage config)
];
};
};
@@ -62,13 +67,20 @@ in
services.storage2 = storage-node { monitor-ip = "172.23.23.13"; public-ip = "10.88.2.31"; };
services.payment = { pkgs, lib, ...}: {
imports = [ (node { monitor-ip = "172.23.23.11"; public-ip = "10.88.2.32"; }) ];
- nixos.configuration = {
+ nixos.configuration = {config, ...}: {
imports = [
gridlib.issuer
- (gridlib.customize-issuer (config // {
+ (gridlib.customize-issuer (rawConfig // {
monitoringvpnIPv4 = "172.23.23.11";
}))
];
+ environment.etc = {
+ "secrets/payments-localdev-ssl" = {
+ mode = "direct-symlink";
+ source = "${config.deployment.privateKeyPath}/payments-localdev-ssl";
+ };
+ };
+ services.private-storage-issuer.tls = lib.mkForce false;
};
};
docker-compose.raw = {
diff --git a/nixpkgs-2105.nix b/nixpkgs-2105.nix
index 536d913b..dd54dfd5 100644
--- a/nixpkgs-2105.nix
+++ b/nixpkgs-2105.nix
@@ -1 +1,3 @@
-import (builtins.fetchTarball (builtins.fromJSON (builtins.readFile ./nixpkgs-2105.json)))
+let pkgs = import <nixpkgs> {};
+in
+import (pkgs.fetchzip (pkgs.lib.importJSON ./nixpkgs-2105.json))
diff --git a/nixpkgs-ps.json b/nixpkgs-ps.json
index 58add307..651237d6 100644
--- a/nixpkgs-ps.json
+++ b/nixpkgs-ps.json
@@ -1,4 +1,4 @@
{ "name": "nixpkgs"
-, "url": "https://github.com/PrivateStorageio/nixpkgs/archive/5ebd5af2d5c6caf23735c8c0e6bc27357fa8d2a8.tar.gz"
-, "sha256": "1g2bvs8prqjskzv8s1qmh36k7rmj98jib0syqbrq02xxzw5dpqb4"
+, "url": "https://github.com/tp-la/nixpkgs/archive/f0dbe36042a70e3601f287a887274fe82e3a95fd.tar.gz"
+, "sha256": "1lvmc1d5c36hsl4hir1z1bv4y7yvik6wky7dzzan2bscgbvnsm7x"
}
diff --git a/nixpkgs-ps.nix b/nixpkgs-ps.nix
index d98a5384..4048abb1 100644
--- a/nixpkgs-ps.nix
+++ b/nixpkgs-ps.nix
@@ -1 +1,3 @@
-import (builtins.fetchTarball (builtins.fromJSON (builtins.readFile ./nixpkgs-ps.json)))
+let pkgs = import <nixpkgs> {};
+in
+import (pkgs.fetchzip (pkgs.lib.importJSON ./nixpkgs-ps.json))
diff --git a/shell.nix b/shell.nix
index 09a57466..1cdd35c2 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,13 +1,15 @@
let
release2105 = import ./nixpkgs-2105.nix { };
in
-{ pkgs ? release2105 }:
+{ pkgs ? release2105
+, vagrant ? true
+}:
pkgs.mkShell {
NIX_PATH = "nixpkgs=${pkgs.path}";
buildInputs = [
pkgs.arion
pkgs.jp
+ pkgs.just
pkgs.morph
- pkgs.vagrant
- ];
+ ] ++ pkgs.lib.optional vagrant pkgs.vagrant;
}
--
GitLab