diff options
Diffstat (limited to 'config')
-rw-r--r-- | config/application.rb | 3 | ||||
-rw-r--r-- | config/httpd.conf-example | 7 |
2 files changed, 10 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index ed4f07819..366077795 100644 --- a/config/application.rb +++ b/config/application.rb @@ -36,6 +36,9 @@ module Alaveteli # JavaScript files you want as :defaults (application.js is always included). # config.action_view.javascript_expansions[:defaults] = %w(jquery rails) + # Allow some extra tags to be whitelisted in the 'sanitize' helper method + config.action_view.sanitized_allowed_tags = 'html', 'head', 'body', 'table', 'tr', 'td', 'style' + # Configure the default encoding used in templates for Ruby 1.9. config.encoding = "utf-8" diff --git a/config/httpd.conf-example b/config/httpd.conf-example index 1a3729f5d..00722fbdf 100644 --- a/config/httpd.conf-example +++ b/config/httpd.conf-example @@ -108,6 +108,13 @@ RewriteCond %{DOCUMENT_ROOT}/views_cache/cy/request/$2/$1/${escape:$3} -f RewriteRule ^/cy/request/((\d{1,3})\d*)/(response/\d+/attach/(html/)?\d+/.+) /views_cache/cy/request/$2/$1/${escape:$3} [L] + # Don't allow anything to execute from the cache + <Directory "/var/www/alaveteli/public/views_cache"> + Options -ExecCGI + SetHandler default-handler + AllowOverride None + </Directory> + # Compress assets <Location /> <IfModule mod_deflate.c> |