From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 17 Jun 2016 18:47:11 +0000 (-0300)
Subject: Fix deprecations
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=b62c9285b333c196e61955bced6e93acfc832883;p=puppet-nginx.git

Fix deprecations
---

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 / {