diff options
| author | Jesse Luehrs <doy@tozt.net> | 2020-05-01 20:08:50 -0400 |
|---|---|---|
| committer | Jesse Luehrs <doy@tozt.net> | 2020-05-01 20:08:50 -0400 |
| commit | 45f7e7661261dfdcc1d81624c79b82503a0d6e10 (patch) | |
| tree | 2d27bd0734a318bbcd9486dcefaef2c4ab124b0d | |
| parent | 2896423f54d569324dc241bc8b3e07b20ae67386 (diff) | |
| download | puppet-tozt-45f7e7661261dfdcc1d81624c79b82503a0d6e10.tar.gz puppet-tozt-45f7e7661261dfdcc1d81624c79b82503a0d6e10.zip | |
remove haveged
as of linux 5.6, /dev/random behaves the same as /dev/urandom, so there
isn't any more blocking to work around
| -rw-r--r-- | modules/haveged/manifests/init.pp | 11 | ||||
| -rw-r--r-- | modules/mail/manifests/mailu.pp | 3 | ||||
| -rw-r--r-- | modules/nginx/manifests/config.pp | 2 |
3 files changed, 0 insertions, 16 deletions
diff --git a/modules/haveged/manifests/init.pp b/modules/haveged/manifests/init.pp deleted file mode 100644 index 05ae5f8..0000000 --- a/modules/haveged/manifests/init.pp +++ /dev/null @@ -1,11 +0,0 @@ -class haveged { - package { "haveged": - ensure => installed, - } - - service { 'haveged': - ensure => running, - enable => true, - require => Package['haveged'], - } -} diff --git a/modules/mail/manifests/mailu.pp b/modules/mail/manifests/mailu.pp index 82d596c..cd38e26 100644 --- a/modules/mail/manifests/mailu.pp +++ b/modules/mail/manifests/mailu.pp @@ -2,7 +2,6 @@ class mail::mailu { include mail::persistent include cron include docker - include haveged package { "opendkim": ensure => installed; @@ -34,7 +33,6 @@ class mail::mailu { ", creates => "/media/persistent/secret-key", require => [ - Class["haveged"], Class["mail::persistent"], ] } @@ -59,7 +57,6 @@ class mail::mailu { cwd => "/media/persistent", creates => "/media/persistent/dkim/tozt.net.dkim.key", require => [ - Class["haveged"], Package["opendkim"], Class["mail::persistent"], File["/media/persistent/dkim"], diff --git a/modules/nginx/manifests/config.pp b/modules/nginx/manifests/config.pp index 8a95edd..83becc3 100644 --- a/modules/nginx/manifests/config.pp +++ b/modules/nginx/manifests/config.pp @@ -1,6 +1,4 @@ class nginx::config { - include haveged - file { "/etc/nginx/sites-available": ensure => directory; |