diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2016-03-22 17:48:08 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2016-03-22 17:48:08 -0300 |
| commit | ce20cd241d1e4d10414bc809f6f936e70c630a7b (patch) | |
| tree | d5a4a6fef5cb2367cbce89d53639bf439efd1d19 | |
| parent | d8c47d5d1e48cc5d26a5f9078d5f6a9900710557 (diff) | |
| download | puppet-monkeysphere-ce20cd241d1e4d10414bc809f6f936e70c630a7b.tar.gz puppet-monkeysphere-ce20cd241d1e4d10414bc809f6f936e70c630a7b.tar.bz2 | |
Get rid of deprecation warnings
| -rw-r--r-- | templates/monkeysphere-authentication.conf.erb | 2 | ||||
| -rw-r--r-- | templates/monkeysphere-host.conf.erb | 2 | ||||
| -rw-r--r-- | templates/monkeysphere.conf.erb | 2 |
3 files changed, 3 insertions, 3 deletions
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 |