diff options
| author | varac <varacanero@zeromail.org> | 2017-02-27 16:12:13 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2017-02-27 16:12:13 +0100 |
| commit | 40a9a74309e02bff27433796cc8a8dfb29018b10 (patch) | |
| tree | 43b107d5cd020054a57d272c00bdf731992a7815 | |
| parent | 90b0a5f4dd1ed78a3b0dc0b5fb3d75bf8d3d5fd1 (diff) | |
Fix fetching of pixelated apt key
| -rw-r--r-- | provisioning/modules/pixelated/manifests/apt.pp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/provisioning/modules/pixelated/manifests/apt.pp b/provisioning/modules/pixelated/manifests/apt.pp index bf924b97..caf96065 100644 --- a/provisioning/modules/pixelated/manifests/apt.pp +++ b/provisioning/modules/pixelated/manifests/apt.pp @@ -16,9 +16,9 @@ class pixelated::apt { } exec{'add_pixelated_key': - command => '/usr/bin/apt-key adv --keyserver pool.sks-keyservers.net --recv-keys F4C220FCD74F4DF45DD78FC0287A1542472DC0E3' - refreshonly => true, - notify => Exec['apt_get_update'], + command => '/usr/bin/apt-key adv --keyserver pool.sks-keyservers.net --recv-keys F4C220FCD74F4DF45DD78FC0287A1542472DC0E3', + unless => '/usr/bin/apt-key finger 2>&1 | grep -q "F4C2 20FC D74F 4DF4 5DD7 8FC0 287A 1542 472D C0E3"', + notify => Exec['apt_get_update'], } # nodejs latest repo @@ -30,7 +30,8 @@ class pixelated::apt { } exec{'add_nodesource_key': command => '/usr/bin/curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -', - notify => Exec['apt_get_update'] + unless => '/usr/bin/apt-key finger 2>&1 | grep -q "9FD3 B784 BC1C 6FC3 1A8A 0A1C 1655 A0AB 6857 6280"', + notify => Exec['apt_get_update'] } file { '/etc/apt/preferences.d/nodejs': content => |