Unified Diff: modules/trac/files/site.conf
Issue 5734493784637440:
Issue 245 - Unify SSL configuration for all servers (Closed)
Patch Set: Converted Nagios site configuration and centralized error page configuration
Created April 10, 2014, 6:40 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« modules/statsmaster/manifests/init.pp ('k')
|
modules/trac/manifests/init.pp » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: modules/trac/files/site.conf |
| =================================================================== |
| rename from modules/trac/templates/site.erb |
| rename to modules/trac/files/site.conf |
| --- a/modules/trac/templates/site.erb |
| +++ b/modules/trac/files/site.conf |
| @@ -1,45 +1,12 @@ |
| -server { |
| - server_name <%= @domain %>; |
| - |
| - <% if is_default %> |
| - listen 80 default_server; |
| - listen [::]:80 default_server; |
| - <% else %> |
| - listen 80; |
| - listen [::]:80; |
| - <% end %> |
| - |
| - location / { |
| - rewrite (.*) https://$host$1 permanent; |
| - } |
| +location / |
| +{ |
| + fastcgi_pass unix:/tmp/trac-fastcgi.sock; |
| + fastcgi_split_path_info ^()(.*)$; |
| + include /etc/nginx/fastcgi_params; |
| + fastcgi_param PATH_INFO $fastcgi_path_info; |
| } |
| -server { |
| - server_name <%= @domain %>; |
| - |
| - <% if is_default %> |
| - listen 443 ssl default_server; |
| - listen [::]:443 ssl default_server; |
| - <% else %> |
| - listen 443 ssl; |
| - listen [::]:443 ssl; |
| - <% end %> |
| - |
| - ssl_certificate adblockplus.org_sslcert.pem; |
| - ssl_certificate_key adblockplus.org_sslcert.key; |
| - |
| - add_header Strict-Transport-Security max-age=31536000; |
| - |
| - location / |
| - { |
| - fastcgi_pass unix:/tmp/trac-fastcgi.sock; |
| - fastcgi_split_path_info ^()(.*)$; |
| - include /etc/nginx/fastcgi_params; |
| - fastcgi_param PATH_INFO $fastcgi_path_info; |
| - } |
| - |
| - location /chrome/ |
| - { |
| - alias /home/trac/htdocs/htdocs/; |
| - } |
| +location /chrome/ |
| +{ |
| + alias /home/trac/htdocs/htdocs/; |
| } |
« no previous file with comments
|
« modules/statsmaster/manifests/init.pp ('k')
|
modules/trac/manifests/init.pp » ('j')
|
no next file with comments »
