Improve config (json) file creation

.env

@@ -1 +0,0 @@
-DATABASE_URL="sqlite://emgauwa-dev.sqlite"

.gitignore

@@ -1,15 +1,8 @@
-/target/
-
-/tests/testing/
-/tests/testing_bak/
-/tests/testing_latest/
-
-emgauwa-*.sqlite
-emgauwa-*.sqlite-*
-emgauwa-*.json
-
-
-# Added by cargo
-
 /target
+
+/.env
 /api.http
+
+/emgauwa-*.sqlite
+/emgauwa-*.sqlite-*
+/emgauwa-*.json

Makefile

@@ -1,5 +1,13 @@
+ifneq (,$(wildcard ./.env))
+    include .env
+    export
+endif
+
+DATABASE_URL ?= sqlite://emgauwa-dev.sqlite
+export DATABASE_URL
+
 sqlx:
-	cargo sqlx database drop
+	cargo sqlx database drop -y
 	cargo sqlx database create
 	cargo sqlx migrate run
 	cargo sqlx prepare --workspace
@@ -7,9 +15,16 @@ sqlx:
 build-rpi:
 	cross build --target arm-unknown-linux-gnueabihf
 
-emgauwa-%.json: config/emgauwa-%.pkl config/lib/%.pkl config/lib/common.pkl
+emgauwa-%.json: config/emgauwa-%.pkl config/lib/%.pkl config/lib/common.pkl $(wildcard .env)
 	pkl eval -f json -o $@ $<
 
 configs:
 	$(MAKE) emgauwa-core.json
 	$(MAKE) emgauwa-controller.json
+
+clean:
+	rm -f emgauwa-controller.json
+	rm -f emgauwa-controller.sqlite
+	rm -f emgauwa-core.json
+	rm -f emgauwa-core.sqlite
+	rm -f emgauwa-dev.sqlite

config/emgauwa-controller.pkl

@@ -1,71 +1,71 @@
 amends "./lib/controller.pkl"
 
 server {
-	host = "127.0.0.1"
+  host = "127.0.0.1"
-	port = 4419
+  port = 4419
 }
 
 database = "sqlite://emgauwa-controller.sqlite"
 
 permissions {
-	user = read("env:USER")
+  user = read("env:USER")
-	group = read("env:USER")
+  group = read("env:USER")
 }
 
 logging {
-	level = "DEBUG"
+  level = read?("env:LOGGING_LEVEL") ?? "DEBUG"
-	file = "stdout"
+  file = "stdout"
 }
 
 relays {
-	new {
+  new {
-		driver = "gpio"
+    driver = "gpio"
-		pin = 5
+    pin = 5
-		inverted = true
+    inverted = true
-	}
+  }
-	new {
+  new {
-		driver = "gpio"
+    driver = "gpio"
-		pin = 4
+    pin = 4
-		inverted = true
+    inverted = true
-	}
+  }
-	new {
+  new {
-		driver = "gpio"
+    driver = "gpio"
-		pin = 3
+    pin = 3
-		inverted = true
+    inverted = true
-	}
+  }
-	new {
+  new {
-		driver = "gpio"
+    driver = "gpio"
-		pin = 2
+    pin = 2
-		inverted = true
+    inverted = true
-	}
+  }
-	new {
+  new {
-		driver = "gpio"
+    driver = "gpio"
-		pin = 1
+    pin = 1
-		inverted = true
+    inverted = true
-	}
+  }
-	new {
+  new {
-		driver = "gpio"
+    driver = "gpio"
-		pin = 0
+    pin = 0
-		inverted = true
+    inverted = true
-	}
+  }
-	new {
+  new {
-		driver = "gpio"
+    driver = "gpio"
-		pin = 16
+    pin = 16
-		inverted = true
+    inverted = true
-	}
+  }
-	new {
+  new {
-		driver = "gpio"
+    driver = "gpio"
-		pin = 15
+    pin = 15
-		inverted = true
+    inverted = true
-	}
+  }
-	new {
+  new {
-		driver = "piface"
+    driver = "piface"
-		pin = 1
+    pin = 1
-		inverted = false
+    inverted = false
-	}
+  }
-	new {
+  new {
-		driver = "piface"
+    driver = "piface"
-		pin = 0
+    pin = 0
-		inverted = false
+    inverted = false
-	}
+  }
 }

config/emgauwa-core.pkl

@@ -1,18 +1,18 @@
 amends "./lib/core.pkl"
 
 server {
-	host = "127.0.0.1"
+  host = "127.0.0.1"
-	port = 4419
+  port = 4419
 }
 
 database = "sqlite://emgauwa-core.sqlite"
 
 permissions {
-	user = read("env:USER")
+  user = read("env:USER")
-	group = read("env:USER")
+  group = read("env:USER")
 }
 
 logging {
-	level = "DEBUG"
+  level = read?("env:LOGGING_LEVEL") ?? "DEBUG"
-	file = "stdout"
+  file = "stdout"
 }

config/lib/common.pkl

@@ -1,15 +1,15 @@
 class ServerConfig {
-	host: String
+  host: String
-	port: UInt16
+  port: UInt16
 }
 
 /// Set to a user and a group to drop privileges to after binding to the port
 class PermissionsConfig {
-	user: String
+  user: String
-	group: String
+  group: String
 }
 
 class LoggingConfig {
-	level: String
+  level: "TRACE"|"DEBUG"|"INFO"|"WARN"|"ERROR"|"FATAL"
-	file: String
+  file: String
 }