4 files changed, 12 insertions, 3 deletions
diff --git a/krebs/3modules/go.nix b/krebs/3modules/go.nix
index a86f444dc..218ac9221 100644
--- a/krebs/3modules/go.nix
+++ b/krebs/3modules/go.nix
@@ -44,7 +44,7 @@ let
       wantedBy = [ "multi-user.target" ];
 
       path = with pkgs; [
-        go
+        go-shortener
       ];
 
       environment = {
@@ -57,7 +57,7 @@ let
       serviceConfig = {
         User = "go";
         Restart = "always";
-        ExecStart = "${pkgs.go}/bin/go";
+        ExecStart = "${pkgs.go-shortener}/bin/go";
       };
     };
   };
diff --git a/krebs/3modules/retiolum.nix b/krebs/3modules/retiolum.nix
index fddaed9e3..ed99cc551 100644
--- a/krebs/3modules/retiolum.nix
+++ b/krebs/3modules/retiolum.nix
@@ -79,6 +79,15 @@ let
           '';
         };
 
+        hostsArchive = mkOption {
+          type = types.package;
+          default = pkgs.runCommand "retiolum-hosts.tar.bz2" {} ''
+            ${pkgs.coreutils}/bin/ln -s ${tinc.config.hostsPackage} hosts
+            ${pkgs.gnutar}/bin/tar -hcjf $out hosts
+          '';
+          readOnly = true;
+        };
+
         hostsPackage = mkOption {
           type = types.package;
           default = pkgs.stdenv.mkDerivation {
diff --git a/krebs/5pkgs/go/default.nix b/krebs/5pkgs/go-shortener/default.nix
index 2871e5a99..996f7072a 100644
--- a/krebs/5pkgs/go/default.nix
+++ b/krebs/5pkgs/go-shortener/default.nix
@@ -19,7 +19,7 @@ let
   };
 
 in np.buildNodePackage {
-  name = "go";
+  name = "go-shortener";
 
   src = fetchgit {
     url = "http://cgit.lassul.us/go/";
diff --git a/krebs/5pkgs/go/packages.nix b/krebs/5pkgs/go-shortener/packages.nix
index 9acfd7658..9acfd7658 100644
--- a/krebs/5pkgs/go/packages.nix
+++ b/krebs/5pkgs/go-shortener/packages.nix