TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-03-28 17:55:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #353 from eikek/fix-deb-packages

Browse Source 
debian packages: use same system user
This commit is contained in:
mergify[bot] 2020-10-19 23:35:25 +00:00 committed by GitHub
commit dc78de7f3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build.sbt
View File

@ -96,14 +96,13 @@ val webjarSettings = Seq(
def debianSettings(cfgFile: String) = def debianSettings(cfgFile: String) =
Seq( Seq(
maintainer := "Eike Kettner <eike.kettner@posteo.de>", maintainer := "Eike Kettner <eike.kettner@posteo.de>",
packageSummary := description.value,
packageDescription := description.value,
mappings in Universal += { mappings in Universal += {
val conf = (Compile / resourceDirectory).value / "reference.conf" val conf = (Compile / resourceDirectory).value / "reference.conf"
if (!conf.exists) if (!conf.exists)
sys.error(s"File $conf not found") sys.error(s"File $conf not found")
conf -> s"conf/$cfgFile.conf" conf -> s"conf/$cfgFile.conf"
}, },
daemonUser := "docspell",
bashScriptExtraDefines += s"""addJava "-Dconfig.file=$${app_home}/../conf/$cfgFile.conf"""" bashScriptExtraDefines += s"""addJava "-Dconfig.file=$${app_home}/../conf/$cfgFile.conf""""
) )
@ -418,6 +417,9 @@ val joex = project
.settings(buildInfoSettings) .settings(buildInfoSettings)
.settings( .settings(
name := "docspell-joex", name := "docspell-joex",
description := "The joex component (job executor) for docspell which executes long-running tasks.",
packageSummary := "Docspell Joex",
packageDescription := description.value,
libraryDependencies ++= libraryDependencies ++=
Dependencies.fs2 ++ Dependencies.fs2 ++
Dependencies.http4sServer ++ Dependencies.http4sServer ++
@ -450,6 +452,9 @@ val restserver = project
.settings(buildInfoSettings) .settings(buildInfoSettings)
.settings( .settings(
name := "docspell-restserver", name := "docspell-restserver",
description := "Docspell server providing the user interface and a REST Api.",
packageSummary := "Docspell Rest server",
packageDescription := description.value,
libraryDependencies ++= libraryDependencies ++=
Dependencies.http4sServer ++ Dependencies.http4sServer ++
Dependencies.http4sCirce ++ Dependencies.http4sCirce ++