From 1dd153ce274296ec4f0f749b2206540cf2acf9bd Mon Sep 17 00:00:00 2001
From: Nepomuk Seiler <nepomuk.seiler@mukis.de>
Date: Mon, 6 Apr 2015 15:00:32 +0200
Subject: [PATCH] Fixing docs with newest changes

---
 .../archetypes/java_server/customize.rst      |  5 ++++-
 src/sphinx/topics/play.rst                    | 21 ++++++++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/sphinx/archetypes/java_server/customize.rst b/src/sphinx/archetypes/java_server/customize.rst
index 2d30204bb..f74224e97 100644
--- a/src/sphinx/archetypes/java_server/customize.rst
+++ b/src/sphinx/archetypes/java_server/customize.rst
@@ -29,7 +29,7 @@ You have three options. First, you can specify your options via the ``build.sbt`
 For the ``-X`` settings you need to add a suffix ``-J`` so the start script will
 recognize these as vm config parameters. 
 
-The second option is to create ``src/templates/application.ini`` with the following template
+The second option is to create ``src/universal/conf/application.ini`` with the following template
 
 .. code-block :: bash
 
@@ -81,6 +81,9 @@ The file will be installed to ``/etc/default/<normalizedName>``
     # -----------------
     JAVA_OPTS="-Dpidfile.path=/var/run/${{app_name}}/play.pid $JAVA_OPTS"
     
+    # For rpm/systemv you need to set the PIDFILE env variable as well
+    PIDFILE="/var/run/${{app_name}}/play.pid"
+    
     # export env vars for 3rd party libs
     # ----------------------------------
     COMPANY_API_KEY=123abc
diff --git a/src/sphinx/topics/play.rst b/src/sphinx/topics/play.rst
index 97378cac1..141f97816 100644
--- a/src/sphinx/topics/play.rst
+++ b/src/sphinx/topics/play.rst
@@ -25,7 +25,7 @@ In order to run your application in production you need to provide it with at le
 * Location where it can store its pidfile
 * Production configuration
 
-One way to provide this information is create ``src/universal/application.ini`` with the following contents:
+One way to provide this information is create ``src/universal/conf/application.ini`` with the following contents:
 
 .. code-block:: bash
 
@@ -41,5 +41,24 @@ One way to provide this information is create ``src/universal/application.ini``
 This way you should either store your production configuration under ``${{path_to_app_name}}/conf/production.conf``
 or put it under ``/usr/share/${{app_name}}/conf/production.conf`` by hand or using some configuration management system.
 
+RPM and SystemV
+~~~~~~~~~~~~~~~
+
+If you use a system with rpm as a packaging managing system (Fedora, CentOS, RedHat,...) make sure to provide
+a `etc-default` in `src/templates` and set the `PIDFILE` environment variable.
+
+
+.. code-block :: bash
+
+    # Setting JAVA_OPTS
+    # -----------------
+    # you can use this instead of the application.ini as well
+    # JAVA_OPTS="-Dpidfile.path=/var/run/${{app_name}}/play.pid $JAVA_OPTS"
+    
+    # For rpm/systemv you need to set the PIDFILE env variable as well
+    PIDFILE="/var/run/${{app_name}}/play.pid"
+    
+
+
 See :doc:`customize java server application </archetypes/java_server/customize>` for more information on `application.ini`
 and `etc-default` template.