diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2016-06-25 13:37:11 -0300 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2016-06-25 13:37:11 -0300 |
commit | 557c50672dfa964ad0e59b0aea19e2c59121322f (patch) | |
tree | 816b432c65d75e1494aba81848ccf4e25f77cf13 /templates | |
parent | 95da4e006a2bc31f409c78872472db3ac01250d4 (diff) | |
download | puppet-nginx-557c50672dfa964ad0e59b0aea19e2c59121322f.tar.gz puppet-nginx-557c50672dfa964ad0e59b0aea19e2c59121322f.tar.bz2 |
Aliases support on nginx::site
Diffstat (limited to 'templates')
-rw-r--r-- | templates/site-ssl.erb | 6 | ||||
-rw-r--r-- | templates/site.erb | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/templates/site-ssl.erb b/templates/site-ssl.erb index 57b285f..c0af188 100644 --- a/templates/site-ssl.erb +++ b/templates/site-ssl.erb @@ -1,10 +1,10 @@ server { listen 443; - server_name *.<%= @use_fqdn %> <%= @use_fqdn %>; + server_name <%= @server_name %> <%= @aliases %>; ssl on; - ssl_certificate /etc/letsencrypt/live/<%= @use_fqdn %>/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/<%= @use_fqdn %>/privkey.pem; + ssl_certificate /etc/letsencrypt/live/<%= @server_name %>/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/<%= @server_name %>/privkey.pem; # enable HSTS header add_header Strict-Transport-Security "max-age=15768000; includeSubdomains; preload"; diff --git a/templates/site.erb b/templates/site.erb index 9c575cb..3fe5f81 100644 --- a/templates/site.erb +++ b/templates/site.erb @@ -1,9 +1,9 @@ server { - listen 80; - server_name *.<%= @use_fqdn %> <%= @use_fqdn %>; + listen 80; + server_name <%= @server_name %> <%= @aliases %>; location /.well-known/acme-challenge { - root /var/spool/certbot/<%= @use_fqdn %>; + root /var/spool/certbot/<%= @server_name %>; } location / { |