diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/deploy.rb | 1 | ||||
| -rw-r--r-- | config/environment.rb | 2 | ||||
| -rw-r--r-- | config/memcached.yml-example | 15 | ||||
| -rw-r--r-- | config/packages | 1 |
4 files changed, 0 insertions, 19 deletions
diff --git a/config/deploy.rb b/config/deploy.rb index f52883bd4..5e660434a 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -48,7 +48,6 @@ namespace :deploy do links = { "#{release_path}/config/database.yml" => "#{shared_path}/database.yml", "#{release_path}/config/general.yml" => "#{shared_path}/general.yml", - "#{release_path}/config/memcached.yml" => "#{shared_path}/memcached.yml", "#{release_path}/config/rails_env.rb" => "#{shared_path}/rails_env.rb", "#{release_path}/config/newrelic.yml" => "#{shared_path}/newrelic.yml", "#{release_path}/config/aliases" => "#{shared_path}/aliases", diff --git a/config/environment.rb b/config/environment.rb index 21415dfd8..d1189c43f 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -114,8 +114,6 @@ end # Mime::Type.register "text/richtext", :rtf # Mime::Type.register "application/x-mobile", :mobile -# The Rails cache is set up by the Interlock plugin to use memcached - # Domain for URLs (so can work for scripts, not just web pages) ActionMailer::Base.default_url_options[:host] = Configuration::domain diff --git a/config/memcached.yml-example b/config/memcached.yml-example deleted file mode 100644 index e5d486674..000000000 --- a/config/memcached.yml-example +++ /dev/null @@ -1,15 +0,0 @@ -defaults: - namespace: whatdotheyknow - sessions: false - client: memcache-client -development: - disabled: true - # servers: - # - 127.0.0.1:11211 # Default host and port -production: - servers: - - 127.0.0.1:11211 # Default host and port - # debug: true - # memory: 256 - # benchmarking: false - diff --git a/config/packages b/config/packages index 775a55e38..db51e5bdd 100644 --- a/config/packages +++ b/config/packages @@ -23,7 +23,6 @@ unzip wdg-html-validator mutt tnef (>= 1.4.5) -memcached gettext python-yaml wkhtmltopdf-static |