Get rid of deprecation warnings

diff --git a/templates/monkeysphere-authentication.conf.erb b/templates/monkeysphere-authentication.conf.erb
index b489a68f54bbf6bfb2325df949e15e79e66af49d..b945806f3621a679e9551387956fe2d4a790af6c 100644 (file)
--- a/templates/monkeysphere-authentication.conf.erb
+++ b/templates/monkeysphere-authentication.conf.erb
@@ -12,7 +12,7 @@
 
 # OpenPGP keyserver
 #KEYSERVER=pool.sks-keyservers.net
-<%= 'KEYSERVER='+keyserver if keyserver and keyserver != 'pool.sks-keyservers.net' %>
+<%= 'KEYSERVER='+@keyserver if @keyserver and @keyserver != 'pool.sks-keyservers.net' %>
 # User who controls the monkeysphere 'sphere' keyring.
 #MONKEYSPHERE_USER=monkeysphere
 

diff --git a/templates/monkeysphere-host.conf.erb b/templates/monkeysphere-host.conf.erb
index 418c696bb3ad937b3c1d255916316eb318171496..414eeb764a1421f83a29c22453867ecd6384372d 100644 (file)
--- a/templates/monkeysphere-host.conf.erb
+++ b/templates/monkeysphere-host.conf.erb
@@ -12,4 +12,4 @@
 
 # OpenPGP keyserver
 #KEYSERVER=pool.sks-keyservers.net
-<%= 'KEYSERVER='+keyserver if keyserver and keyserver != 'pool.sks-keyservers.net' %>
+<%= 'KEYSERVER='+@keyserver if @keyserver and @keyserver != 'pool.sks-keyservers.net' %>

diff --git a/templates/monkeysphere.conf.erb b/templates/monkeysphere.conf.erb
index 53e4b9efc68a8ea1a0449686942dce80f9a763bc..f2930f33453285892becd437b4e99fb37daca643 100644 (file)
--- a/templates/monkeysphere.conf.erb
+++ b/templates/monkeysphere.conf.erb
@@ -18,7 +18,7 @@
 
 # GPG keyserver to search for keys.
 #KEYSERVER=pool.sks-keyservers.net
-<%= 'KEYSERVER='+keyserver if keyserver and keyserver != 'pool.sks-keyservers.net' %>
+<%= 'KEYSERVER='+@keyserver if @keyserver and @keyserver != 'pool.sks-keyservers.net' %>
 # Set whether or not to check keyservers at every monkeysphere
 # interaction, including all ssh connections if you use the
 # monkeysphere ssh-proxycommand.  Leave unset for default behavior