aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Add charset to view-as-html templateGareth Rees2014-08-19-0/+2
|
* Add charset to view-as-html stylesheet linksGareth Rees2014-08-18-5/+4
|
* Fix httpd vhost example not sourcing conf filesGareth Rees2014-08-18-1/+1
|
* Merge branch 'customisable-vagrant-box' into rails-3-developGareth Rees2014-08-18-3/+97
|\
| * Add -y option to install python-software-propertiesGareth Rees2014-08-18-1/+1
| |
| * Install the tools to install the tools!Gareth Rees2014-08-18-0/+1
| |
| * Use our own Launchpad Ubuntu repo to get pdftkLouise Crow2014-08-18-6/+11
| |
| * Precise specific fixesGareth Rees2014-08-18-1/+33
| | | | | | | | | | - Get bundler and pdftk from raring repo and de-prioritise all other raring packages
| * Use official Canonical Ubuntu Precise imageGareth Rees2014-08-13-1/+1
| | | | | | | | Better source and includes curl
| * Update commonlibGareth Rees2014-08-13-0/+0
| |
| * Add script to test vagrant vm provisioningGareth Rees2014-08-13-0/+19
| | | | | | | | - e.g. script/test-vagrant-provisioning squeeze64
| * Debian specific fixesGareth Rees2014-08-13-0/+22
| | | | | | | | | | | | | | - Add wheezy repo to get bundler package which is unavailable in squeeze repo - Get bundler from wheezy repo and de-prioritise all other wheezy packages
| * Update commonlibGareth Rees2014-08-08-0/+0
| |
| * Use curl instead of wget in VagrantfileGareth Rees2014-08-08-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Use curl instead of wget in Vagrantfile to fetch the install script due to a bug in the default version of wget on Debian Squeeze. Fixes https://github.com/mysociety/alaveteli/issues/1691 > wget debian packages prior to 1.14-1 don't have SNI [1] support so the > webserver don't know which ssl certificate needs to use > > – https://github.com/Hexxeh/rpi-update/issues/65#issuecomment-13332143
| * Add customisable OS to VagrantfileGareth Rees2014-08-08-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | Choose the OS you want to run with the ALAVETELI_VAGRANT_OS environment variable. Examples: # Use default (Ubuntu 12.04 LTS (precise) vagrant up # Use Debian (7) Wheezy ALAVETELI_VAGRANT_OS=wheezy64 vagrant up
* | Merge branch 'nginx-config' into rails-3-developGareth Rees2014-08-18-13/+62
|\ \
| * | Use legacy alaveteli install path for nginx rootGareth Rees2014-08-18-5/+5
| | | | | | | | | | | | | | | | | | For backwards compatability with the install script, use PREFIX/HOST/SITE
| * | Don’t assume alaveteli is the default serverGareth Rees2014-08-18-1/+1
| | | | | | | | | | | | Can either be added manually (or by the install script) or nginx will default to this server if there are no others available
| * | Make setting the server_name a manual stepGareth Rees2014-08-18-1/+3
| | | | | | | | | | | | Interferes with the install script and the server will work without it providing it is the only server available
| * | Make nginx redirect server an exampleGareth Rees2014-08-18-4/+7
| | | | | | | | | | | | | | | | | | This is unusable with the install script as you can’t pass additional domains to it. Also makes the assumption that you’re using www. as the canonical domain name, which might not be the case if you were running alaveteli as as e.g. foi.example.org.
| * | Use legacy document rootGareth Rees2014-08-18-2/+2
| | | | | | | | | | | | Too difficult to change to FSH standard at this point
| * | Add nginx ssl config exampleGareth Rees2014-08-18-0/+32
| | |
| * | Add nginx custom logsGareth Rees2014-08-18-0/+3
| | |
| * | Add nginx server to redirect other domainsGareth Rees2014-08-18-0/+5
| | |
| * | Use try_files instead of two location blocksGareth Rees2014-08-18-12/+9
| | |
| * | Change nginx document_root to be FSH compliantGareth Rees2014-07-21-1/+1
| | |
| * | nginx listen to standard rails portGareth Rees2014-07-21-1/+1
| | |
| * | Use production paths for nginx configGareth Rees2014-07-21-2/+2
| | |
| * | Turn nginx server_tokens offGareth Rees2014-07-21-0/+3
| | |
| * | Add error_page to nginx configGareth Rees2014-07-21-0/+4
| | |
* | | Merge branch 'sysvinit-passenger' into rails-3-developGareth Rees2014-08-15-8/+64
|\ \ \
| * | | Make down.default.html genericGareth Rees2014-08-15-6/+3
| | | |
| * | | Fix down.default.html asset pathsGareth Rees2014-08-15-2/+2
| | | |
| * | | Add passenger sysvinitGareth Rees2014-08-15-0/+59
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Adds a sysvinit script for passenger based apps. Stops the daemon by adding a tmp/stop.txt file [1], which requires a httpd directive to return 503 if the file exists. [1] http://blog.flowdock.com/2009/03/11/stopping-your-rails-application-with-phusion-passenger/
* | | Merge branch 'rails-3-develop' of ↵Louise Crow2014-08-12-2/+2
|\ \ \ | | | | | | | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
| * \ \ Merge branch 'example-files' into rails-3-developGareth Rees2014-08-12-0/+0
| |\ \ \
| | * | | use .example suffix for httpd ssl example filesGareth Rees2014-08-12-0/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > Files in the vhost repo config directory with '-example' suffixes > are currently used as a prompt for our deployment system to find and > process a matching '.ugly' config file from our internal templates > path (and the deployment system errors if those '.ugly' files > don't exist). https://github.com/mysociety/Non-Site-Specific/issues/474
| * | | Merge branch 'excerpt-args' into rails-3-developGareth Rees2014-08-12-2/+2
| |\ \ \
| | * | | Since e5a73815 excerpt requires a hash for optionsGareth Rees2014-08-12-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | HighlightHelper#excerpt backports the Rails 4 excerpt which requires a Hash for the options parameter rather than globbing the remaining arguments.
* | | | Merge branch 'hotfix/0.18.0.12' into rails-3-developLouise Crow2014-08-12-200/+189
|\ \ \ \ | |/ / / |/| | |
| * | | Latest strings from Transifexhotfix/0.18.0.12Louise Crow2014-08-12-200/+189
| | | | | | | | | | | | | | | | Fixes bug in Welsh translation - interpolation variable had been translated
* | | | Merge branch 'issues/1709-use-event-id-in-query' into rails-3-developLouise Crow2014-08-11-17/+36
|\ \ \ \
| * | | | Use since_event_id to restrict query, not just data displayed.Louise Crow2014-08-11-17/+36
|/ / / / | | | | | | | | | | | | | | | | Allow the same params (since_event_id, since_date) for both formats. There doesn't seem to be a particular reason not to treat them the same.
* | | | Merge branch 'rails-3-develop' of ↵Louise Crow2014-08-08-148/+260
|\ \ \ \ | | |/ / | |/| | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
| * | | Merge branch 'httpd-vhost' into rails-3-developGareth Rees2014-08-07-79/+172
| |\ \ \
| | * | | Remove legacy httpd.conf-exampleGareth Rees2014-08-07-224/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the unused httpd.conf-example with the contents of httpd-vhost.conf-example Also rename the SSL vhost for continuity
| | * | | Use legacy document rootGareth Rees2014-08-06-7/+7
| | | | | | | | | | | | | | | | | | | | Too difficult to change to FSH standard at this point
| | * | | Add note about RackEnv passenger directiveGareth Rees2014-08-06-0/+2
| | | | |
| | * | | Run passenger as alaveteli user rather than foiGareth Rees2014-08-06-1/+1
| | | | | | | | | | | | | | | | | | | | The manual install guide assumes alaveteli as the file owner and foi as the database user, so do that here.
| | * | | Add additional note about SuExecUserGroupGareth Rees2014-08-06-1/+2
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-02 01:45:40 +0000