Kill dalli and memcached

seuros · seuros · commit dea54f6b7ab0 · 2014-07-18T18:47:21.000Z
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,6 @@ rvm:
 - 2.1.2
 bundler_args: "--without development production autotest"
 services:
-- memcached
 - mongodb
 - redis-server
 before_install:
diff --git a/Gemfile b/Gemfile
@@ -33,10 +33,6 @@ gem 'jquery-rails', '= 2.0.3'
 gem 'haml', '3.1.7'
 gem 'hamlbars', '1.1.0' #haml support for handlebars/ember.js
 
-# Memcached
-gem 'dalli'
-gem 'memcachier'
-
 # Postgres
 gem 'pg'
 
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -171,7 +171,6 @@ GEM
       httparty (~> 0.10)
       json
     curb (0.8.5)
-    dalli (2.7.2)
     database_cleaner (1.3.0)
     debug_inspector (0.0.2)
     debugger-linecache (1.2.0)
@@ -352,7 +351,6 @@ GEM
       treetop (~> 1.4.8)
     mail_view (2.0.4)
       tilt
-    memcachier (0.0.2)
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
     method_source (0.8.2)
@@ -736,7 +734,6 @@ DEPENDENCIES
   color
   compass-rails
   createsend
-  dalli
   database_cleaner
   dotenv-rails
   ember-rails!
@@ -769,7 +766,6 @@ DEPENDENCIES
   local_time
   mail
   mail_view
-  memcachier
   mini_magick
   mixpanel
   mongo
diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -3,7 +3,6 @@
   config.cache_classes = true
   config.consider_all_requests_local = false
   config.action_controller.perform_caching = true
-  config.cache_store = :dalli_store
   config.force_ssl = true
   config.action_controller.asset_host = ENV['CDN_ASSET_HOST']
   config.action_mailer.asset_host = ENV['CDN_ASSET_HOST']
diff --git a/vagrant/coderwall-box/scripts/postinstall.sh b/vagrant/coderwall-box/scripts/postinstall.sh
@@ -143,9 +143,6 @@ wget https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearc
 dpkg -i elasticsearch-$ES_VERSION.deb
 rm -rf ~/elasticsearch-$ES_VERSION.deb
 
-# Memcached
-apt-get -y install memcached
-
 # Add /opt/ruby/bin to the global path as the last resort so
 # Ruby, RubyGems, and Chef/Puppet are visible
 echo 'PATH=$PATH:/opt/ruby/bin' > /etc/profile.d/vagrantruby.sh
