simplify first run, serve assets by default

README.md

@@ -44,6 +44,9 @@ Use [GitHub issues](https://github.com/ornicar/lila/issues) for bug reports and
 Installation
 ------------
 
+`./lila`
+`run`
+
 The Wiki describes [how to setup a development environment](https://github.com/ornicar/lila/wiki/Lichess-Development-Onboarding).
 
 The source code is available for learning and contribution, but please don't just setup a public Lichess clone. Don't expect developers to help you run your own instance. Questions about the installation and runtime issues will probably be ignored.

app/controllers/Main.scala

@@ -14,7 +14,8 @@ import views._
 
 final class Main(
     env: Env,
-    prismicC: Prismic
+    prismicC: Prismic,
+    assetsC: Assets
 ) extends LilaController(env) {
 
   private lazy val blindForm = Form(tuple(
@@ -179,4 +180,6 @@ Disallow: /games/export
       }
     }.fuccess
   }
+
+  def devAsset(@silent v: String, file: String) = assetsC.at(file)
 }

app/http/HttpFilter.scala

@@ -12,17 +12,17 @@ final class HttpFilter(env: Env)(implicit val mat: Materializer) extends Filter
   private val net = env.net
   private val logger = lila.log("http")
 
-  def apply(nextFilter: RequestHeader => Fu[Result])(req: RequestHeader): Fu[Result] = {
-
-    val startTime = nowMillis
-
-    redirectWrongDomain(req) map fuccess getOrElse {
-      nextFilter(req) dmap addApiResponseHeaders(req) dmap { result =>
-        monitoring(req, startTime, result)
-        result
+  def apply(nextFilter: RequestHeader => Fu[Result])(req: RequestHeader): Fu[Result] =
+    if (HTTPRequest isAssets req) nextFilter(req)
+    else {
+      val startTime = nowMillis
+      redirectWrongDomain(req) map fuccess getOrElse {
+        nextFilter(req) dmap addApiResponseHeaders(req) dmap { result =>
+          monitoring(req, startTime, result)
+          result
+        }
       }
     }
-  }
 
   private def monitoring(req: RequestHeader, startTime: Long, result: Result) = {
     val actionName = HTTPRequest actionName req

build.sbt

@@ -18,7 +18,6 @@ sources in doc in Compile := List()
 publishArtifact in (Compile, packageDoc) := false
 // disable publishing the main sources jar
 publishArtifact in (Compile, packageSrc) := false
-PlayKeys.playDefaultPort := 9663
 // don't stage the conf dir
 PlayKeys.externalizeResources := false
 // shorter prod classpath
@@ -34,7 +33,10 @@ libraryDependencies ++= Seq(
 ) ++ silencer.bundle
 
 resourceDirectory in Assets := (sourceDirectory in Compile).value / "assets"
-unmanagedResourceDirectories in Assets ++= (if (scala.sys.env.get("SERVE_ASSETS").exists(_ == "1")) Seq(baseDirectory.value / "public") else Nil)
+unmanagedResourceDirectories in Assets ++= {
+  if (scala.sys.env.get("SERVE_ASSETS").exists(_ == "1")) Seq(baseDirectory.value / "public")
+  else Nil
+}
 
 scalariformPreferences := scalariformPrefs(scalariformPreferences.value)
 excludeFilter in scalariformFormat := "*Routes*"

conf/application.conf.default

@@ -1,10 +1,3 @@
 include "base"
 
-# copy to conf/application.conf, then
 # override values from base.conf here
-
-net {
-  domain = localhost
-  socket.domain = localhost
-  asset.domain = assets.localhost
-}

conf/base.conf

@@ -3,13 +3,13 @@ mongodb {
   mongo-async-driver = ${akka}
 }
 net {
-  domain = "localhost:9663"
-  socket.domain = ${net.domain}
+  domain = "localhost:9000"
+  socket.domain = "localhost:9664"
   asset.domain = ${net.domain}
   protocol = "http://"
   base_url = ${net.protocol}${net.domain}
   ip = "127.0.0.1"
-  email = "[email protected]"
+  email = ""
   crawlable = false
   ratelimit = true
 }
@@ -49,6 +49,10 @@ play {
       maxInitialLineLength = 2048 # 4096
     }
   }
+  assets {
+    path = "/public"
+    urlPrefix = "/assets"
+  }
 }
 app {
   scheduler {

conf/routes

@@ -602,7 +602,8 @@ POST  /jsmon/:event                    controllers.Main.jsmon(event: String)
 
 GET   /swag                            controllers.Main.movedPermanently(to: String = "https://shop.spreadshirt.com/lichess-org")
 
-GET   /assets/*file                    controllers.Assets.versioned(file)
+GET   /assets/_$v<\w{6}>/*file         controllers.Main.devAsset(v, file)
+GET   /assets/*file                    controllers.Assets.at(v, file)
 
 GET   /robots.txt                      controllers.Main.robots
 

lila

@@ -10,8 +10,8 @@
 # We use .sbtopts instead
 export SBT_OPTS=""
 
-# For development without nginx (not recommended).
-export SERVE_ASSETS=0
+# For development without nginx
+export SERVE_ASSETS=1
 
 if [ ! -f "conf/application.conf" ]; then
   cp conf/application.conf.default conf/application.conf

modules/common/src/main/HTTPRequest.scala

@@ -35,6 +35,8 @@ object HTTPRequest {
   def isApi(req: RequestHeader) = req.path startsWith "/api/"
   def isApiOrApp(req: RequestHeader) = isApi(req) || appOrigin(req).isDefined
 
+  def isAssets(req: RequestHeader) = req.path startsWith "/assets/"
+
   def userAgent(req: RequestHeader): Option[String] = req.headers get HeaderNames.USER_AGENT
 
   val isAndroid = UaMatcher("""(?i)android.+mobile""")