aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2015-04-02 14:45:54 +0100
committerLouise Crow <louise.crow@gmail.com>2015-04-02 14:45:54 +0100
commitd5a51cd73157fc5d15f5b300179b17221fb412a8 (patch)
tree1a6b3c3e893112e9c44e57fd27406b6cba90de04
parentd2a1e3f126af96282bdd2c31cc9d8feb7c230178 (diff)
parent188df36f1b746b9864250bea82a5dd7704cbf4ac (diff)
Merge branch 'hotfix/0.21.0.2' into rails-3-develop
-rw-r--r--config/initializers/alaveteli.rb2
-rwxr-xr-xscript/compact-xapian-database2
2 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/alaveteli.rb b/config/initializers/alaveteli.rb
index 491ae41fd..9ca20eb29 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.21.0.1'
+ALAVETELI_VERSION = '0.21.0.2'
# Add new inflection rules using the following format
# (all these examples are active by default):
diff --git a/script/compact-xapian-database b/script/compact-xapian-database
index 0caff6394..cb2d578e6 100755
--- a/script/compact-xapian-database
+++ b/script/compact-xapian-database
@@ -20,7 +20,7 @@ if [ -x /usr/bin/xapian-compact ];
mv "$XAPIAN_DB_DIR/$RAILS_ENV" "$XAPIAN_DB_DIR/$RAILS_ENV.tmp"
mv "$XAPIAN_DB_DIR/$RAILS_ENV.new" "$XAPIAN_DB_DIR/$RAILS_ENV"
rm -rf "$XAPIAN_DB_DIR/$RAILS_ENV.tmp"
- commonlib/bin/output-on-error service "$DAEMON_NAME" restart
+ commonlib/bin/output-on-error /usr/sbin/service "$DAEMON_NAME" restart
fi
else
echo >&2 "Could not find xapian-compact script; have you installed xapian-tools?"