diff options
Diffstat (limited to 'manifests/utils/network/tor.pp')
| -rw-r--r-- | manifests/utils/network/tor.pp | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/manifests/utils/network/tor.pp b/manifests/utils/network/tor.pp index 78b08a4..f8726f7 100644 --- a/manifests/utils/network/tor.pp +++ b/manifests/utils/network/tor.pp @@ -3,9 +3,15 @@ class nodo::utils::network::tor ( $ensure = 'installed', ) { - nodo::subsystem::apt::repo { 'torproject.org': - definition => "deb [signed-by=/etc/apt/trusted.gpg.d/torproject.org.gpg] https://deb.torproject.org/torproject.org ${::lsbdistcodename} main", - key_source => 'puppet:///modules/nodo/etc/apt/trusted.gpg.d/torproject.org.gpg', + # Old keyring location + file { '/etc/apt/trusted.gpg.d/torproject.org.gpg': + ensure => absent, + } + + nodo::subsystem::apt::repo { 'deb.torproject.org-keyring.gpg': + definition => "deb [signed-by=/usr/share/keyrings/deb.torproject.org-keyring.gpg] https://deb.torproject.org/torproject.org ${::lsbdistcodename} main", + key_source => 'puppet:///modules/nodo/usr/share/keyrings/deb.torproject.org-keyring.gpg', + keyrings_folder => '/usr/share/keyrings', } package { "deb.torproject.org-keyring": @@ -14,8 +20,15 @@ class nodo::utils::network::tor ( } package { [ - 'tor-arm', + 'nyx', ]: ensure => $ensure, } + + # Package 'tor-arm' was renamed to 'nyx' + package { [ + 'tor-arm', + ]: + ensure => absent, + } } |