summaryrefslogtreecommitdiff
path: root/Com
diff options
context:
space:
mode:
authorBen Sima <ben@bsima.me>2020-04-03 16:43:51 -0700
committerBen Sima <ben@bsima.me>2020-04-03 16:43:51 -0700
commit0d37af4eba374c41a9ad3fa8d2f2251ddb6b58c5 (patch)
tree2fe862376d983f1b5470a2181defe0142c1b4560 /Com
parentc472472df38e0dcb4abe5745d8fdec48d7e4590b (diff)
Rename Serval to Prod
Diffstat (limited to 'Com')
-rw-r--r--Com/Simatime/Prod/configuration.nix (renamed from Com/Simatime/Serval/configuration.nix)0
-rwxr-xr-xCom/Simatime/Prod/hardware.nix (renamed from Com/Simatime/Serval/hardware.nix)0
-rwxr-xr-xCom/Simatime/Prod/networking.nix (renamed from Com/Simatime/Serval/networking.nix)0
-rw-r--r--Com/Simatime/Serval/Test.scm11
-rw-r--r--Com/Simatime/buildOS.nix6
5 files changed, 3 insertions, 14 deletions
diff --git a/Com/Simatime/Serval/configuration.nix b/Com/Simatime/Prod/configuration.nix
index d5ad02f..d5ad02f 100644
--- a/Com/Simatime/Serval/configuration.nix
+++ b/Com/Simatime/Prod/configuration.nix
diff --git a/Com/Simatime/Serval/hardware.nix b/Com/Simatime/Prod/hardware.nix
index 8c88cb7..8c88cb7 100755
--- a/Com/Simatime/Serval/hardware.nix
+++ b/Com/Simatime/Prod/hardware.nix
diff --git a/Com/Simatime/Serval/networking.nix b/Com/Simatime/Prod/networking.nix
index 79fbe27..79fbe27 100755
--- a/Com/Simatime/Serval/networking.nix
+++ b/Com/Simatime/Prod/networking.nix
diff --git a/Com/Simatime/Serval/Test.scm b/Com/Simatime/Serval/Test.scm
deleted file mode 100644
index 44e88c0..0000000
--- a/Com/Simatime/Serval/Test.scm
+++ /dev/null
@@ -1,11 +0,0 @@
-(define-module (Com Simatime Serval Test)
- #:use-module (Com Simatime Serval)
- #:use-module (Com Simatime core)
- #:use-module (Com Simatime Test))
-
-(comment
- ;; TODO: make this a real test
- (let ((kit (Kit "test-kit" "/nix/path" "/nix/config"
- "123.456.0.0" 80 "127.0.0.1" #t)))
- (testing "ser-deser are opposite functions"
- (equal? kit (deserialize (serialize kit))))))
diff --git a/Com/Simatime/buildOS.nix b/Com/Simatime/buildOS.nix
index b2fc928..eb20d88 100644
--- a/Com/Simatime/buildOS.nix
+++ b/Com/Simatime/buildOS.nix
@@ -7,9 +7,9 @@ nixos:
, deps ? {} # added under pkgs.biz
, configuration # see: configuration.nix(5)
}:
-assert enableVpn -> builtins.isString ipAddress;
-assert enableVpn -> builtins.isString vpnRsaPrivateKeyFile;
-assert enableVpn -> builtins.isString vpnEd25519PrivateKeyFile;
+# assert enableVpn -> builtins.isString ipAddress;
+# assert enableVpn -> builtins.isString vpnRsaPrivateKeyFile;
+# assert enableVpn -> builtins.isString vpnEd25519PrivateKeyFile;
let
vpnExtraConfig = if enableVpn then ''
ConnectTo = ${vpnConnectTo}