diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2016-06-17 15:56:48 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2016-06-17 15:56:48 -0300 |
| commit | 87521903b5d4b9dc96758b4e734ca3db96c9b214 (patch) | |
| tree | d33f85ce1c0ab09a417f188a26caf2d603192b82 /templates | |
| parent | af426f2985e75d0dc235bbb05460eed41315cc94 (diff) | |
| download | puppet-nginx-87521903b5d4b9dc96758b4e734ca3db96c9b214.tar.gz puppet-nginx-87521903b5d4b9dc96758b4e734ca3db96c9b214.tar.bz2 | |
Adds use_fqdn param
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/site-ssl.erb | 6 | ||||
| -rw-r--r-- | templates/site.erb | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/templates/site-ssl.erb b/templates/site-ssl.erb index 871aeb4..ee9c5c8 100644 --- a/templates/site-ssl.erb +++ b/templates/site-ssl.erb @@ -1,10 +1,10 @@ server { listen 443 ssl http2; - server_name *.<%= @name %> <%= @name %>; + server_name *.<%= @use_fqdn %> <%= @use_fqdn %>; ssl on; - ssl_certificate /etc/letsencrypt/live/<%= @name %>/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/<%= @name %>/privkey.pem; + ssl_certificate /etc/letsencrypt/live/<%= @use_fqdn %>/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/<%= @use_fqdn %>/privkey.pem; ssl_session_timeout 5m; diff --git a/templates/site.erb b/templates/site.erb index 93b66b8..9c575cb 100644 --- a/templates/site.erb +++ b/templates/site.erb @@ -1,9 +1,9 @@ server { listen 80; - server_name *.<%= @name %> <%= @name %>; + server_name *.<%= @use_fqdn %> <%= @use_fqdn %>; location /.well-known/acme-challenge { - root /var/spool/certbot/<%= @name %>; + root /var/spool/certbot/<%= @use_fqdn %>; } location / { |