aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* 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
| | | |
| | * | Move RewriteEngine directive to top of vHost configGareth Rees2014-08-06-2/+1
| | | | | | | | | | | | | | | | Easier to see what mods are enabled if they’re not buried in the middle of configuration
| | * | Group passenger performance directives togetherGareth Rees2014-08-06-1/+1
| | | |
| | * | Decrease default PassengerMaxPoolSizeGareth Rees2014-08-06-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passenger's default MaxPoolSize is 6. At the time of writing normal* instances of Alaveteli seem to take 150-200MB per process, so we've set this conservatively at 3. * ‘Normal’ is basically any vHost other than WDTK, which is running at around 500MB per process
| | * | fixup! 2a0c4d7 add another passenger tuning guideGareth Rees2014-08-06-1/+4
| | | |
| | * | fixup! e8f30daGareth Rees2014-08-06-9/+0
| | | |
| | * | fixup! d7adeacGareth Rees2014-08-06-2/+0
| | | |
| | * | 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.
| * | | Fix typo in config_files:convert_init_scriptGareth Rees2014-08-07-1/+1
| | | |
| * | | Merge branch 'sysvinit-example' into rails-3-developGareth Rees2014-08-07-67/+86
| |\ \ \
| | * | | Tidy config_files:convert_init_scriptGareth Rees2014-08-07-10/+11
| | | | |
| | * | | Generate sysvinit with rake taskGareth Rees2014-08-07-4/+7
| | | | | | | | | | | | | | | | | | | | Now uses ugly so convert it with the rake task
| | * | | Update thin sysvinit descriptionsGareth Rees2014-08-07-2/+2
| | | | | | | | | | | | | | | | | | | | Replace "web server" with the slightly more correct "app server"
| | * | | Let ugly generate the full path to the appGareth Rees2014-08-07-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Usage of the $vhost_dir and $vcspath is enough to get the full path to the app without making the assumption that the app is in a directory named ‘alaveteli’
| | * | | Convert sysvinit-example to uglyGareth Rees2014-08-07-6/+12
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-10 00:24:39 +0000