diff --git a/README.rst b/README.rst index f5035e5b0a2a62041eb1adbe94309f72b403123c..d53b55d2b5bab5c0e75ebea20ff90c1eb5db4c11 100644 --- a/README.rst +++ b/README.rst @@ -28,7 +28,6 @@ Role Variables collectd_riemann_server: collectd_collectd_server: collectd_statsd_server: - ntp: unattended_upgrades: tls_cert: # Filename of the TLS cert for that host. tls_key: # Filename of the TLS key for that host. @@ -84,7 +83,6 @@ TODO - Implement: - collectd_agent. - - ldap_login (with pam_mkhomedir). - ssh_ca. - syslog_forwarding. - Test. diff --git a/handlers/main.yml b/handlers/main.yml index 6f515dd39770254a2369026f1d7adc5eca7e5d99..b3cd640beafc7492d67f4242e6e6aeb23158d155 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -18,13 +18,3 @@ service: name: collectd state: restarted - -- name: Restart ntpd - service: - name: '{{ ntpd_service[ansible_os_family] }}' - state: restarted - -- name: Restart systemd-timesyncd - service: - name: systemd-timesyncd - state: restarted diff --git a/tasks/main.yml b/tasks/main.yml index d67586f4c783c5d8fb1c83ef93e8e37030fbc090..1135d1b01a684e47d88221c03ca31aac8f1be936 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -29,9 +29,6 @@ - include: collectd_agent.yml when: (collectd_graphite_server is defined or collectd_riemann_server is defined or collectd_collectd_server is defined or collectd_statsd_server is defined) and not common_role_finished is defined -- include: ntp.yml - when: ntp|default(True) and not common_role_finished is defined - - include: unattended_upgrades.yml when: unattended_upgrades|default(True) and ansible_os_family == 'Debian' and not common_role_finished is defined diff --git a/tasks/ntp.yml b/tasks/ntp.yml deleted file mode 100644 index f46d1ac19e356f9628b5622ff164534d3f50e663..0000000000000000000000000000000000000000 --- a/tasks/ntp.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- - -- name: Assert - assert: - that: ansible_os_family in [ 'Debian', 'OpenBSD' ] - -- include: ntpd.yml - when: ansible_service_mgr in [ ] - -- include: systemd-timesyncd.yml - when: ansible_service_mgr == 'systemd' diff --git a/tasks/ntpd.yml b/tasks/ntpd.yml deleted file mode 100644 index b98385e28a445edab7aa38b4d4ec1180b989fc24..0000000000000000000000000000000000000000 --- a/tasks/ntpd.yml +++ /dev/null @@ -1,28 +0,0 @@ ---- - -- assert: - that: ansible_os_family in [ 'Debian', 'OpenBSD' ] - -- name: apt install ntpd - when: ansible_pkg_mgr == 'apt' - apt: - name: ntp - state: present - update_cache: yes - cache_valid_time: 3600 - -- name: Configure ntpd - template: - src: ntpd.conf.j2 - dest: '{{ ntpd_conf[ansible_os_family] }}' - owner: root - group: 0 - mode: 0o0644 - notify: - - Restart ntpd - -- name: Enable ntpd - service: - name: '{{ ntpd_service[ansible_os_family] }}' - enabled: yes - state: started diff --git a/tasks/systemd-timesyncd.yml b/tasks/systemd-timesyncd.yml deleted file mode 100644 index d3e7429ba3388a471fc41e4779811bba14037e50..0000000000000000000000000000000000000000 --- a/tasks/systemd-timesyncd.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- - -- name: Configure systemd-timesyncd - lineinfile: - dest: /etc/systemd/timesyncd.conf - line: 'NTP=0.debian.pool.ntp.org 1.debian.pool.ntp.org 2.debian.pool.ntp.org 3.debian.pool.ntp.org' - regexp: '^NTP=' - state: present - notify: - - 'Restart systemd-timesyncd' - -- name: Enable systemd-timesyncd - service: - name: systemd-timesyncd - enabled: yes - state: started diff --git a/templates/ntpd.conf.j2 b/templates/ntpd.conf.j2 deleted file mode 100644 index a52094b554e5cbf4b90424c00009cb6a6ae245f8..0000000000000000000000000000000000000000 --- a/templates/ntpd.conf.j2 +++ /dev/null @@ -1,3 +0,0 @@ -{% for i in range(4) %} -server {{ i }}.{{ ntp_pool[ansible_os_family] }} -{% endfor %} diff --git a/vars/main.yml b/vars/main.yml index c143af83bbf0247f65c192e173639add2dc89a81..a417483acce90ce0d73c83f269071742b3a6ef35 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -32,15 +32,3 @@ update_ca_certificates: cert_dir: OpenBSD: /etc/ssl/certs Debian: /usr/local/share/ca-certificates - -ntpd_conf: - OpenBSD: /etc/ntpd.conf - Debian: /etc/ntp.conf - -ntp_pool: - OpenBSD: pool.ntp.org - Debian: debian.pool.ntp.org - -ntpd_service: - OpenBSD: ntpd - Debian: ntp