diff options
Diffstat (limited to 'manifests/utils')
-rw-r--r-- | manifests/utils/development/ide.pp | 6 | ||||
-rw-r--r-- | manifests/utils/multimedia.pp | 1 | ||||
-rw-r--r-- | manifests/utils/multimedia/cdplayer.pp | 8 | ||||
-rw-r--r-- | manifests/utils/multimedia/studio.pp | 1 | ||||
-rw-r--r-- | manifests/utils/network/signal.pp | 4 | ||||
-rw-r--r-- | manifests/utils/network/tor.pp | 32 | ||||
-rw-r--r-- | manifests/utils/office/console.pp | 5 | ||||
-rw-r--r-- | manifests/utils/office/gui.pp | 1 | ||||
-rw-r--r-- | manifests/utils/storage/archive.pp | 1 |
9 files changed, 51 insertions, 8 deletions
diff --git a/manifests/utils/development/ide.pp b/manifests/utils/development/ide.pp index 47d3d98..8361562 100644 --- a/manifests/utils/development/ide.pp +++ b/manifests/utils/development/ide.pp @@ -8,7 +8,7 @@ class nodo::utils::development::ide ( 'myrepos', 'python3-sphinx', - 'python3-recommonmark', + 'python3-myst-parser', 'yamllint', @@ -66,6 +66,10 @@ class nodo::utils::development::ide ( 'exuberant-ctags', 'doxygen', 'agave', + + # Deprecated in favor of python3-myst-parser + # https://github.com/readthedocs/recommonmark + 'python3-recommonmark', ]: ensure => absent, } diff --git a/manifests/utils/multimedia.pp b/manifests/utils/multimedia.pp index 0b40660..30f5999 100644 --- a/manifests/utils/multimedia.pp +++ b/manifests/utils/multimedia.pp @@ -33,7 +33,6 @@ class nodo::utils::multimedia inherits nodo::utils::multimedia::minimal { 'audacious', 'qjackctl', 'easytag', - 'audacity', 'opencubicplayer', 'picard', 'gxine', diff --git a/manifests/utils/multimedia/cdplayer.pp b/manifests/utils/multimedia/cdplayer.pp index e2c7a71..6ec3d0e 100644 --- a/manifests/utils/multimedia/cdplayer.pp +++ b/manifests/utils/multimedia/cdplayer.pp @@ -3,10 +3,16 @@ class nodo::utils::multimedia::cdplayer ( ) { # CD writers and extractors package { [ - 'mcdp', 'cdtool', 'cd-discid', ]: ensure => $ensure, } + + # No longer available + package { [ + 'mcdp', + ]: + ensure => absent, + } } diff --git a/manifests/utils/multimedia/studio.pp b/manifests/utils/multimedia/studio.pp index 72b42b1..0675a08 100644 --- a/manifests/utils/multimedia/studio.pp +++ b/manifests/utils/multimedia/studio.pp @@ -5,6 +5,7 @@ class nodo::utils::multimedia::studio ( 'ardour', 'hydrogen', 'mixxx', + 'audacity', ]: ensure => $ensure, } 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..f93d37a 100644 --- a/manifests/utils/network/tor.pp +++ b/manifests/utils/network/tor.pp @@ -3,9 +3,28 @@ class nodo::utils::network::tor ( $ensure = 'installed', ) { + $keyrings_folder = "/usr/share/keyrings" + $keyring = "${keyrings_folder}/deb.torproject.org-keyring.gpg" + 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', + definition => "deb [signed-by=${keyring}] https://deb.torproject.org/torproject.org ${::lsbdistcodename} main", + key_source => "puppet:///modules/nodo/${keyring}", + keyrings_folder => "${keyrings_folder}", + } + + # Puppet should setup the Tor Project's APT keyring only in the first time + # Afterwards ${keyring} will be managed by the deb.torproject.org-keyring package + # + # References: + # + # * https://support.torproject.org/apt/tor-deb-repo/ + # * https://gitlab.torproject.org/tpo/web/support/-/merge_requests/220 + exec { 'torproject-keyring-copy': + command => "cp ${keyrings_folder}/torproject.org.gpg ${keyring}", + onlyif => "/bin/test ! -e ${keyring}", + creates => "${keyring}", + require => File["${keyrings_folder}/torproject.org.gpg"], + notify => Exec["apt-repo-auto-update-torproject.org"], } package { "deb.torproject.org-keyring": @@ -14,8 +33,15 @@ class nodo::utils::network::tor ( } package { [ - 'tor-arm', + 'nyx', ]: ensure => $ensure, } + + # Package 'tor-arm' was renamed to 'nyx' + package { [ + 'tor-arm', + ]: + ensure => absent, + } } diff --git a/manifests/utils/office/console.pp b/manifests/utils/office/console.pp index b35247e..201adbb 100644 --- a/manifests/utils/office/console.pp +++ b/manifests/utils/office/console.pp @@ -17,6 +17,11 @@ class nodo::utils::office::console ( #'worklog', #'lolcat', #'aewan', + + # Needed by finder + # https://git.fluxo.info/finder + 'python3-prompt-toolkit', + 'python3-platformdirs', ]: ensure => $ensure, } diff --git a/manifests/utils/office/gui.pp b/manifests/utils/office/gui.pp index 6cde1aa..5f80288 100644 --- a/manifests/utils/office/gui.pp +++ b/manifests/utils/office/gui.pp @@ -4,6 +4,7 @@ class nodo::utils::office::gui ( package { [ 'libreoffice', 'libreoffice-gtk3', + 'pdfarranger', #'pdftk', ]: ensure => $ensure, diff --git a/manifests/utils/storage/archive.pp b/manifests/utils/storage/archive.pp index 336c74d..9eecc44 100644 --- a/manifests/utils/storage/archive.pp +++ b/manifests/utils/storage/archive.pp @@ -6,6 +6,7 @@ class nodo::utils::storage::archive ( 'convmv', 'rdfind', 'rclone', + 'onionshare', ]: #ensure => latest, ensure => $ensure, |