Remove the _local directory again

.env

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

.gitignore

@@ -4,7 +4,6 @@
 /tests/testing_bak/
 /tests/testing_latest/
 
-/_local/
 emgauwa-*.sqlite
 emgauwa-*.sqlite-*
 emgauwa-*.json

Makefile

@@ -7,9 +7,9 @@ sqlx:
 build-rpi:
 	cross build --target arm-unknown-linux-gnueabihf
 
-_local/emgauwa-%.json: config/emgauwa-%.pkl config/lib/%.pkl config/lib/common.pkl
+emgauwa-%.json: config/emgauwa-%.pkl config/lib/%.pkl config/lib/common.pkl
 	pkl eval -f json -o $@ $<
 
 configs:
-	$(MAKE) _local/emgauwa-core.json
+	$(MAKE) emgauwa-core.json
-	$(MAKE) _local/emgauwa-controller.json
+	$(MAKE) emgauwa-controller.json

config/emgauwa-controller.pkl

@@ -5,7 +5,7 @@ server {
 	port = 4419
 }
 
-database = "sqlite://_local/emgauwa-controller.sqlite"
+database = "sqlite://emgauwa-controller.sqlite"
 
 permissions {
 	user = "emgauwa"

config/emgauwa-core.pkl

@@ -5,7 +5,7 @@ server {
 	port = 4419
 }
 
-database = "sqlite://_local/emgauwa-core.sqlite"
+database = "sqlite://emgauwa-core.sqlite"
 
 permissions {
 	user = "emgauwa"

emgauwa-controller/src/settings.rs

@@ -32,7 +32,7 @@ impl Default for Settings {
 	fn default() -> Self {
 		Settings {
 			server: settings::Server::default(),
-			database: String::from("sqlite://_local/emgauwa-controller.sqlite"),
+			database: String::from("sqlite://emgauwa-controller.sqlite"),
 			permissions: settings::Permissions::default(),
 			logging: settings::Logging::default(),
 

emgauwa-core/build.rs

@@ -1,3 +1,3 @@
 fn main() {
-	println!("cargo:rustc-env=DATABASE_URL=sqlite://_local/emgauwa-core.sqlite")
+	println!("cargo:rustc-env=DATABASE_URL=sqlite://emgauwa-core.sqlite")
 }

emgauwa-core/src/settings.rs

@@ -18,7 +18,7 @@ impl Default for Settings {
 	fn default() -> Self {
 		Settings {
 			server: settings::Server::default(),
-			database: String::from("sqlite://_local/emgauwa-core.sqlite"),
+			database: String::from("sqlite://emgauwa-core.sqlite"),
 			permissions: settings::Permissions::default(),
 			logging: settings::Logging::default(),
 

emgauwa-lib/build.rs

@@ -1,4 +1,4 @@
 fn main() {
 	println!("cargo:rerun-if-changed=migrations");
-	println!("cargo:rustc-env=DATABASE_URL=sqlite://_local/emgauwa-dev.sqlite");
+	println!("cargo:rustc-env=DATABASE_URL=sqlite://emgauwa-dev.sqlite");
 }

emgauwa-lib/src/settings.rs

@@ -58,13 +58,9 @@ pub fn load<T>(config_name: &str, env_prefix: &str) -> Result<T, EmgauwaError>
 where
 	for<'de> T: serde::Deserialize<'de>,
 {
-	// TODO: Add switch to only include local config if in development mode
-	let dev_file =
-		config::File::with_name(&format!("./_local/emgauwa-{}", config_name)).required(false);
 	let local_file = config::File::with_name(&format!("./emgauwa-{}", config_name)).required(false);
 
 	config::Config::builder()
-		.add_source(dev_file)
 		.add_source(local_file)
 		.add_source(
 			config::Environment::with_prefix(&format!("EMGAUWA_{}", env_prefix))