diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2024-08-19 09:48:40 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2024-08-19 09:48:40 -0300 |
| commit | 8cf2fef7ecefa4cff9ae1545eddc9a07c0dc4fc0 (patch) | |
| tree | 6b738c70e06ffeefa14021f34941d260ecb645c5 /manifests/utils | |
| parent | 20658b1f3e41f2b1f7b0d796ac72f45c36d03730 (diff) | |
| download | puppet-nodo-8cf2fef7ecefa4cff9ae1545eddc9a07c0dc4fc0.tar.gz puppet-nodo-8cf2fef7ecefa4cff9ae1545eddc9a07c0dc4fc0.tar.bz2 | |
Changes on Tor, Signal and APT repository handling
Diffstat (limited to 'manifests/utils')
| -rw-r--r-- | manifests/utils/network/signal.pp | 4 | ||||
| -rw-r--r-- | manifests/utils/network/tor.pp | 21 |
2 files changed, 19 insertions, 6 deletions
diff --git a/manifests/utils/network/signal.pp b/manifests/utils/network/signal.pp index 037140a..6cd200b 100644 --- a/manifests/utils/network/signal.pp +++ b/manifests/utils/network/signal.pp @@ -1,7 +1,7 @@ class nodo::utils::network::signal { nodo::subsystem::apt::repo { 'signal.org': - definition => 'deb [arch=amd64] https://updates.signal.org/desktop/apt xenial main', - key_source => 'puppet:///modules/nodo/etc/apt/trusted.gpg.d/signal.org.gpg', + definition => 'deb [signed-by=/etc/apt/keyrings/signal.org.gpg arch=amd64] https://updates.signal.org/desktop/apt xenial main', + key_source => 'puppet:///modules/nodo/etc/apt/keyrings/signal.org.gpg', } package { 'signal-desktop': 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, + } } |