Skip to content
This repository has been archived by the owner on May 15, 2018. It is now read-only.

Commit

Permalink
Fix config files to work on case-sensitive filesystems (as used by Ub…
Browse files Browse the repository at this point in the history
…untu)

Mac OS X's filesystem 'HFS+' is case-insensitive (tho confusingly, also
'case preserving'), so no Mac OS X devs would have notice a problem here.
  • Loading branch information
rtyley committed Jul 26, 2016
1 parent dbb2240 commit 5f3ae8f
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 6 deletions.
4 changes: 2 additions & 2 deletions build.sbt
Expand Up @@ -51,7 +51,7 @@ dependencyOverrides += "com.typesafe.play" %% "play-json" % "2.4.6"

resolvers += "scalaz-bintray" at "http://dl.bintray.com/scalaz/releases"

addCommandAlias("devrun", "run -Dconfig.resource=dev.conf 9111")
addCommandAlias("devrun", "run -Dconfig.resource=DEV.conf 9111")

import com.typesafe.sbt.packager.archetypes.ServerLoader.Systemd
serverLoading in Debian := Systemd
Expand All @@ -76,6 +76,6 @@ javaOptions in Universal ++= Seq(
"-J-XX:MaxMetaspaceSize=500m",
"-J-XX:+PrintGCDetails",
"-J-XX:+PrintGCDateStamps",
" -Dconfig.resource=prod.conf",
" -Dconfig.resource=PROD.conf",
s"-J-Xloggc:/var/log/${packageName.value}/gc.log"
)
2 changes: 1 addition & 1 deletion conf/dev.conf → conf/DEV.conf
Expand Up @@ -10,7 +10,7 @@
# experimenting, don't commit those changes. You may want to use this Git
# command to avoid accidentally committing noise:
#
# git update-index --assume-unchanged conf/dev.conf
# git update-index --assume-unchanged conf/DEV.conf
#
# (see http://stackoverflow.com/a/11366713/438886 for more details)

Expand Down
File renamed without changes.
3 changes: 0 additions & 3 deletions conf/application.conf
@@ -1,9 +1,6 @@
play.application.loader = "wiring.AppLoader"


# Config for the 'Vanilla' Membership site
include "copy"

play.http.session.secure=true

play.http.errorHandler = "monitoring.ErrorHandler"
Expand Down

0 comments on commit 5f3ae8f

Please sign in to comment.