aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Group httpd assets directives togetherGareth Rees2014-08-06-6/+6
|
* fixup! 134d9934 fix PassengerAppRoot pathGareth Rees2014-08-06-1/+1
|
* Comment rarely-used httpd configurationGareth Rees2014-08-05-7/+7
| | | | Unlikely that reusers will use this, but left for documentation purposes
* Update httpd conf static asset location matchingGareth Rees2014-08-05-1/+1
|
* Remove unneeded httpd config directivesGareth Rees2014-08-05-11/+0
| | | | These are/were mySociety generic and not required for standalone use
* fixup! ab1f215 fix typoGareth Rees2014-07-21-1/+1
|
* fixup! ab1f215 Update SSL cert pathsGareth Rees2014-07-17-4/+4
|
* Allow forced https rewrite to be configurableGareth Rees2014-07-17-7/+8
| | | | | | | Enable with: mkdir -p /etc/apache2/vhost.d/alaveteli cp /opt/alaveteli/config/httpd-force-ssl.conf-example \ /etc/apache2/vhost.d/alaveteli/force-ssl.conf
* Add example HTTPS vhostGareth Rees2014-07-17-0/+24
|
* Comment out forced redirect to HTTPSGareth Rees2014-07-17-2/+5
| | | Only need this if FORCE_SSL: true is set
* fixup! 134d993 Use easier to set up log dirsGareth Rees2014-07-16-2/+2
| | | Using alaveteli subdir means more setup; easier to just prefix the file name with alaveteli. Also use .log rather than _log to keep with original access.log and error.log convention.
* fixup! 134d993 use apache2 rather than httpd for log dirGareth Rees2014-07-16-2/+2
| | | For dumb Debian convention
* Add link to Passenger performance tuning guideGareth Rees2014-07-16-0/+1
|
* fixup! 134d993 Remove PassengerMinInstancesGareth Rees2014-07-16-1/+0
| | | Not available in Debian version of passenger
* fixup! 134d993 Remove PassengerGroup/UserGareth Rees2014-07-16-2/+0
| | | Not available in Debian version of passenger
* fixup! 134d993 Use /srv/alaveteli instead of SITE_URLGareth Rees2014-07-16-8/+8
|
* Add example httpd vhost config fileGareth Rees2014-07-01-0/+161
| | | | | | httpd.conf is only a partial configuration designed to be included in to an existing vhost directive. This provides a (nearly) drop-in vhost configuration for httpd.
* Merge branch 'update-database-config-example' into rails-3-developGareth Rees2014-06-26-4/+6
|\
| * Add template to example database configGareth Rees2014-06-26-0/+3
| | | | | | | | | | Recommended setup includes creating a template (d0a8e9b) so specify that in the database configuration example too.
| * Rename example databases to match documentationGareth Rees2014-06-26-4/+3
|/ | | | | Renamed with alaveteli_ prefix rather than foi_ in 3cd30c9 so keep the example consistent.
* Merge branch 'rails-3-develop' of ↵Louise Crow2014-06-26-1/+4
|\ | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
| * Merge branch 'use-utf8-database' into rails-3-developGareth Rees2014-06-26-1/+4
| |\
| | * Use UTF-8 database for Travis testsGareth Rees2014-06-13-1/+4
| | |
* | | Removing houndci.com configLouise Crow2014-06-26-11/+0
|/ / | | | | | | | | | | | | It's producing too many style messages at the moment. Consistent style is good, but we don't want it at the risk of discouraging contributions. Maybe we can restore it when we have a more consistent house style to work from.
* | Don't check line length until we change the tab default to 2 spacesLouise Crow2014-06-25-0/+3
| |
* | Strip prefix from syntax following the example on ↵Louise Crow2014-06-25-2/+2
| | | | | | | | https://houndci.com/configuration
* | Merge branch 'issues/1415-bulk-update-public-bodies' into rails-3-developGareth Rees2014-06-25-54/+266
|\ \
| * | Move PublicBody domain logic from controllerGareth Rees2014-06-06-2/+19
| | | | | | | | | | | | | | | | | | Moves the magic 'site_administration' tag logic to the PublicBody model. Easier to make the string passed to `PublicBody#has_tag?` configurable if we want to allow this to be set per install.
| * | Add PublicBodyController#list_all_csv specsGareth Rees2014-06-06-0/+17
| | | | | | | | | | | | | | | - Shouldn't include non-visible bodies - Shouldn't include internal admin bodies
| * | Extract public body CSV export to its own classGareth Rees2014-06-06-50/+232
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - SRP: Do one thing. PublicBodyCSV converts a collection of bodies in to a CSV formatted String - Adds some parenthesis around parameters in PublicBodyController#list_all_csv - Let the controller handle what records to pull out for the CSV export Arguably this doesn't really need to be anything to do with PublicBody, but it allows us to set nice defaults.
| * | Remove FasterCSV dependencyGareth Rees2014-06-04-4/+0
| | | | | | | | | | | | The last remaining usage was removed in c1ee22fe
* | | Merge branch 'issues/1434-email-highlighting' into rails-3-developGareth Rees2014-06-25-41/+494
|\ \ \
| * | | Handle unhelpful stemmingGareth Rees2014-06-25-8/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Stemming returns 'bore' as the word to highlight which can't be matched in the original phrase. Also removes duplicates from the results
| * | | Add spec for highlight_and_excerptGareth Rees2014-06-25-1/+50
| | | |
| * | | Use regex based highlightingGareth Rees2014-06-25-19/+33
| | | |
| * | | Add helper to highlight and excerpt by regexGareth Rees2014-06-25-19/+313
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of https://github.com/rails/rails/pull/11793/ Contains integration tests to check that it works as expected with ActsAsXapian.
| * | | Improve ActsAsXapian::Search#words_to_highlightGareth Rees2014-06-16-15/+56
| | | | | | | | | | | | | | | | | | | | | | | | - Ignore stopwords - Use Stemming - Wrap words with regex for use in a highlighter (optional)
* | | | Merge branch 'convert-crontab-mailto' into rails-3-developGareth Rees2014-06-25-3/+4
|\ \ \ \
| * | | | Add MAILTO option to convert_crontab taskGareth Rees2014-06-25-3/+4
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Less manual editing for reinstallers. Existing backwards-compatibility: $ bundle exec rake config_files:convert_crontab \ DEPLOY_USER=deploy \ VHOST_DIR=/home/vagrant/ \ VCSPATH=alaveteli \ SITE=alaveteli \ CRONTAB=config/crontab-example | grep 'MAILTO=' MAILTO=cron-alaveteli@mysociety.org New optional MAILTO option: $ bundle exec rake config_files:convert_crontab \ DEPLOY_USER=deploy \ VHOST_DIR=/home/vagrant/ \ VCSPATH=alaveteli \ SITE=alaveteli CRONTAB=config/crontab-example \ MAILTO=cron@example.org | grep 'MAILTO=' MAILTO=cron@example.org
* | | | Merge branch 'quiet_assets' into rails-3-developGareth Rees2014-06-25-0/+4
|\ \ \ \
| * | | | Add quiet_assets gemGareth Rees2014-06-18-0/+4
| | | | | | | | | | | | | | | | | | | | Mutes assets pipeline log messages in development mode
* | | | | Merge branch 'issues/112-replace-run-with-lockfile' into rails-3-developLouise Crow2014-06-24-13/+12
|\ \ \ \ \
| * | | | | Use the run-with-lockfile shell script instead of the C programLouise Crow2014-06-19-13/+12
| | | | | | | | | | | | | | | | | | | | | | | | Then re-installers don't have to compile anything.
* | | | | | Use the EnforcedStyle key to switch from the ruby19 default to hashrocketsLouise Crow2014-06-24-4/+1
|/ / / / /
* | | | | Merge branch 'reference-new-docs' into rails-3-developLouise Crow2014-06-18-12/+12
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Update locations, use bullet points.Louise Crow2014-06-18-6/+6
| | | | |
| * | | | Update useful locationsLouise Crow2014-06-18-6/+6
|/ / / / | | | | | | | | | | | | Most useful documentation now at alaveteli.org
* | | | Merge branch 'rails-3-develop' of ↵Louise Crow2014-06-16-233/+362
|\| | | | | | | | | | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
| * | | Fix typoGareth Rees2014-06-16-2/+2
| | | | | | | | | | | | | | | | Fixes typo in 6bd0bfe
| * | | Merge branch 'replace-xxx-todo' into rails-3-developGareth Rees2014-06-16-117/+117
| |\ \ \