profiles/aira: using IPFS for channel distribution

airalab · Jan 4, 2019 · bc73708 · bc73708
1 parent f3a8795
commit bc73708
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 23 deletions.
diff --git a/nixos/modules/installer/aira.nix b/nixos/modules/installer/aira.nix
@@ -2,10 +2,7 @@
 
 {
 
-  imports = [
-    ../profiles/aira.nix
-    ../profiles/clone-config.nix
-  ];
+  imports = [ ../profiles/aira.nix ];
 
   # https://github.com/NixOS/nixpkgs/issues/26776
   systemd.services.sshd.wantedBy = lib.mkOverride 40 [ "multi-user.target" ];
@@ -19,8 +16,6 @@
 
     # Enable telemetry node
     liability.graph = true;
-
-    liability.package = pkgs.robonomics_comm-nightly;
   };
 
   programs.zsh = {

diff --git a/nixos/modules/profiles/aira.nix b/nixos/modules/profiles/aira.nix
@@ -4,7 +4,8 @@
 
   # Use AIRA channel by default
   # https://github.com/airalab/aira/issues/43
-  system.defaultChannel = "https://stable.releases.aira.life";
+  # Fetch channel information over IPFS
+  system.defaultChannel = "http://localhost:8080/ipns/stable.releases.aira.life";
 
   nix = {
     # Disable sandbox by default
@@ -21,22 +22,28 @@
     ];
   };
 
-  services.cjdns = {
-    enable = true;
+  services = {
+    # Enable IPFS network
+    ipfs.enable = true;
 
-    ETHInterface.bind = "all";
-    UDPInterface.bind = "0.0.0.0:42000";
+    # Enable IPv6 mesh network
+    cjdns = {
+      enable = true;
 
-    # AIRA project cjdns node
-    UDPInterface.connectTo."52.232.72.83:31259" = {
-      password = "tt3yb4613wgh3sgfsgkg1fvk24k6hnk";
-      publicKey = "jyl980gs5513dw5x19qp3khb6337ljsx3sgwbsmnsvvyb5jdcw90.k";
-    };
+      ETHInterface.bind = "all";
+      UDPInterface.bind = "0.0.0.0:42000";
+
+      # AIRA project cjdns node
+      UDPInterface.connectTo."52.232.72.83:31259" = {
+        password = "tt3yb4613wgh3sgfsgkg1fvk24k6hnk";
+        publicKey = "jyl980gs5513dw5x19qp3khb6337ljsx3sgwbsmnsvvyb5jdcw90.k";
+      };
 
-    # akru personal cjdns node
-    UDPInterface.connectTo."164.132.111.49:53741" = {
-      password = "cr36pn2tp8u91s672pw2uu61u54ryu8";
-      publicKey = "35mdjzlxmsnuhc30ny4rhjyu5r1wdvhb09dctd1q5dcbq6r40qs0.k";
+      # akru personal cjdns node
+      UDPInterface.connectTo."164.132.111.49:53741" = {
+        password = "cr36pn2tp8u91s672pw2uu61u54ryu8";
+        publicKey = "35mdjzlxmsnuhc30ny4rhjyu5r1wdvhb09dctd1q5dcbq6r40qs0.k";
+      };
     };
   };
 

diff --git a/nixos/release-aira.nix b/nixos/release-aira.nix
@@ -46,19 +46,19 @@ in rec {
       inherit system;
       modules =
         [ ./modules/installer/virtualbox-minimal.nix
-          ./modules/profiles/aira-foundation.nix
           ./modules/installer/aira.nix
+          ./modules/profiles/aira-foundation.nix
         ];
     }).config.system.build.virtualBoxOVA);
 
-  # A bootable SD card image
+  # A bootable SD card image for AArch64 SBCs.
   sd_image = with import nixpkgsSrc { system = "aarch64-linux"; };
     lib.hydraJob ((import lib/eval-config.nix {
       inherit system;
       modules =
         [ ./modules/installer/cd-dvd/sd-image-aarch64.nix
-          ./modules/profiles/aira-foundation.nix
           ./modules/installer/aira.nix
+          ./modules/profiles/aira-foundation.nix
         ];
     }).config.system.build.sdImage);