Permalink
Browse files

Merge pull request #19 from cwolferh/ubuntu_sysruby

A sudo-enabled ubuntu user may now use system ruby
  • Loading branch information...
Justin Clift
Justin Clift committed Jan 11, 2013
2 parents 6a36f81 + c831e4e commit 2d60b48cfde35c095c6f958be12b624068bd3096
Showing with 13 additions and 10 deletions.
  1. +6 −7 README.md
  2. +5 −1 bootstrap.sh
  3. +2 −2 test.pp
View
@@ -24,13 +24,12 @@ Note, if you do not have or do not wish to use sudo, you can still run
bootstrap.sh assuming all needed dependencies are installed by defining
"export HAVESUDO=0" beforehand.
-Either of the above commands will work on rhel6, fc16 and fc17. It
-should also work on ubuntu or debian when specifying an RBENV_VERSION.
-Note, for the local instance of Conductor to be fully functional, some
-env variables (described below) need to point to existing
-imagefactory/iwhd/deltacloud instance URLs and an oauth.json
-credential. Otherwise, Conductor will still start up but won't be
-very usable.
+Either of the above commands will work on: RHEL 6, Fedora 16/17, and
+Ubuntu 12.04/12.10. Note, for the local instance of Conductor to be
+fully functional, some env variables (described below) need to point
+to existing imagefactory/iwhd/deltacloud instance URLs and an
+oauth.json credential. Otherwise, Conductor will still start up but
+won't be very usable.
The default bootstrap.sh behaviour includes creating a development
environment and starting up Conductor on port 3000. To override these
View
@@ -356,7 +356,7 @@ if [ "x$RBENV_VERSION" != "x" ]; then
fi
gem_installs="json facter puppet"
-if [ $os = "el6" ]; then
+if [ "$os" = "el6" -o "$os" = "debian" ]; then
gem_installs="$gem_installs bundler"
fi
@@ -376,6 +376,10 @@ for the_gem in `echo $gem_installs`; do
# http://docs.rubygems.org/read/chapter/3
if [ "$HAVESUDO" = "1" ]; then
cmd="sudo $cmd"
+ else
+ echo 'Installing local gems without using rbenv is not currently supported.'
+ echo 'If you want to install gems system-wide using system ruby instead of rbenv, you must be a sudo-enabled user'
+ exit 1
fi
fi
if [[ ${gem_versions[$the_gem]} ]]; then
View
@@ -1,9 +1,9 @@
class aeolus_dev_tools_path {
if $rbenv_home == undef {
- Exec { path => "/bin:/sbin:/usr/bin:/usr/sbin",
+ Exec { path => "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin",
logoutput => "on_failure" }
} else {
- Exec { path => "$rbenv_home/bin:$rbenv_home/shims:/bin:/sbin:/usr/bin:/usr/sbin",
+ Exec { path => "$rbenv_home/bin:$rbenv_home/shims:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin",
logoutput => "on_failure" }
}
if $aeolus_workdir == undef {

0 comments on commit 2d60b48

Please sign in to comment.