Merge branch 'feature/remove-memcached-and-interlock-references' into develop

7 files changed, 0 insertions, 27 deletions

diff --git a/.travis.yml b/.travis.yml
index ba489f4fb..ffcfdbaa9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,6 @@ before_install:
   - git submodule update --init --recursive
   - psql -c "create database foi_test template template0 encoding 'SQL_ASCII';" -U postgres
   - cp config/database.yml-test config/database.yml
-  - cp config/memcached.yml-test config/memcached.yml
   - sudo apt-get update
   - export DEBIAN_FRONTEND=noninteractive
   - sudo apt-get -y install exim4-daemon-light
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
diff --git a/doc/DEPLOY.md b/doc/DEPLOY.md
index 767f720fd..f2e643ec5 100644
--- a/doc/DEPLOY.md
+++ b/doc/DEPLOY.md
@@ -20,7 +20,6 @@ These are the general steps required to get your staging server up and running:
 * SSH to the server, change to the `deploy_to` directory
 * `cp releases/[SOME_DATE]/config/general.yml-example shared/general.yml`
 * `cp releases/[SOME_DATE]/config/database.yml-example shared/database.yml`
-* `cp releases/[SOME_DATE]/config/memcached.yml-example shared/memcached.yml`
 * Edit those files to match your required settings
 * Back on your machine run `cap deploy` and it should successfully deploy
 * Run the DB migrations `cap deploy:migrate`
diff --git a/doc/INSTALL.md b/doc/INSTALL.md
index 761121139..3a911cbc8 100644
--- a/doc/INSTALL.md
+++ b/doc/INSTALL.md
@@ -220,12 +220,6 @@ The default theme is the "Alaveteli" theme.  When you run
 `rails-post-deploy` (see below), that theme gets installed
 automatically.
 
-You'll also want to copy `config/memcached.yml-example` to
-`config/memcached.yml`. The application is configured, via the
-Interlock Rails plugin, to cache content using memcached.  You
-probably don't want this in your development profile; the example
-`memcached.yml` file disables this behaviour.
-
 Finally, copy `config/newrelic.yml-example` to `config/newrelic.yml`.
 This file contains configuration information for the New Relic
 performance management system. By default, monitoring is switched off