Merge "Add conf file entry for chrony" into stable/newton

This commit is contained in:
Jenkins 2017-03-09 15:45:55 +00:00 committed by Gerrit Code Review
commit e9e425247e
4 changed files with 4 additions and 2 deletions

View File

@ -24,7 +24,7 @@
- name: restart chrony - name: restart chrony
service: service:
name: chrony name: "{{ chrony_service }}"
state: restarted state: restarted
- name: restart fail2ban - name: restart fail2ban

View File

@ -63,7 +63,7 @@
- name: V-38620 - Synchronize system clock (configuration file) - name: V-38620 - Synchronize system clock (configuration file)
template: template:
src: chrony.conf.j2 src: chrony.conf.j2
dest: /etc/chrony/chrony.conf dest: "{{ chrony_conf_file }}"
when: when:
- not check_mode - not check_mode
- security_enable_chrony | bool - security_enable_chrony | bool

View File

@ -20,6 +20,7 @@ vsftpd_conf_file: /etc/vsftpd/vsftpd.conf
grub_conf_file: /boot/grub2/grub.cfg grub_conf_file: /boot/grub2/grub.cfg
aide_cron_job_path: /etc/cron.d/aide aide_cron_job_path: /etc/cron.d/aide
aide_database_file: /var/lib/aide/aide.db.gz aide_database_file: /var/lib/aide/aide.db.gz
chrony_conf_file: /etc/chrony.conf
# Package names # Package names
auditd_pkg: audit auditd_pkg: audit

View File

@ -23,6 +23,7 @@ vsftpd_conf_file: /etc/vsftpd.conf
grub_conf_file: /boot/grub/grub.cfg grub_conf_file: /boot/grub/grub.cfg
aide_cron_job_path: /etc/cron.daily/aide aide_cron_job_path: /etc/cron.daily/aide
aide_database_file: /var/lib/aide/aide.db aide_database_file: /var/lib/aide/aide.db
chrony_conf_file: /etc/chrony/chrony.conf
# Package names # Package names
auditd_pkg: auditd auditd_pkg: auditd