X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=ansible%2Froles%2Fbase%2Ftasks%2Fmain.yml;h=947987ea9e468d528db120d2554945899644d40f;hb=e676385df52a359148dfd3df644a549dfb0c899f;hp=17e95ab493430817d71aa7d01c130b92583a0dfb;hpb=f10f8d027ccbc35daac8d4a7dc8091b15bdcfc33;p=noc.git

diff --git a/ansible/roles/base/tasks/main.yml b/ansible/roles/base/tasks/main.yml
index 17e95ab..947987e 100644
--- a/ansible/roles/base/tasks/main.yml
+++ b/ansible/roles/base/tasks/main.yml
@@ -70,16 +70,42 @@
       - lsof
       - haveged
       - net-tools
-      - ntp
       - screen
       - aptitude
       - unp
       - ca-certificates
       - file
+      - nano
       - zsh
       - python-apt
     state: present
 
+- 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: 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
+
+      notify: restart openntpd
+
+
 - name: make sure grml-(etc|scripts)-core is not installed
   apt:
     name:
@@ -104,6 +130,21 @@
 
   when: ansible_service_mgr == "systemd"
 
+- block:
+    - name: workaround console-setup race condition (1/2)
+      file:
+        path: /etc/systemd/system/console-setup.service.d/
+        state: directory
+
+    - name: workaround console-setup race condition (2/2)
+      copy:
+        content: "[Unit]\nAfter=systemd-tmpfiles-setup.service\n"
+        dest: /etc/systemd/system/console-setup.service.d/override.conf
+        mode: 0644
+      # no need to relaod systemd here, it is only there to fix a boot-time race-condition
+
+  when: ansible_distribution == "Ubuntu"
+
 - name: install zshrc
   with_items:
     - src: "zprofile"
@@ -123,10 +164,9 @@
     shell: /bin/zsh
 
 - name: set default shell for adduser
-  with_items:
-    - regexp: "^DSHELL"
-      line: "DSHELL=/bin/zsh"
+  with_dict:
+    DSHELL: /bin/zsh
   lineinfile:
     dest: /etc/adduser.conf
-    regexp: "{{ item.regexp }}"
-    line: "{{ item.line }}"
+    regexp: "^#?{{ item.key }}="
+    line: "{{ item.key }}={{ item.value }}"