ansible: Unify default credentials

[noc.git] / ansible / roles / base / tasks / main.yml

diff --git a/ansible/roles/base/tasks/main.yml b/ansible/roles/base/tasks/main.yml
index c168799..c155be4 100644 (file)
--- a/ansible/roles/base/tasks/main.yml
+++ b/ansible/roles/base/tasks/main.yml
@@ -47,7 +47,7 @@
 - name: Set authorized keys for root user
   authorized_key:
     user: root
-    key: "{{ noc_ssh_keys | join('\n') }}"
+    key: "{{ ssh_keys | join('\n') }}"
     exclusive: yes
 
 - name: disable apt suggests and recommends
@@ -78,30 +78,36 @@
       - nano
       - zsh
       - python-apt
+      - command-not-found
+      - man-db
+      - lshw
     state: present
 
-- name: check that ISC ntpd is not installed
-  apt:
-    name: ntp
-    state: absent
-    purge: yes
+- when: base_managed_ntpd
+  block:
+    - name: check that ISC ntpd is not installed
+      apt:
+        name: ntp
+        state: absent
+        purge: yes
 
-- name: install openntpd
-  apt:
-    name: openntpd
+    - name: install openntpd
+      apt:
+        name: openntpd
 
-- name: configure openntpd
-  copy:
-    dest: /etc/openntpd/ntpd.conf
-    content: |
-      # Use the ffgraz.net NTP server
-      servers ntp.ffgraz.net weight 3
+    - name: configure openntpd
+      copy:
+        dest: /etc/openntpd/ntpd.conf
+        content: |
+          # Use the ffgraz.net NTP server
+          servers ntp.ffgraz.net weight 3
+
+          # Use some servers announced from the NTP Pool
+          servers 0.debian.pool.ntp.org
+          servers 1.debian.pool.ntp.org
 
-      # Use some servers announced from the NTP Pool
-      servers 0.debian.pool.ntp.org
-      servers 1.debian.pool.ntp.org
+      notify: restart openntpd
 
-  notify: restart openntpd
 
 - name: make sure grml-(etc|scripts)-core is not installed
   apt: