aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/crontab-example2
-rw-r--r--config/general.yml-example13
-rw-r--r--config/initializers/alaveteli.rb3
-rw-r--r--config/packages6
-rw-r--r--config/routes.rb2
5 files changed, 21 insertions, 5 deletions
diff --git a/config/crontab-example b/config/crontab-example
index 32baff170..d2c3f6bd9 100644
--- a/config/crontab-example
+++ b/config/crontab-example
@@ -26,6 +26,8 @@ MAILTO=cron-!!(*= $site *)!!@mysociety.org
0 8 * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/alert-not-clarified-request.lock /data/vhost/!!(*= $vhost *)!!/!!(*= $vcspath *)!!/script/alert-not-clarified-request || echo "stalled?"
2 4 * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/check-recent-requests-sent.lock /data/vhost/!!(*= $vhost *)!!/!!(*= $vcspath *)!!/script/check-recent-requests-sent || echo "stalled?"
45 3 * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/stop-new-responses-on-old-requests.lock /data/vhost/!!(*= $vhost *)!!/!!(*= $vcspath *)!!/script/stop-new-responses-on-old-requests || echo "stalled?"
+55 4 * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/update-public-body-stats.lock /data/vhost/!!(*= $vhost *)!!/!!(*= $vcspath *)!!/script/update-public-body-stats || echo "stalled?"
+
# Only root can restart apache
31 1 * * * root run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/change-xapian-database.lock "/data/vhost/!!(*= $vhost *)!!/!!(*= $vcspath *)!!/script/compact-xapian-database production" || echo "stalled?"
diff --git a/config/general.yml-example b/config/general.yml-example
index 0491ef64d..8e749d9d6 100644
--- a/config/general.yml-example
+++ b/config/general.yml-example
@@ -192,3 +192,16 @@ MTA_LOG_TYPE: "exim"
# this will be included in the message people see when their request is
# successful.
DONATION_URL: "http://www.mysociety.org/donate/"
+
+# If you set this to 'true' then a page of statistics on the
+# performance of public bodies will be available:
+PUBLIC_BODY_STATISTICS_PAGE: false
+
+# The page of statistics for public bodies will only consider public
+# bodies that have had at least this number of requests:
+MINIMUM_REQUESTS_FOR_STATISTICS: 50
+
+# If only some of the public bodies have been translated into every
+# available locale, you can allow a fallback to the default locale for
+# listing of public bodies.
+PUBLIC_BODY_LIST_FALLBACK_TO_DEFAULT_LOCALE: false
diff --git a/config/initializers/alaveteli.rb b/config/initializers/alaveteli.rb
index 3c56e1ba5..cebf3a6eb 100644
--- a/config/initializers/alaveteli.rb
+++ b/config/initializers/alaveteli.rb
@@ -10,7 +10,7 @@ load "debug_helpers.rb"
load "util.rb"
# Application version
-ALAVETELI_VERSION = '0.12'
+ALAVETELI_VERSION = '0.13'
# Add new inflection rules using the following format
# (all these examples are active by default):
@@ -25,7 +25,6 @@ ALAVETELI_VERSION = '0.12'
# 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] = AlaveteliConfiguration::domain
diff --git a/config/packages b/config/packages
index ff0c3b656..8bb00a849 100644
--- a/config/packages
+++ b/config/packages
@@ -3,8 +3,8 @@
# alavateli mailing list if you want to change it
ruby1.8
ruby
-rdoc
-irb
+rdoc | rdoc1.8
+irb | irb1.8
wv
poppler-utils
pdftk (>> 1.41+dfsg-1) | pdftk (<< 1.41+dfsg-1) # that version has a non-functionining uncompress option
@@ -27,6 +27,8 @@ wkhtmltopdf-static
libmagic-dev
libmagickwand-dev
libpq-dev
+libxml2-dev
+libxslt-dev
uuid-dev
ruby1.8-dev
rubygems (>= 1.8.15)
diff --git a/config/routes.rb b/config/routes.rb
index 885c79a0f..cadb7ec54 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -105,6 +105,7 @@ Alaveteli::Application.routes.draw do
match '/body/:url_name/view_email' => 'public_body#view_email', :as => :view_public_body_email
match '/body/:url_name/:tag' => 'public_body#show', :as => :show_public_body_tag
match '/body/:url_name/:tag/:view' => 'public_body#show', :as => :show_public_body_tag_view
+ match '/body_statistics' => 'public_body#statistics', :as => :public_bodies_statistics
####
#### Comment controller
@@ -176,7 +177,6 @@ Alaveteli::Application.routes.draw do
match '/admin/timeline' => 'admin_general#timeline', :as => :admin_timeline
match '/admin/debug' => 'admin_general#debug', :as => :admin_debug
match '/admin/stats' => 'admin_general#stats', :as => :admin_stats
- match '/admin/javascripts/admin.js' => 'admin_general#admin_js', :as => :admin_js
####
#### AdminRequest controller