diff options
| author | Jeff Geerling <geerlingguy@mac.com> | 2016-03-03 22:49:30 -0600 |
|---|---|---|
| committer | Jeff Geerling <geerlingguy@mac.com> | 2016-03-03 22:49:30 -0600 |
| commit | 836d4144c3090636fa74bedd55842ba19bc7c1dc (patch) | |
| tree | 103fd05671d52dfab54cb7c38d08a747bff057c6 /tasks/main.yml | |
| parent | 8997ed53da3dcfcb875e1eec6e38205394b04e3e (diff) | |
| parent | 9c0a3ce4ff0c8bc00dbb8497193c2fc5f015c5aa (diff) | |
| download | ntp-836d4144c3090636fa74bedd55842ba19bc7c1dc.tar.gz ntp-836d4144c3090636fa74bedd55842ba19bc7c1dc.tar.bz2 ntp-836d4144c3090636fa74bedd55842ba19bc7c1dc.tar.xz ntp-836d4144c3090636fa74bedd55842ba19bc7c1dc.zip | |
Fixed merge conflicts.
Diffstat (limited to 'tasks/main.yml')
| -rw-r--r-- | tasks/main.yml | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tasks/main.yml b/tasks/main.yml index 2844315..6a58382 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -21,16 +21,21 @@ pkgng: name=ntp state=present when: ansible_os_family == 'FreeBSD' -- name: Ensure NTP is running and enabled at system start. +- name: Ensure NTP is running and enabled as configured. service: name: "{{ ntp_daemon }}" state: started enabled: yes when: ntp_enabled -- name: Ensure NTP is stopped and disabled at system start. +- name: Ensure NTP is stopped and disabled as configured. service: name: "{{ ntp_daemon }}" state: stopped enabled: no when: not ntp_enabled + +- name: Generate ntp.conf file + template: src=ntp.conf.j2 dest=/etc/ntp.conf + notify: restart ntp + when: ntp_manage_config |