Code reorganization.

Moving main code to src, keeping modules in modules/

6 files changed, 0 insertions, 239 deletions

diff --git a/module/ri-wireguard/src/main/resources/META-INF/kmodule.xml b/module/ri-wireguard/src/main/resources/META-INF/kmodule.xml
deleted file mode 100644
index de617f7..0000000
--- a/module/ri-wireguard/src/main/resources/META-INF/kmodule.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<kmodule xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://www.drools.org/xsd/kmodule"
-         xsi:schemaLocation="http://www.drools.org/xsd/kmodule https://www.drools.org/xsd/kmodule_7_1.xsd">
-
-  <kbase name="wireguard" packages="io.trygvis.rules.wireguard">
-<!--    <ksession name="wireguard"/>-->
-  </kbase>
-</kmodule>
diff --git a/module/ri-wireguard/src/main/resources/io/trygvis/rules/wireguard/wireguard.drl b/module/ri-wireguard/src/main/resources/io/trygvis/rules/wireguard/wireguard.drl
deleted file mode 100644
index 5630ab6..0000000
--- a/module/ri-wireguard/src/main/resources/io/trygvis/rules/wireguard/wireguard.drl
+++ /dev/null
@@ -1,185 +0,0 @@
-package io.trygvis.rules.wireguard;
-
-import io.trygvis.rules.dns.DnsEntry;
-import io.trygvis.rules.machine.Machine;
-import io.trygvis.rules.network.IpCalc
-import io.trygvis.rules.network.Ipv4Address
-import io.trygvis.rules.network.Ipv4Cidr
-import java.util.ArrayList
-import java.util.List
-import java.util.Map
-
-global io.trygvis.rules.engine.TemplateEngine te;
-
-dialect  "mvel"
-
-declare WgNet
-    name        : String
-    domain      : String
-    port        : int
-    linkCidr    : String
-    networkCidr : String
-    networkBits : int
-end
-
-declare WgIpPool
-    net  : WgNet
-    role : String
-    cidr : Ipv4Cidr
-end
-
-declare WgHost
-    machine     : Machine
-    net         : WgNet
-    publicName  : String
-    publicPort  : int
-    ip          : String // This host's IP
-    networkCidr : String
-end
-
-declare WgConnection
-    name : String
-    host : WgHost
-    to   : WgHost
-end
-
-declare WgIpAllocation
-    host : WgHost
-    role : String
-    ip   : Ipv4Address
-end
-
-rule "Create IP pools" when
-    $net : WgNet()
-//    not(Ipv4Cidr(network == Ipv4Cidr.parseCidr($net.linkCidr).network))
-then
-    System.out.println("Creating main IP pools");
-    insert(new WgIpPool($net, "link", Ipv4Cidr.parseCidr($net.getLinkCidr())))
-    insert(new WgIpPool($net, "networks", Ipv4Cidr.parseCidr($net.getNetworkCidr())))
-end
-
-rule "WgHost VPN machines"
-when
-    $machine : Machine()
-    $wgNet : WgNet(name == "vpn0")
-    not(WgHost(machine == $machine))
-then
-    WgHost wgHost = new WgHost();
-    wgHost.machine = $machine;
-    wgHost.net = $wgNet;
-    wgHost.publicName = $machine.fqdn;
-    wgHost.publicPort = $wgNet.port;
-    insert(wgHost)
-end
-
-rule "Set public name of WgHost"
-when
-    $host : WgHost(publicName == null)
-    $m    : Machine(this == $host.machine, fqdn != null)
-then
-    modify($host) {
-        publicName = $m.fqdn
-    }
-end
-
-rule "Make DNS entries for all VPN hosts"
-when
-    $h : WgHost()
-    not(DnsEntry(fqdn == "%s.%s".formatted($h.machine.name, $h.net.domain), type == "A"))
-then
-    String fqdn = "%s.%s".formatted($h.machine.name, $h.net.domain);
-    insert(DnsEntry.a(fqdn))
-end
-
-rule "Connect VPN nodes"
-    salience -1
-when
-    $h : WgHost()
-    $other : WgHost(publicName != null, this != $h)
-then
-    System.out.printf("VPN connection from %s to %s%n", $h.machine.name, $other.machine.name);
-    WgConnection c = new WgConnection();
-    c.host = $h;
-    c.to = $other;
-    insert(c)
-end
-
-rule "Name connections"
-when
-    $c : WgConnection(name == null, host != null, to != null)
-then
-    String n = $c.host.machine.name + "_x_" + $c.to.machine.name;
-    modify($c) {
-      name = n
-    }
-end
-
-// This and the next rule needs to use .toString(), the specific objects might be generated multiple times,
-// but Drools use identityHashCode() to find equal objects, not equals().
-rule "Assign IP"
-when
-    $pool : WgIpPool(role == "link")
-    $ip : Ipv4Address() from $pool.cidr.addresses()
-    not(WgHost(net == $pool.net, ip == $ip.toString()))
-    $host : WgHost(net == $pool.net, ip == null)
-then
-    System.out.printf("IP: net=%s, pool.role=%s, host=%s, ip=%s%n", $pool.net.name, $pool.role, $host.machine.name, $ip);
-    modify($host) {
-        ip = $ip.toString()
-    }
-end
-
-rule "Assign network CIDR"
-when
-    $net : WgNet()
-    $network : Ipv4Cidr() from Ipv4Cidr.parseCidr($net.networkCidr).partition($net.networkBits)
-    $host : WgHost(net == $net, networkCidr == null)
-    not(WgHost(net == $net, networkCidr == $network.toString()))
-then
-    System.out.printf("Network CIDR: net=%s, host=%s, network=%s%n", $net.name, $host.machine.name, $network);
-    modify($host) {
-        networkCidr = $network.toString()
-    }
-end
-
-rule "Generate per-net files"
-    agenda-group "generate"
-    salience 10
-when
-    $net : WgNet()
-    $hosts : ArrayList() from collect(WgHost(net == $net))
-then
-    te.template("wireguard/ansible", "wireguard-" + $net.name + ".yml", Map.of(
-            "net", $net
-    ));
-
-    List machines = new ArrayList();
-    for (Object o : $hosts) {
-        WgHost m = (WgHost) o;
-        machines.add(m.getMachine());
-    }
-
-    te.template("wireguard/inventory", "inventory.yml", Map.of(
-            "net", $net,
-            "hosts", machines
-    ));
-end
-
-rule "Generate per-net, per-host files"
-    agenda-group "generate"
-    salience 10
-when
-    $net : WgNet()
-    $host : WgHost(net == $net)
-    $peers : ArrayList() from accumulate(WgConnection(host == $host, $to: to), collectList($to))
-then
-    System.out.printf("Generating per-host files: net=%s, host=%s%n", $net.name, $host.machine.name);
-
-    String output = "host_vars/%s/wireguard.yml".formatted($host.machine.name);
-
-    te.template("wireguard/ansible-host", output, Map.of(
-            "net", $net,
-            "host", $host,
-            "peers", $peers
-    ));
-end
diff --git a/module/ri-wireguard/src/main/resources/logback.xml b/module/ri-wireguard/src/main/resources/logback.xml
deleted file mode 100644
index 66ae905..0000000
--- a/module/ri-wireguard/src/main/resources/logback.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<configuration>
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-        </encoder>
-    </appender>
-
-    <logger name="org.apache.http" level="WARN"/>
-    <root level="DEBUG">
-        <appender-ref ref="STDOUT" />
-    </root>
-
-</configuration>
diff --git a/module/ri-wireguard/src/main/resources/templates/wireguard/ansible-host.j2 b/module/ri-wireguard/src/main/resources/templates/wireguard/ansible-host.j2
deleted file mode 100644
index 6cb3a05..0000000
--- a/module/ri-wireguard/src/main/resources/templates/wireguard/ansible-host.j2
+++ /dev/null
@@ -1,12 +0,0 @@
-# Generated
-wireguard_port: {{ host.publicPort }}
-link_address: {{ host.ip }}
-network_cidr: {{ host.networkCidr }}
-wireguard_peers:
-{%- for peer in peers %}
-  {{ peer.machine.name }}:
-    public_address: {{ peer.publicName }}
-    public_port: {{ peer.publicPort }}
-    gateway: {{ peer.ip }}
-    network: {{ peer.networkCidr }}
-{%- endfor %}
diff --git a/module/ri-wireguard/src/main/resources/templates/wireguard/ansible.j2 b/module/ri-wireguard/src/main/resources/templates/wireguard/ansible.j2
deleted file mode 100644
index ad4d034..0000000
--- a/module/ri-wireguard/src/main/resources/templates/wireguard/ansible.j2
+++ /dev/null
@@ -1,7 +0,0 @@
-- hosts: wireguard_{{ net.name }}
-  vars:
-    wireguard_if: {{ net.name }}
-  tasks:
-    - name: wireguard
-      import_role:
-        name: wireguard
diff --git a/module/ri-wireguard/src/main/resources/templates/wireguard/inventory.j2 b/module/ri-wireguard/src/main/resources/templates/wireguard/inventory.j2
deleted file mode 100644
index 64f3b5b..0000000
--- a/module/ri-wireguard/src/main/resources/templates/wireguard/inventory.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-# Generated
-all:
-  hosts:
-  {%- for host in hosts %}
-    {{ host.getName() }}:
-      ansible_host: {{ host.getFqdn() }}
-  {%- endfor %}
-  children:
-    wireguard_{{ net.name }}:
-      hosts:
-{%- for host in hosts %}
-        {{ host.getName() }}:
-{%- endfor %}