Merge remote-tracking branch 'origin/master'

2 files changed, 20 insertions, 11 deletions

diff --git a/module/acme/src/main/resources/io/trygvis/acme/acme.drl b/module/acme/src/main/resources/io/trygvis/acme/acme.drl
index cb04b09..76bad0a 100644
--- a/module/acme/src/main/resources/io/trygvis/acme/acme.drl
+++ b/module/acme/src/main/resources/io/trygvis/acme/acme.drl
@@ -27,6 +27,8 @@ when
     $m : Machine(fqdn == null)
     $s : AcmeServer(machine == $m)
 then
-    $s.machine.fqdn = "%s.machine.acme.com.".formatted($s.machine.name);
-    update($s.machine)
+    var fqdn = "%s.machine.acme.com".formatted($m.name);
+    modify ($m) {
+        fqdn = fqdn
+    }
 end
diff --git a/module/acme/src/main/resources/io/trygvis/acme/apps/apps.drl b/module/acme/src/main/resources/io/trygvis/acme/apps/apps.drl
index 95f09c8..e7bdfe3 100644
--- a/module/acme/src/main/resources/io/trygvis/acme/apps/apps.drl
+++ b/module/acme/src/main/resources/io/trygvis/acme/apps/apps.drl
@@ -2,7 +2,8 @@ package io.trygvis.acme.apps;
 
 import io.trygvis.rules.machine.Machine;
 import io.trygvis.rules.dba.Cluster;
-import io.trygvis.rules.dba.Container;
+import io.trygvis.rules.dba.Container
+import io.trygvis.rules.dns.DnsZone;
 
 dialect "mvel"
 
@@ -12,22 +13,28 @@ when
 then
     var cluster = new Cluster("acme-ops");
     insert(cluster);
-    insert(new Container(cluster, "app", "pdb", "postgresql", "11"));
-    insert(new Container(cluster, "app", "n8n", "n8n", "0.84.1"));
+    insert(new Container(cluster, "pdb", "ops", "postgresql", "11"));
+    insert(new Container(cluster, "n8n", "ops", "n8n", "0.84.1"));
 end
 
 rule "MyApp"
 when
     $app: AcmeMyApp()
 then
+    var zone = new DnsZone($app.environment + ".acme.com");
+    insert(zone)
+
     var cluster = new Cluster("acme-myapp-" + $app.environment);
     insert(cluster);
 
+    var app = $app.environment + "-app";
+    var db = $app.environment + "-db";
+
     var tag = $app.dockerTag;
-    insert(new Container(cluster, "app", "statera", "statera", tag));
-    insert(new Container(cluster, "app", "statera-console", "statera-console", tag));
-    insert(new Container(cluster, "app", "4tune-web", "4tune-web", tag));
-    insert(new Container(cluster, "app", "4tune-api", "4tune-api", tag));
-    insert(new Container(cluster, "db", "pdb", "postgresql", "13"));
-    insert(new Container(cluster, "db", "mdb", "mongodb", "3.2"));
+    insert(new Container(cluster, "statera", app, "statera", tag));
+    insert(new Container(cluster, "statera-console", app, "statera-console", tag));
+    insert(new Container(cluster, "4tune-web", app, "4tune-web", tag));
+    insert(new Container(cluster, "4tune-api", app, "4tune-api", tag));
+    insert(new Container(cluster, "pdb", db, "postgresql", "13"));
+    insert(new Container(cluster, "mdb", db, "mongodb", "3.2"));
 end