diff options
| -rw-r--r-- | config/crontab-example | 4 | ||||
| -rw-r--r-- | config/nginx-ssl.conf.example | 5 | ||||
| -rw-r--r-- | config/nginx.conf.example | 3 | ||||
| -rw-r--r-- | locale/en_UG/app.po | 9 | ||||
| -rwxr-xr-x | script/site-specific-install.sh | 8 |
5 files changed, 14 insertions, 15 deletions
diff --git a/config/crontab-example b/config/crontab-example index 79ba70beb..44e328e4e 100644 --- a/config/crontab-example +++ b/config/crontab-example @@ -10,8 +10,8 @@ MAILTO=!!(*= $mailto *)!! # Every 5 minutes */5 * * * * !!(*= $user *)!! !!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/commonlib/bin/run-with-lockfile.sh -n !!(*= $vhost_dir *)!!/change-xapian-database.lock "!!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/script/update-xapian-index verbose=true" >> !!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/log/update-xapian-index.log || echo "stalled?" # Every 10 minutes -5,15,25,35,45,55 * * * * !!(*= $user *)!! /etc/init.d/foi-alert-tracks check -5,15,25,35,45,55 * * * * !!(*= $user *)!! /etc/init.d/foi-purge-varnish check +5,15,25,35,45,55 * * * * !!(*= $user *)!! /etc/init.d/!!(*= $site *)!!-alert-tracks check +5,15,25,35,45,55 * * * * !!(*= $user *)!! /etc/init.d/!!(*= $site *)!!-purge-varnish check 0,10,20,30,40,50 * * * * !!(*= $user *)!! !!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/commonlib/bin/run-with-lockfile.sh -n !!(*= $vhost_dir *)!!/send-batch-requests.lock !!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/script/send-batch-requests || echo "stalled?" # Once an hour diff --git a/config/nginx-ssl.conf.example b/config/nginx-ssl.conf.example index cdb89ef05..af2e9e4ab 100644 --- a/config/nginx-ssl.conf.example +++ b/config/nginx-ssl.conf.example @@ -21,6 +21,11 @@ server { access_log /var/log/nginx/alaveteli_ssl_access.log; error_log /var/log/nginx/alaveteli_ssl_error.log error; + location /download { + internal; + alias /var/www/alaveteli/alaveteli/cache/zips/production/download; + } + ssl on; ssl_certificate /etc/ssl/certs/www.example.com.cert; ssl_certificate_key /etc/ssl/private/www.example.com.key; diff --git a/config/nginx.conf.example b/config/nginx.conf.example index be937b7fd..7b8af2bd9 100644 --- a/config/nginx.conf.example +++ b/config/nginx.conf.example @@ -24,9 +24,6 @@ server { try_files $uri/index.html $uri @alaveteli; - error_page 500 502 503 504 /500.html; - error_page 404 /404.html; - error_page 422 /422.html; location /download { internal; diff --git a/locale/en_UG/app.po b/locale/en_UG/app.po index 92e4f67a6..54b2f27b3 100644 --- a/locale/en_UG/app.po +++ b/locale/en_UG/app.po @@ -1372,9 +1372,8 @@ msgstr "Make a new<br/>\\n <strong>Access <span>to</span><br/>\\n Information< msgid "Make a request" msgstr "" -#, fuzzy msgid "Make a request »" -msgstr "Make a request to this agency" +msgstr "" msgid "Make a request to these authorities" msgstr "" @@ -1892,9 +1891,8 @@ msgstr "Public agencies - {{description}}" msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "Public agencies {{start_count}} to {{end_count}} of {{total_count}}" -#, fuzzy msgid "Public authority statistics" -msgstr "Public agencies" +msgstr "Public agency statistics" msgid "Public authority – {{name}}" msgstr "Public agency – {{name}}" @@ -2121,9 +2119,8 @@ msgstr "" msgid "Respond to request" msgstr "" -#, fuzzy msgid "Respond to the FOI request '{{request}}' made by {{user}}" -msgstr "Respond to the ATI request" +msgstr "Respond to the ATI request '{{request}}' made by {{user}}" msgid "Respond using the web" msgstr "" diff --git a/script/site-specific-install.sh b/script/site-specific-install.sh index 5c3fb2339..59b714fb7 100755 --- a/script/site-specific-install.sh +++ b/script/site-specific-install.sh @@ -201,7 +201,7 @@ echo -n "Creating /etc/cron.d/alaveteli... " (su -l -c "cd '$REPOSITORY' && bundle exec rake config_files:convert_crontab DEPLOY_USER='$UNIX_USER' VHOST_DIR='$DIRECTORY' VCSPATH='$SITE' SITE='$SITE' CRONTAB=config/crontab-example" "$UNIX_USER") > /etc/cron.d/alaveteli # There are some other parts to rewrite, so just do them with sed: sed -r \ - -e "/foi-purge-varnish/d" \ + -e "/$SITE-purge-varnish/d" \ -e "s,^(MAILTO=).*,\1root@$HOST," \ -i /etc/cron.d/alaveteli echo $DONE_MSG @@ -213,9 +213,9 @@ if [ ! "$DEVELOPMENT_INSTALL" = true ]; then echo $DONE_MSG fi -echo -n "Creating /etc/init.d/foi-alert-tracks... " -(su -l -c "cd '$REPOSITORY' && bundle exec rake config_files:convert_init_script DEPLOY_USER='$UNIX_USER' VHOST_DIR='$DIRECTORY' SCRIPT_FILE=config/alert-tracks-debian.ugly" "$UNIX_USER") > /etc/init.d/foi-alert-tracks -chmod a+rx /etc/init.d/foi-alert-tracks +echo -n "Creating /etc/init.d/$SITE-alert-tracks... " +(su -l -c "cd '$REPOSITORY' && bundle exec rake config_files:convert_init_script DEPLOY_USER='$UNIX_USER' VHOST_DIR='$DIRECTORY' SCRIPT_FILE=config/alert-tracks-debian.ugly" "$UNIX_USER") > /etc/init.d/$SITE-alert-tracks +chmod a+rx /etc/init.d/$SITE-alert-tracks echo $DONE_MSG if [ $DEFAULT_SERVER = true ] && [ x != x$EC2_HOSTNAME ] |