From fa38155eec9563dc9dc620a77900d87b97443cfe Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sat, 15 Jul 2017 18:57:16 +0200
Subject: ma: move systems to subdir, init source

---
 makefu/1systems/wry/config.nix | 54 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 makefu/1systems/wry/config.nix

(limited to 'makefu/1systems/wry')

diff --git a/makefu/1systems/wry/config.nix b/makefu/1systems/wry/config.nix
new file mode 100644
index 000000000..f5097bf40
--- /dev/null
+++ b/makefu/1systems/wry/config.nix
@@ -0,0 +1,54 @@
+{ config, lib, pkgs, ... }:
+
+with import <stockholm/lib>;
+let
+
+  external-ip = config.krebs.build.host.nets.internet.ip4.addr;
+  internal-ip = config.krebs.build.host.nets.retiolum.ip4.addr;
+in {
+  imports = [
+      ../.
+      # TODO: copy this config or move to krebs
+      ../2configs/hw/CAC.nix
+      ../2configs/fs/CAC-CentOS-7-64bit.nix
+      ../2configs/save-diskspace.nix
+
+      # ../2configs/bepasty-dual.nix
+
+      ../2configs/iodined.nix
+      ../2configs/backup.nix
+
+      # other nginx
+      # ../2configs/nginx/euer.test.nix
+
+      # collectd
+      ../2configs/stats/client.nix
+      ../2configs/logging/client.nix
+
+      ../2configs/tinc/retiolum.nix
+      # ../2configs/torrent.nix
+  ];
+
+  krebs.build.host = config.krebs.hosts.wry;
+
+  # prepare graphs
+  services.nginx.enable = true;
+  krebs.retiolum-bootstrap.enable = true;
+
+  networking = {
+    firewall = {
+      allowPing = true;
+      logRefusedConnections = false;
+      allowedTCPPorts = [ 53 80 443 ];
+      allowedUDPPorts = [ 655 53 ];
+    };
+    interfaces.enp2s1.ip4 = [{
+      address = external-ip;
+      prefixLength = 24;
+    }];
+    defaultGateway = "104.233.87.1";
+    nameservers = [ "8.8.8.8" ];
+  };
+
+  environment.systemPackages = [ pkgs.screen ];
+}
-- 
cgit v1.2.3


From 7704f80890c75f65c2906ecc17cdd89761d308ad Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sat, 15 Jul 2017 19:01:02 +0200
Subject: ma: replace path to 2configs, init source.nix

---
 makefu/1systems/wry/config.nix | 24 ++++++++++++------------
 makefu/1systems/wry/source.nix |  3 +++
 2 files changed, 15 insertions(+), 12 deletions(-)
 create mode 100644 makefu/1systems/wry/source.nix

(limited to 'makefu/1systems/wry')

diff --git a/makefu/1systems/wry/config.nix b/makefu/1systems/wry/config.nix
index f5097bf40..2db1a9a95 100644
--- a/makefu/1systems/wry/config.nix
+++ b/makefu/1systems/wry/config.nix
@@ -7,26 +7,26 @@ let
   internal-ip = config.krebs.build.host.nets.retiolum.ip4.addr;
 in {
   imports = [
-      ../.
+      <stockholm/makefu>
       # TODO: copy this config or move to krebs
-      ../2configs/hw/CAC.nix
-      ../2configs/fs/CAC-CentOS-7-64bit.nix
-      ../2configs/save-diskspace.nix
+      <stockholm/makefu/2configs/hw/CAC.nix>
+      <stockholm/makefu/2configs/fs/CAC-CentOS-7-64bit.nix>
+      <stockholm/makefu/2configs/save-diskspace.nix>
 
-      # ../2configs/bepasty-dual.nix
+      # <stockholm/makefu/2configs/bepasty-dual.nix>
 
-      ../2configs/iodined.nix
-      ../2configs/backup.nix
+      <stockholm/makefu/2configs/iodined.nix>
+      <stockholm/makefu/2configs/backup.nix>
 
       # other nginx
-      # ../2configs/nginx/euer.test.nix
+      # <stockholm/makefu/2configs/nginx/euer.test.nix>
 
       # collectd
-      ../2configs/stats/client.nix
-      ../2configs/logging/client.nix
+      <stockholm/makefu/2configs/stats/client.nix>
+      <stockholm/makefu/2configs/logging/client.nix>
 
-      ../2configs/tinc/retiolum.nix
-      # ../2configs/torrent.nix
+      <stockholm/makefu/2configs/tinc/retiolum.nix>
+      # <stockholm/makefu/2configs/torrent.nix>
   ];
 
   krebs.build.host = config.krebs.hosts.wry;
diff --git a/makefu/1systems/wry/source.nix b/makefu/1systems/wry/source.nix
new file mode 100644
index 000000000..fac3877ee
--- /dev/null
+++ b/makefu/1systems/wry/source.nix
@@ -0,0 +1,3 @@
+import <stockholm/makefu/source.nix> {
+  name="wry";
+}
-- 
cgit v1.2.3