Merge pull request #140 from sbt/wip/etc-default

Fix #98 java server type includes /etc/default by default
sbt · Jan 30, 2014 · 832aed6 · 832aed6
2 parents 3b1d318 + 114403d
commit 832aed6
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 15 deletions.
diff --git a/src/main/resources/com/typesafe/sbt/packager/archetypes/etc-default-template b/src/main/resources/com/typesafe/sbt/packager/archetypes/etc-default-template
@@ -1,4 +1,34 @@
-#Some start script options could be overridden here
-#RUN_OPTS=""
-#DAEMON_USER=""
-#JAVA_CMD=""
+# #################################
+# ##### Default configuration #####
+# #################################
+
+# Available replacements 
+# ------------------------------------------------
+# ${{author}}			debian author
+# ${{descr}}			debian package description
+# ${{exec}}				startup script name
+# ${{chdir}}			app directory
+# ${{retries}}			retries for startup
+# ${{retryTimeout}}		retry timeout
+# ${{app_name}}			normalized app name
+# ${{daemon_user}}		daemon user
+# -------------------------------------------------
+
+# Setting -Xmx and -Xms in Megabyte
+# -mem 1024
+
+# Setting -X directly (-J is stripped)
+# -J-X
+# -J-Xmx1024
+
+# Add additional jvm parameters
+# -Dkey=val
+
+# For play applications you may set
+# -Dpidfile.path=/var/run/${{app_name}}.pid
+
+# Turn on JVM debugging, open at the given port
+# -jvm-debug <port>  
+
+# Don't run the java version check
+# -no-version-check
diff --git a/src/main/scala/com/typesafe/sbt/packager/archetypes/JavaServerApplication.scala b/src/main/scala/com/typesafe/sbt/packager/archetypes/JavaServerApplication.scala
@@ -67,12 +67,13 @@ object JavaServerAppPackaging {
         },
 
       // === etc config mapping ===
+      bashScriptConfigLocation <<= normalizedName map (name => Some("/etc/default/" + name)),
       linuxEtcDefaultTemplate in Debian <<= sourceDirectory map { dir =>
         val overrideScript = dir / "templates" / "etc-default"
         if (overrideScript.exists) overrideScript.toURI.toURL
         else etcDefaultTemplateSource
       },
-      debianMakeEtcDefault <<= (normalizedName, target in Universal, serverLoading in Debian, linuxEtcDefaultTemplate in Debian)
+      debianMakeEtcDefault <<= (normalizedName, target in Universal, linuxEtcDefaultTemplate in Debian, debianScriptReplacements)
         map makeEtcDefaultScript,
       linuxPackageMappings in Debian <++= (debianMakeEtcDefault, normalizedName) map { (conf, name) =>
         conf.map(c => LinuxPackageMapping(Seq(c -> ("/etc/default/" + name))).withConfig()).toSeq
@@ -106,15 +107,10 @@ object JavaServerAppPackaging {
     }
   }
 
-  protected def makeEtcDefaultScript(name: String, tmpDir: File, loader: ServerLoader, source: java.net.URL): Option[File] = {
-    loader match {
-      case Upstart => None
-      case SystemV => {
-        val scriptBits = TemplateWriter.generateScript(source, Seq.empty)
-        val script = tmpDir / "tmp" / "etc" / "default" / name
-        IO.write(script, scriptBits)
-        Some(script)
-      }
-    }
+  protected def makeEtcDefaultScript(name: String, tmpDir: File, source: java.net.URL, replacements: Seq[(String, String)]): Option[File] = {
+    val scriptBits = TemplateWriter.generateScript(source, replacements)
+    val script = tmpDir / "tmp" / "etc" / "default" / name
+    IO.write(script, scriptBits)
+    Some(script)
   }
 }
diff --git a/src/sbt-test/debian/sysvinit-deb/test b/src/sbt-test/debian/sysvinit-deb/test
@@ -3,4 +3,5 @@
 $ exists target/debian-test-0.1.0.deb
 
 $ exists target/debian-test-0.1.0/etc
+$ exists target/debian-test-0.1.0/etc/default/debian-test
 $ exists target/debian-test-0.1.0/etc/init.d/debian-test
diff --git a/src/sbt-test/debian/upstart-deb/test b/src/sbt-test/debian/upstart-deb/test
@@ -3,7 +3,9 @@
 $ exists target/debian-test-0.1.0.deb
 
 $ exists target/debian-test-0.1.0/etc
+$ exists target/debian-test-0.1.0/etc/default/debian-test
 $ exists target/debian-test-0.1.0/etc/init/debian-test.conf
+
 # Check defaults
 $ exists target/debian-test-0.1.0/DEBIAN/prerm
 $ exists target/debian-test-0.1.0/DEBIAN/postinst