diff options
| author | mh <mh@immerda.ch> | 2010-12-12 18:47:06 +0100 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2010-12-12 18:47:06 +0100 |
| commit | 22fba9762d707383c65c822c2310b17b1eb104c2 (patch) | |
| tree | e6fe3b90ff20e97965fa906a2f52ed10c24e9ce8 /templates/vhosts/php_wordpress | |
| parent | a87d7b91cc95c8ac7aee327e4cf4d3ce564cdea1 (diff) | |
enable HTS everywhere
Diffstat (limited to 'templates/vhosts/php_wordpress')
| -rw-r--r-- | templates/vhosts/php_wordpress/php_wordpress.erb | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/templates/vhosts/php_wordpress/php_wordpress.erb b/templates/vhosts/php_wordpress/php_wordpress.erb index c1003fe..5ae6e24 100644 --- a/templates/vhosts/php_wordpress/php_wordpress.erb +++ b/templates/vhosts/php_wordpress/php_wordpress.erb @@ -125,21 +125,19 @@ ErrorLog <%= logdir %>/error_log CustomLog <%= logdir %>/access_log combined <%- end -%> - <%- if default_charset.to_s != 'absent' then -%> - AddDefaultCharset <%= default_charset %> + AddDefaultCharset <%= default_charset %> <%- end -%> <%- if run_mode.to_s =~ /(proxy\-|static\-)?itk/ -%> + <IfModule mpm_itk_module> AssignUserId <%= run_uid+" "+run_gid %> </IfModule> - <%- end -%> - <%- if ssl_mode.to_s == 'force' then -%> + Header add Strict-Transport-Security "max-age=15768000" - <%- end -%> <Directory "<%= documentroot %>/"> AllowOverride <%= allow_override %> <%- if options.to_s != 'absent' or do_includes.to_s == 'true' then -%> @@ -323,15 +321,13 @@ ProxyPass / https://127.0.0.1/ <%- end -%> ProxyPassReverse / https://127.0.0.1/ - <%- if default_charset.to_s != 'absent' then -%> - AddDefaultCharset <%= default_charset %> + AddDefaultCharset <%= default_charset %> <%- end -%> - <%- if ssl_mode.to_s == 'force' then -%> + Header add Strict-Transport-Security "max-age=15768000" - <%- end -%> <%- if run_mode.to_s == 'static-itk' -%> <Directory "<%= documentroot %>/"> AllowOverride <%= allow_override %> |