summaryrefslogtreecommitdiffstats
path: root/initscript
diff options
context:
space:
mode:
authorTim Moore <timoore@redhat.com>2009-12-18 19:14:25 +0100
committerTim Moore <timoore@redhat.com>2009-12-18 19:14:25 +0100
commit547a3b44141e7c7b6548d130bb37f18a634a50a2 (patch)
treef13c681a2f045d8d133e9388aded783bf9de4e0d /initscript
parent471fca5e53a239f7fa4d04b7b6d6f53765a3d598 (diff)
parenta18a40d0cf1408d5575165ebc4374a1ab4f9fbc0 (diff)
downloadsystemtap-steved-547a3b44141e7c7b6548d130bb37f18a634a50a2.tar.gz
systemtap-steved-547a3b44141e7c7b6548d130bb37f18a634a50a2.tar.xz
systemtap-steved-547a3b44141e7c7b6548d130bb37f18a634a50a2.zip
Merge commit 'origin/master'
Diffstat (limited to 'initscript')
-rw-r--r--initscript/README.stap-server2
-rw-r--r--initscript/config.stap-server13
2 files changed, 13 insertions, 2 deletions
diff --git a/initscript/README.stap-server b/initscript/README.stap-server
index 8d18a9f9..c4089299 100644
--- a/initscript/README.stap-server
+++ b/initscript/README.stap-server
@@ -167,7 +167,7 @@ output is optional, because this service may start before syslog).
4. Configuration Format
=======================
-Configuration files allows us to
+Configuration files allow us to
- specify global configuration of logging, server configuration files, status
files and other global parameters.
- specify which servers are to be started by default.
diff --git a/initscript/config.stap-server b/initscript/config.stap-server
index ad0c9c4d..001123cc 100644
--- a/initscript/config.stap-server
+++ b/initscript/config.stap-server
@@ -1,5 +1,16 @@
-# Path setup
+# stap-server global configuration
+#
+# This is a shell script fragment which may set the following variables.
+# The suggested settings below are the default settings.
+
+# Where to find individual server configurations
# CONFIG_PATH=/etc/stap-server/conf.d
+
+# Where to keep information about running servers
# STAT_PATH=/var/run/stap-server
+
+# Where to log messages
# LOG_FILE=/var/log/stap-server.log
+
+# The user who will run the server(s)
# STAP_USER=stap-server