6 files changed, 0 insertions, 120 deletions

diff --git a/modules/private/vpn/default.nix b/modules/private/vpn/default.nix
deleted file mode 100644
index d4b197d..0000000
--- a/modules/private/vpn/default.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-{ config, pkgs, lib, ... }:
-let
-  cfg = config.myServices.vpn;
-in
-{
-  options.myServices = {
-    vpn.enable = lib.mkEnableOption "Enable vpn service";
-  };
-
-  config = lib.mkIf cfg.enable {
-    secrets.keys = {
-      "tinc/key.priv" = {
-        user = "root";
-        group = "root";
-        permissions = "0400";
-        text = config.myEnv.vpn.eldiron.privateKey;
-      };
-      "tinc/key.pub" = {
-        user = "root";
-        group = "root";
-        permissions = "0400";
-        text = config.myEnv.vpn.eldiron.publicKey;
-      };
-    };
-    networking.firewall.allowedTCPPorts = [ 655 1194 ];
-    system.activationScripts.tinc = let
-      configFiles = pkgs.runCommand "tinc-files" {
-        mainInterface = "eth0";
-        hostName = "ImmaeEu";
-        network = "Immae";
-        keyFile = config.secrets.fullPaths."tinc/key.priv";
-      } ''
-        mkdir -p $out
-        for i in ${./tinc}/*; do
-          substituteAll $i $out/$(basename $i)
-        done
-      '';
-    in ''
-      install -m750 -o root -g root -d /var/lib/tinc/ /var/lib/tinc/Immae
-      install -m700 -o root -g root -t /var/lib/tinc/Immae ${configFiles}/{host-*,tinc-*}
-      install -m400 -o root -g root -t /var/lib/tinc/Immae ${configFiles}/tinc.conf
-      if [ ! -d /var/lib/tinc/Immae/hosts ]; then
-        ${pkgs.git}/bin/git clone -b master https://git.immae.eu/perso/Immae/Config/tinc/hosts /var/lib/tinc/Immae/hosts
-      fi
-    '';
-
-    systemd.slices.tinc = {
-      description = "Tinc slice";
-    };
-
-    systemd.services.tinc-Immae = {
-      description = "Tinc Daemon - Immae";
-      wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" ];
-      path = [ pkgs.tinc pkgs.bashInteractive pkgs.iproute pkgs.gnused pkgs.gawk pkgs.git pkgs.glibc ];
-      serviceConfig = {
-        Slice = "tinc.slice";
-        Type = "simple";
-        Restart = "always";
-        RestartSec = "3";
-        ExecStart = "${pkgs.tinc}/bin/tincd -d1 -D -c /var/lib/tinc/Immae --pidfile /run/tinc.Immae.pid";
-      };
-    };
-  };
-}
diff --git a/modules/private/vpn/tinc/host-down b/modules/private/vpn/tinc/host-down
deleted file mode 100755
index 1e79bd3..0000000
--- a/modules/private/vpn/tinc/host-down
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-SUBDOMAIN=$(echo "$NODE" | sed -e "s/\([A-Z][a-z0-9]*\)/\L\1 /g;" | awk '{ for (i=NF; i>1; i--) printf("%s.",$i); print $1; }')
-NODEIPS=`getent hosts ${SUBDOMAIN}.immae.eu | cut -d' ' -f1 | tr "\\n" ' '`
-for NODEIP in $NODEIPS; do
-  ip neigh del proxy $NODEIP dev @mainInterface@
-done
diff --git a/modules/private/vpn/tinc/host-up b/modules/private/vpn/tinc/host-up
deleted file mode 100755
index 2f7cee2..0000000
--- a/modules/private/vpn/tinc/host-up
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-SUBDOMAIN=$(echo "$NODE" | sed -e "s/\([A-Z][a-z0-9]*\)/\L\1 /g;" | awk '{ for (i=NF; i>1; i--) printf("%s.",$i); print $1; }')
-while [ -z "$NODEIPS" ]; do
-  NODEIPS=`getent hosts ${SUBDOMAIN}.immae.eu | cut -d' ' -f1 | tr "\\n" ' '`
-  sleep 5
-done
-for NODEIP in $NODEIPS; do
-  ip neigh add proxy $NODEIP dev @mainInterface@
-done
-(cd /var/lib/tinc/@network@/hosts && git pull -q origin master) || true
diff --git a/modules/private/vpn/tinc/tinc-down b/modules/private/vpn/tinc/tinc-down
deleted file mode 100755
index 1cc45c0..0000000
--- a/modules/private/vpn/tinc/tinc-down
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-# This file closes down the tap device.
-
-echo 0 > /proc/sys/net/ipv6/conf/@mainInterface@/proxy_ndp
-echo 0 > /proc/sys/net/ipv6/conf/all/forwarding
-
-GWIP=`getent hosts gw.vpn.immae.eu | head -n1 | cut -d' ' -f1`
-
-ip neigh del proxy $GWIP dev eth0
-
-ip -6 addr del $GWIP/96 dev $INTERFACE
-ip -6 link set $INTERFACE down
diff --git a/modules/private/vpn/tinc/tinc-up b/modules/private/vpn/tinc/tinc-up
deleted file mode 100755
index 26c1ec3..0000000
--- a/modules/private/vpn/tinc/tinc-up
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-echo 1 > /proc/sys/net/ipv6/conf/@mainInterface@/proxy_ndp
-echo 1 > /proc/sys/net/ipv6/conf/all/forwarding
-
-SUBNET=`getent hosts sn.vpn.immae.eu | head -n1 | cut -d' ' -f1`
-GWIP=`getent hosts gw.vpn.immae.eu | head -n1 | cut -d' ' -f1`
-
-ip -6 link set $INTERFACE up mtu 1280 txqueuelen 1000
-
-ip -6 addr add $GWIP/96 dev $INTERFACE
-ip -6 route add $SUBNET/80 dev $INTERFACE
-
-ip neigh add proxy $GWIP dev @mainInterface@
diff --git a/modules/private/vpn/tinc/tinc.conf b/modules/private/vpn/tinc/tinc.conf
deleted file mode 100644
index 7a4f103..0000000
--- a/modules/private/vpn/tinc/tinc.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-BindToAddress = * 655
-BindToAddress = * 1194
-
-Name = @hostName@
-Interface = vpn6
-
-Mode = switch
-
-Device = /dev/net/tun
-GraphDumpFile = /var/lib/tinc/@network@/tinc_graph
-PrivateKeyFile = @keyFile@