aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/crontab-example2
-rw-r--r--conf/general.yml-docker2
-rw-r--r--conf/general.yml-example11
-rw-r--r--conf/systemd.example2
4 files changed, 14 insertions, 3 deletions
diff --git a/conf/crontab-example b/conf/crontab-example
index 86fcee80c..568b07e2e 100644
--- a/conf/crontab-example
+++ b/conf/crontab-example
@@ -12,7 +12,7 @@ PATH=/usr/local/bin:/usr/bin:/bin
# send-reports has three rows so that its 8am entry can be run with --verbose to send a morning summary of anything that's gone wrong
*/5 * * * * "$FMS/commonlib/bin/run-with-lockfile.sh" -n "$LOCK_DIR/send-reports.lock" "$FMS/bin/send-reports" || echo "stalled?"
-0 8 * * * "$FMS/bin/send-reports-failure-summary"
+0 8 * * * "$FMS/bin/send-failure-summary"
2 * * * * "$FMS/commonlib/bin/run-with-lockfile.sh" -n "$LOCK_DIR/send-alerts.lock" "$FMS/bin/send-alerts" || echo "stalled?"
22,52 * * * * "$FMS/commonlib/bin/run-with-lockfile.sh" -n "$LOCK_DIR/send-questionnaires.lock" "$FMS/bin/send-questionnaires" || echo "stalled?"
diff --git a/conf/general.yml-docker b/conf/general.yml-docker
index 33dcad67b..0b6cd5c33 100644
--- a/conf/general.yml-docker
+++ b/conf/general.yml-docker
@@ -110,7 +110,7 @@ PHOTO_STORAGE_OPTIONS:
# MAPIT_URL: 'http://global.mapit.mysociety.org/'
# And then specify whichever type code have the boundaries you want:
# MAPIT_TYPES: [ 'O06' ]
-MAPIT_URL: ''
+MAPIT_URL: 'http://localhost:9000/fakemapit/'
MAPIT_TYPES: [ 'ZZZ' ]
# If the MapIt you're using in MAPIT_URL requires an API key
diff --git a/conf/general.yml-example b/conf/general.yml-example
index 91507b03d..ece50d0f3 100644
--- a/conf/general.yml-example
+++ b/conf/general.yml-example
@@ -66,6 +66,10 @@ EXAMPLE_PLACES: [ 'High Street', 'Main Street' ]
LANGUAGES:
- 'en-gb,English,en_GB'
+# A postgresql text search configuration value - it should match the
+# configuration used by the problem_fulltext_idx index.
+DB_FULL_TEXT_SEARCH_CONFIG: 'english'
+
# If you're running an installation that is being used in a different time zone
# from the server, you can set the time zone here (standard time zone string)
TIME_ZONE: ""
@@ -223,6 +227,10 @@ SMTP_PORT: ''
SMTP_USERNAME: ''
SMTP_PASSWORD: ''
+# Set if you want password setting to be checked (securely) against the
+# Have I Been Pwned dataset
+CHECK_HAVEIBEENPWNED: 0
+
# Gaze is a world-wide service for population density lookups. You can leave
# this as is.
GAZE_URL: 'https://gaze.mysociety.org/gaze'
@@ -244,6 +252,9 @@ TESTING_COUNCILS: ''
# if you're using Message Manager, include the URL here (see https://github.com/mysociety/message-manager/)
MESSAGE_MANAGER_URL: ''
+# If you set up using recaptcha, you can put its configuration keys here
+RECAPTCHA: ''
+
# If you want to use SMS login or 'report as' with just a phone number, you'll
# need to set the site's two-digit ISO 3166 country code (e.g. GB) here.
PHONE_COUNTRY: ''
diff --git a/conf/systemd.example b/conf/systemd.example
index 1f8edf13c..7f22b091a 100644
--- a/conf/systemd.example
+++ b/conf/systemd.example
@@ -7,7 +7,7 @@ After=network.target
Type=forking
User=fms
PIDFile=/var/www/fixmystreet/fixmystreet.pid
-ExecStartPre=mkdir /var/www/fixmystreet/logs
+ExecStartPre=/bin/mkdir -p /var/www/fixmystreet/logs
ExecStart=/var/www/fixmystreet/fixmystreet/script/server \
--port 9000 \
--env deployment \