From: Silvio Rhatto Date: Tue, 22 Mar 2016 20:48:08 +0000 (-0300) Subject: Get rid of deprecation warnings X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=ce20cd241d1e4d10414bc809f6f936e70c630a7b;p=puppet-monkeysphere.git Get rid of deprecation warnings --- diff --git a/templates/monkeysphere-authentication.conf.erb b/templates/monkeysphere-authentication.conf.erb index b489a68..b945806 100644 --- 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 418c696..414eeb7 100644 --- 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 53e4b9e..f2930f3 100644 --- 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