Remove unused stuff, configure to use .ruby-version.

dmytro · Sep 20, 2013 · 70e610f · 70e610f
1 parent 51933e0
commit 70e610f
Show file tree

Hide file tree

Showing 19 changed files with 5 additions and 150 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/.ruby-version b/.ruby-version
@@ -0,0 +1 @@
+ruby-2.0.0-p247
diff --git a/elastic.json b/elastic.json
diff --git a/git-committer.json b/git-committer.json
diff --git a/git_keys.json b/git_keys.json
diff --git a/github_keys.json b/github_keys.json
diff --git a/guru-webserver.json b/guru-webserver.json
diff --git a/install.conf b/install.conf
@@ -3,21 +3,19 @@
 # Configuration: set required versions of rvm, ruby and chef
 # below. Install script will install or upgrade versions as required.
 # ----------------------------------------------------------------------
-#RUBY="ruby-2.0.0-p195"
-CHEF="10.24.0"
-#CHEF="11.4.4"
-RUBY="ruby-1.9.3-p327" 
+CHEF="11.6.0"
+RUBY=$(cat .ruby-version)
 #
 # Additional patch for Ruby if required. For 1.9.3 this can be
 # 'falcon' performance patch. RVM installs Ruby with additional
 # parameter: --patch falcon
 # 
-RUBY_PATCH=falcon
+# RUBY_PATCH=falcon
 
 #
 # For Ruby 2.0 downgrade rubygems to pre 2.0 version
 # -------------------------------------------------
-RUBYGEMS=1.8.25
+# RUBYGEMS=1.8.25
 
 # ----------------------------------------------------------------------
 # Config for CentOS

diff --git a/roles/tm_designer.rb b/roles/tm_designer.rb
diff --git a/roles/tm_developer.rb b/roles/tm_developer.rb
diff --git a/roles/tm_production.rb b/roles/tm_production.rb
diff --git a/roles/tm_web_server.rb b/roles/tm_web_server.rb
diff --git a/teammight.json b/teammight.json
diff --git a/tm_designer.json b/tm_designer.json
diff --git a/tm_developer.json b/tm_developer.json
diff --git a/tm_production.json b/tm_production.json
diff --git a/tm_staging.json b/tm_staging.json
diff --git a/vm.sh b/vm.sh
diff --git a/webserver.json b/webserver.json