Rename Serval to Prod

7 files changed, 19 insertions, 35 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}
diff --git a/default.nix b/default.nix
index 753483d..60b67b3 100644
--- a/default.nix
+++ b/default.nix
@@ -17,8 +17,6 @@ in rec {
   Com.Simatime.Cloud = buildOS {
     enableVpn = true;
     ipAddress = "159.89.128.69";
-    vpnRsaPrivateKeyFile = "/etc/tinc/rsa_key.priv";
-    vpnEd25519PrivateKeyFile = "/etc/tinc/ed25519_key.priv";
     configuration = {
       imports = [
         ./Com/Simatime/packages.nix
@@ -40,7 +38,7 @@ in rec {
   #
   Com.Simatime.Dev = buildOS {
     enableVpn = true;
-    ipAddress = "69.181.254.154";
+    ipAddress = "73.222.221.63";
     configuration = {
       imports = [
         ./Com/Simatime/packages.nix
@@ -52,20 +50,21 @@ in rec {
       networking.domain = "dev.simatime.com";
     };
   };
-  # Serval is the production server for apps
+  # The production server for apps
   #
-  Com.Simatime.Serval = buildOS {
+  Com.Simatime.Prod = buildOS {
     deps = { que-server = Run.Que.Server; };
     configuration = {
       imports = [
         ./Com/Simatime/packages.nix
-        ./Com/Simatime/Serval/hardware.nix
-        ./Com/Simatime/Serval/networking.nix
-        ./Com/Simatime/Serval/configuration.nix
+        ./Com/Simatime/users.nix
+        ./Com/Simatime/Prod/hardware.nix
+        ./Com/Simatime/Prod/networking.nix
+        ./Com/Simatime/Prod/configuration.nix
         ./Run/Que/service.nix
       ];
-      networking.hostName = "serval";
-      networking.domain = "serval.simatime.com";
+      networking.hostName = "prod";
+      networking.domain = "prod.simatime.com";
       boot.enableContainers = true;
     };
   };
diff --git a/push-all b/push-all
index cc89338..32d0c5a 100755
--- a/push-all
+++ b/push-all
@@ -1,15 +1,11 @@
 #!/usr/bin/env bash
+set -ex
 
-./bild Com.Simatime.Cloud
-./push Com.Simatime.Cloud simatime.com
+bild Com.Simatime.Cloud
+push Com.Simatime.Cloud simatime.com
 
-./bild Com.Simatime.Dev
-./push Com.Simatime.Dev dev.simatime.com
+bild Com.Simatime.Dev
+push Com.Simatime.Dev dev.simatime.com
 
-# these are todos:
-
-#bild Com.InfluencedByBooks
-#push Com.InfluencedByBooks influencedbybooks.com
-
-#bild Com.MusicMeetsComics
-#push Com.MusicMeetsComics musicmeetscomics.com
+bild Com.Simatime.Prod
+push Com.Simatime.Prod prod.simatime.com