diff --git a/akka-bbb-apps/build.sbt b/akka-bbb-apps/build.sbt index 1a4da064d35b82d6e584ef2784cba7290eb5db75..6ef42ab5636bb55d5fd966e3a2d5fd085616f091 100755 --- a/akka-bbb-apps/build.sbt +++ b/akka-bbb-apps/build.sbt @@ -39,6 +39,7 @@ testOptions in Test += Tests.Argument(TestFrameworks.Specs2, "html", "console", testOptions in Test += Tests.Argument(TestFrameworks.ScalaTest, "-h", "target/scalatest-reports") +Seq(Revolver.settings: _*) lazy val bbbAppsAkka = (project in file(".")).settings(name := "bbb-apps-akka", libraryDependencies ++= Dependencies.runtime).settings(compileSettings) scalariformAutoformat := false @@ -73,7 +74,4 @@ daemonUser in Linux := user // group which will execute the application daemonGroup in Linux := group -mappings in(Universal, packageBin) += file("src/main/resources/application.conf") -> "conf/application.conf" -mappings in(Universal, packageBin) += file("src/main/resources/logback.xml") -> "conf/logback.xml" - debianPackageDependencies in Debian ++= Seq("java8-runtime-headless", "bash") diff --git a/akka-bbb-apps/src/main/resources/README b/akka-bbb-apps/src/main/resources/README deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/akka-bbb-apps/src/main/resources/application.conf b/akka-bbb-apps/src/universal/conf/application.conf similarity index 100% rename from akka-bbb-apps/src/main/resources/application.conf rename to akka-bbb-apps/src/universal/conf/application.conf diff --git a/akka-bbb-apps/src/main/resources/logback.xml b/akka-bbb-apps/src/universal/conf/logback.xml similarity index 100% rename from akka-bbb-apps/src/main/resources/logback.xml rename to akka-bbb-apps/src/universal/conf/logback.xml diff --git a/akka-bbb-fsesl/build.sbt b/akka-bbb-fsesl/build.sbt index 020426a651d37ecdf2f70f96a43d7518c3f52d8d..98a18e948b17fb1d28e7325049e72816aa04b775 100755 --- a/akka-bbb-fsesl/build.sbt +++ b/akka-bbb-fsesl/build.sbt @@ -76,12 +76,9 @@ val user = "bigbluebutton" val group = "bigbluebutton" // user which will execute the application -daemonUser in Linux := user +daemonUser in Linux := user // group which will execute the application -daemonGroup in Linux := group - -mappings in(Universal, packageBin) += file("src/main/resources/application.conf") -> "conf/application.conf" -mappings in(Universal, packageBin) += file("src/main/resources/logback.xml") -> "conf/logback.xml" +daemonGroup in Linux := group debianPackageDependencies in Debian ++= Seq("java8-runtime-headless", "bash") diff --git a/akka-bbb-fsesl/src/main/resources/README b/akka-bbb-fsesl/src/main/resources/README deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/akka-bbb-fsesl/src/main/resources/application.conf b/akka-bbb-fsesl/src/universal/conf/application.conf similarity index 100% rename from akka-bbb-fsesl/src/main/resources/application.conf rename to akka-bbb-fsesl/src/universal/conf/application.conf diff --git a/akka-bbb-fsesl/src/main/resources/logback.xml b/akka-bbb-fsesl/src/universal/conf/logback.xml similarity index 100% rename from akka-bbb-fsesl/src/main/resources/logback.xml rename to akka-bbb-fsesl/src/universal/conf/logback.xml