summaryrefslogtreecommitdiffstats
path: root/ext
diff options
context:
space:
mode:
authorMarc Fournier <marc.fournier@camptocamp.com>2009-07-29 23:08:44 +0200
committerJames Turnbull <james@lovedthanlost.net>2009-07-30 07:53:27 +1000
commit08ff9e84de18e9b1db69c73ea3e49b90fe5fd7c0 (patch)
treef61366eceeb65a906feb26c4543f69cc62bd7625 /ext
parentfb60f90d13f1d1dc1ccc884030230764be642d09 (diff)
downloadpuppet-08ff9e84de18e9b1db69c73ea3e49b90fe5fd7c0.tar.gz
puppet-08ff9e84de18e9b1db69c73ea3e49b90fe5fd7c0.tar.xz
puppet-08ff9e84de18e9b1db69c73ea3e49b90fe5fd7c0.zip
Fix #2467 - rack: suggest putting puppet/lib at beginning of RUBYLIB search path
If you happen to already have puppet code somewhere in your ruby path, you might get unexpected behaviour when trying to run puppetmaster with passenger. Suggesting that the path to puppet/lib gets prepended instead of appended to RUBYLIB could save time to some. Signed-off-by: Marc Fournier <marc.fournier@camptocamp.com>
Diffstat (limited to 'ext')
-rw-r--r--ext/rack/files/config.ru2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/rack/files/config.ru b/ext/rack/files/config.ru
index 5607bab72..5f0834a7d 100644
--- a/ext/rack/files/config.ru
+++ b/ext/rack/files/config.ru
@@ -2,7 +2,7 @@
# SSL needs to be handled outside this, though.
# if puppet is not in your RUBYLIB:
-# $:.push('/opt/puppet/lib')
+# $:.unshift('/opt/puppet/lib')
$0 = "puppetmasterd"
require 'puppet'