From efcf1f7e7a4f3c1225ae8555d80c8917abd57f75 Mon Sep 17 00:00:00 2001
From: Thanh Le <lenguyenthanh@hotmail.com>
Date: Thu, 23 Nov 2023 23:12:16 +0100
Subject: [PATCH] Update deploy config and add default config

---
 .env                            |  4 ++--
 app/src/main/scala/Config.scala | 10 +++++-----
 build.sbt                       |  7 ++++---
 deploy.sh                       |  4 ++--
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.env b/.env
index 75a456f..93f0593 100644
--- a/.env
+++ b/.env
@@ -3,8 +3,8 @@ REDIS_HOST=127.0.0.1
 REDIS_PORT=6379
 
 # http server
-HTTP_SERVER_HOST=0.0.0.0
-HTTP_SERVER_PORT=9665
+HTTP_HOST=0.0.0.0
+HTTP_PORT=9665
 
 # kamon
 KAMON_ENABLED=true
diff --git a/app/src/main/scala/Config.scala b/app/src/main/scala/Config.scala
index 409459d..18ad111 100644
--- a/app/src/main/scala/Config.scala
+++ b/app/src/main/scala/Config.scala
@@ -3,7 +3,7 @@ package lila.fishnet
 import cats.syntax.all.*
 import ciris.*
 import ciris.http4s.*
-import com.comcast.ip4s.{ Host, Port }
+import com.comcast.ip4s.*
 import cats.effect.IO
 
 object Config:
@@ -21,15 +21,15 @@ case class AppConfig(redis: RedisConfig, server: HttpServerConfig, kamon: KamonC
 case class HttpServerConfig(host: Host, port: Port)
 
 object HttpServerConfig:
-  def host   = env("HTTP_SERVER_HOST").or(prop("http.server.host")).as[Host]
-  def port   = env("HTTP_SERVER_PORT").or(prop("http.server.port")).as[Port]
+  def host   = env("HTTP_HOST").or(prop("http.host")).as[Host].default(ip"127.0.0.1")
+  def port   = env("HTTP_PORT").or(prop("http.port")).as[Port].default(port"9665")
   def config = (host, port).parMapN(HttpServerConfig.apply)
 
 case class RedisConfig(host: Host, port: Port)
 
 object RedisConfig:
-  private def host = env("REDIS_HOST").or(prop("redis.host")).as[Host]
-  private def port = env("REDIS_PORT").or(prop("redis.port")).as[Port]
+  private def host = env("REDIS_HOST").or(prop("redis.host")).as[Host].default(ip"127.0.0.1")
+  private def port = env("REDIS_PORT").or(prop("redis.port")).as[Port].default(port"6379")
   def config       = (host, port).parMapN(RedisConfig.apply)
 
 case class KamonConfig(enabled: Boolean)
diff --git a/build.sbt b/build.sbt
index 4358438..ff6653e 100644
--- a/build.sbt
+++ b/build.sbt
@@ -5,13 +5,14 @@ inThisBuild(
     scalaVersion  := "3.3.1",
     versionScheme := Some("early-semver"),
     version       := "3.0",
-    run / fork    := true,
+    run / fork    := true
   )
 )
 
 lazy val app = project
   .in(file("app"))
   .settings(
+    name := "lila-fishnet",
     scalacOptions -= "-Xfatal-warnings",
     scalacOptions ++= Seq("-source:future", "-rewrite", "-indent", "-explain", "-Wunused:all", "-release:21"),
     resolvers ++= Seq(Dependencies.lilaMaven),
@@ -40,8 +41,8 @@ lazy val app = project
       munitScalacheck,
       weaver,
       weaverScalaCheck,
-      circeLiteral,
-    ),
+      circeLiteral
+    )
   )
   .enablePlugins(JavaAppPackaging)
 
diff --git a/deploy.sh b/deploy.sh
index 92a009d..e81e399 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -24,8 +24,8 @@ RSYNC_OPTIONS=" \
   --exclude RUNNING_PID \
   --exclude '.git/'"
 
-stage="target/universal/stage"
-include="$stage/bin $stage/lib $stage/conf"
+stage="app/target/universal/stage"
+include="$stage/bin $stage/lib"
 rsync_command="rsync $RSYNC_OPTIONS $include $REMOTE:$REMOTE_DIR"
 echo "$rsync_command"
 $rsync_command