make default localhost:80, split api_uri param

IMLS · Dec 28, 2022 · a9aaa1f · a9aaa1f
1 parent 84020b2
commit a9aaa1f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/imls-wifi-sensor/internal/config/config.go b/imls-wifi-sensor/internal/config/config.go
@@ -96,9 +96,11 @@ func createURI(what string) string {
 	scheme := viper.GetString("api.scheme")
 	host := viper.GetString("api.host")
 	port := viper.GetInt("api.port")
+	api_uri := viper.GetString("api.api_uri")
 	fullURI := (scheme + "://" +
 		strings.TrimSuffix(strings.TrimPrefix(host, "/"), "/") +
 		":" + fmt.Sprint(port) + "/" +
+		strings.TrimPrefix(api_uri, "/")) + "/" +
 		strings.TrimPrefix(what, "/"))
 	log.Info().Msg("FULL URI: " + fullURI)
 	return (fullURI)
@@ -209,9 +211,10 @@ func SetConfigDefaults() {
 	viper.SetDefault("log.level", "DEBUG")
 	viper.SetDefault("log.loggers", "local:stderr,local:tmp")
 	viper.SetDefault("mode.run", "prod")
-	viper.SetDefault("api.scheme", "https")
-	viper.SetDefault("api.host", "rabbit-phase-4.app.cloud.gov")
-	viper.SetDefault("api.port", 443)
+	viper.SetDefault("api.scheme", "http")
+	viper.SetDefault("api.host", "localhost")
+	viper.SetDefault("api.port", 80)
+	viper.SetDefault("api.api_uri", "")
 	viper.SetDefault("api.login_uri", "/rpc/login")
 	viper.SetDefault("api.heartbeat_uri", "/rpc/beat_the_heart")
 	viper.SetDefault("api.presences_uri", "/rpc/update_presence")

diff --git a/imls-windows-installer/session-counter.ini b/imls-windows-installer/session-counter.ini
@@ -4,8 +4,9 @@
 host=statspilot.galibs.org
 scheme=https
 port=443
-presences_uri=/api/rpc/update_presence
-heartbeat_uri=/api/rpc/beat_the_heart
+api_uri=/api
+presences_uri=/rpc/update_presence
+heartbeat_uri=/rpc/beat_the_heart
 login_uri=/rpc/login
 
 [config]