diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/.gitignore | 2 | ||||
| -rw-r--r-- | conf/crontab-example | 6 | ||||
| -rw-r--r-- | conf/general.yml-example | 11 | ||||
| -rw-r--r-- | conf/httpd.conf-example | 4 | ||||
| -rw-r--r-- | conf/nginx.conf.example | 2 | ||||
| -rw-r--r-- | conf/packages | 2 | ||||
| -rw-r--r-- | conf/packages.generic | 2 |
7 files changed, 23 insertions, 6 deletions
diff --git a/conf/.gitignore b/conf/.gitignore index 86ecc7e03..25c6cc743 100644 --- a/conf/.gitignore +++ b/conf/.gitignore @@ -1,6 +1,6 @@ /general.yml /general.yml.deployed -/general.test-autogenerated*.yml +/general-*.yml /httpd.conf /httpd.conf.deployed /crontab diff --git a/conf/crontab-example b/conf/crontab-example index 68197d7b1..037dd147e 100644 --- a/conf/crontab-example +++ b/conf/crontab-example @@ -18,9 +18,11 @@ PATH=/usr/local/bin:/usr/bin:/bin 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?" -# If you utilise Open311 and the updates extension, you will need to run these scripts +# If you utilise Open311 and the updates extension, you will need to run these scripts. +# We currently run fetch-comments-24hs once a night to catch anything missed. #*/5 * * * * "$FMS/commonlib/bin/run-with-lockfile.sh" -n "$LOCK_DIR/send-comments.lock" "$FMS/bin/send-comments" || echo "stalled?" -#*/5 * * * * "$FMS/commonlib/bin/run-with-lockfile.sh" -n "$LOCK_DIR/fetch-comments.lock" "$FMS/bin/fetch-comments" || echo "stalled?" +#5,10,15,20,25,30,35,40,45,50,55 * * * * "$FMS/commonlib/bin/run-with-lockfile.sh" -n "$LOCK_DIR/fetch-comments.lock" "$FMS/bin/fetch-comments" || echo "stalled?" +#0 1 * * * "$FMS/commonlib/bin/run-with-lockfile.sh" -n "$LOCK_DIR/fetch-comments.lock" "$FMS/bin/fetch-comments-24hs" || echo "stalled?" 47 0-7,9-23 * * * "$FMS/commonlib/bin/run-with-lockfile.sh" -n "$LOCK_DIR/open311-populate-service-list.lock" "$FMS/bin/open311-populate-service-list" || echo "stalled?" 47 8 * * * "$FMS/commonlib/bin/run-with-lockfile.sh" -n "$LOCK_DIR/open311-populate-service-list.lock" "$FMS/bin/open311-populate-service-list --warn" || echo "stalled?" diff --git a/conf/general.yml-example b/conf/general.yml-example index 794b0780b..345a6426d 100644 --- a/conf/general.yml-example +++ b/conf/general.yml-example @@ -90,6 +90,10 @@ GEO_CACHE: '../cache/' MAPIT_URL: '' MAPIT_TYPES: [ 'ZZZ' ] +# If the MapIt you're using in MAPIT_URL requires an API key +# (as https://mapit.mysociety.org/ does, for example), specify it here. +# MAPIT_API_KEY: '' + # If you are using global MapIt, you might want to restrict FixMyStreet usage # to only one or more areas, rather than all O04, for example. Provide MapIt # IDs here in a list that FixMyStreet should recognise, along with the MapIt @@ -200,3 +204,10 @@ TESTING_COUNCILS: '' # if you're using Message Manager, include the URL here (see https://github.com/mysociety/message-manager/) MESSAGE_MANAGER_URL: '' + +# If you want to hide all pages from non-logged-in users, set this to 1. +LOGIN_REQUIRED: 0 + +# If you want to stop new users from registering, set this to 1. +# NB: This also disables all Facebook/Twitter logins. +SIGNUPS_DISABLED: 0 diff --git a/conf/httpd.conf-example b/conf/httpd.conf-example index d86517333..55be895e8 100644 --- a/conf/httpd.conf-example +++ b/conf/httpd.conf-example @@ -22,8 +22,8 @@ RewriteRule ^/alerts/?$ /alert [R=permanent,L] # Proxy mapit so that our js code can make calls on the originating server. Use # a RewriteRule rather than ProxyPass so that Apache's processing order is more # predictable. ProxyPassReverse is not affected by this. -RewriteRule /mapit/(.*) http://mapit.mysociety.org/$1 [P,L] -ProxyPassReverse /mapit/ http://mapit.mysociety.org/ +RewriteRule /mapit/(.*) https://mapit.mysociety.org/$1 [P,L] +ProxyPassReverse /mapit/ https://mapit.mysociety.org/ # serve static files directly RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -f diff --git a/conf/nginx.conf.example b/conf/nginx.conf.example index e166fc532..cc246d0db 100644 --- a/conf/nginx.conf.example +++ b/conf/nginx.conf.example @@ -47,7 +47,7 @@ server { rewrite ^/alerts/?$ /alert permanent; location /mapit { - proxy_pass http://mapit.mysociety.org/; + proxy_pass https://mapit.mysociety.org/; proxy_set_header X-Real-IP $remote_addr; } diff --git a/conf/packages b/conf/packages index 75794ee87..b199ec7f2 100644 --- a/conf/packages +++ b/conf/packages @@ -16,3 +16,5 @@ postgresql-server-dev-all gnuplot ttf-bitstream-vera libexpat1-dev +libssl-dev +zlib1g-dev diff --git a/conf/packages.generic b/conf/packages.generic index a0cd9fa16..c566c363b 100644 --- a/conf/packages.generic +++ b/conf/packages.generic @@ -12,3 +12,5 @@ postgresql-server-dev-all gnuplot ttf-bitstream-vera libexpat1-dev +libssl-dev +zlib1g-dev |