Fix deprecations

diff --git a/templates/site-ssl.erb b/templates/site-ssl.erb
index 888c969897f8148dde52b5124f6a8fe393455d7d..fd61458869d9ab0cbd3eb5eb7a8b7bbbbf3a18a8 100644 (file)
--- 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 15d1600e8df8c334f14f52f1b477a12a1bf0c1bd..acfa01a3ea7b66d0963087c55dafe3b671a4ddfb 100644 (file)
--- 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 / {