diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2016-06-17 15:47:11 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2016-06-17 15:47:11 -0300 |
| commit | b62c9285b333c196e61955bced6e93acfc832883 (patch) | |
| tree | 911d7e65dd4eae387095d1829b9e62956c7b5c19 | |
| parent | aae2adb3f392da40546f03451e65c59b3f3d528b (diff) | |
| download | puppet-nginx-b62c9285b333c196e61955bced6e93acfc832883.tar.gz puppet-nginx-b62c9285b333c196e61955bced6e93acfc832883.tar.bz2 | |
Fix deprecations
| -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 888c969..fd61458 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 *.<%= @name %> <%= @name %>; ssl on; - ssl_certificate /etc/letsencrypt/live/<%= name %>/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/<%= name %>/privkey.pem; + ssl_certificate /etc/letsencrypt/live/<%= @name %>/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/<%= @name %>/privkey.pem; ssl_session_timeout 5m; diff --git a/templates/site.erb b/templates/site.erb index 15d1600..acfa01a 100644 --- a/templates/site.erb +++ b/templates/site.erb @@ -1,9 +1,9 @@ server { listen 80; - server_name *.<%= name %> <%= name %>; + server_@name *.<%= @name %> <%= @name %>; location /.well-known/acme-challenge { - root /var/spool/certbot/<%= name %>; + root /var/spool/certbot/<%= @name %>; } location / { |