4 files changed, 45 insertions, 1 deletions
diff --git a/roles/base/defaults/main.yml b/roles/base/defaults/main.yml
index f94f3ac4..36e51e19 100644
--- a/roles/base/defaults/main.yml
+++ b/roles/base/defaults/main.yml
@@ -1,4 +1,6 @@
 ---
+base_entropy_generator: haveged
+
 sysctl_config_user: {}
 
 modules_blacklist:
diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
index e631d0d4..e82ccfad 100644
--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@@ -1,4 +1,12 @@
 ---
+- name: load distrubtion specific variables
+  include_vars: "{{ item }}"
+  with_first_found:
+    - files:
+        - "{{ ansible_distribution_release }}.yml"
+        - "{{ ansible_distribution }}.yml"
+      skip: true
+
 - name: disable recommends and suggests
   copy:
     src: 02no-recommends
@@ -19,7 +27,6 @@
     - tcpdump
     - iptraf-ng
     - unp
-    - haveged
     - dbus
     - libpam-systemd
     - aptitude
@@ -30,6 +37,37 @@
     - nano
     state: present
 
+
+- name: install rngd
+  when: base_entropy_generator == 'rngd'
+  block:
+  - name: install rngd
+    apt:
+      name: "{{ base_rngd_package_name }}"
+      state: present
+
+  - name: make sure haveged is removed/purged
+    apt:
+      name: haveged
+      state: absent
+      purge: yes
+
+
+- name: install haveged
+  when: base_entropy_generator != 'rngd'
+  block:
+  - name: install haveged
+    apt:
+      name: haveged
+      state: present
+
+  - name: make sure rngd is removed/purged
+    apt:
+      name: "{{ base_rngd_package_name }}"
+      state: absent
+      purge: yes
+
+
 - name: Remove startup message from screen
   lineinfile:
     regexp: "^startup_message"
diff --git a/roles/base/vars/Debian.yml b/roles/base/vars/Debian.yml
new file mode 100644
index 00000000..96baf89b
--- /dev/null
+++ b/roles/base/vars/Debian.yml
@@ -0,0 +1,2 @@
+---
+base_rngd_package_name: rng-tools5
diff --git a/roles/base/vars/Ubuntu.yml b/roles/base/vars/Ubuntu.yml
new file mode 100644
index 00000000..eb2591da
--- /dev/null
+++ b/roles/base/vars/Ubuntu.yml
@@ -0,0 +1,2 @@
+---
+base_rngd_package_name: rng-tools