Fix path to daemon init params file

Ubuntu 14.04 and CentOS 7 have their daemon inititalization
parameters file in different places. This fixes a bug where
the path in CentOS was incorrect.

Closes-Bug: 1662545
Change-Id: Ie0b30848a73f8a1fbc7fe6a475d93d87a72ce40f
This commit is contained in:
Major Hayden 2017-04-04 10:51:11 -05:00
parent 9d745ec4fe
commit 701c0b1e32
No known key found for this signature in database
GPG Key ID: 737051E0C1011FB1
3 changed files with 4 additions and 2 deletions

View File

@ -125,10 +125,10 @@
# Please read the documentation and the comments in defaults/main.yml prior
# to making any umask-related changes.
# Ubuntu 14.04's default umask in /etc/init.d/rc is 022 already.
# Ubuntu 14.04 and CentOS 7 both have a default umask set to 022 already.
- name: V-38642 - System default umask for daemons must be 027 or 022
lineinfile:
dest: /etc/init.d/rc
dest: "{{ daemon_init_params_file }}"
regexp: "^umask "
line: "umask {{ security_umask_daemons_init }}"
when: security_umask_daemons_init is defined

View File

@ -30,6 +30,7 @@ grub_defaults_file: /etc/sysconfig/grub
aide_cron_job_path: /etc/cron.d/aide
aide_database_file: /var/lib/aide/aide.db.gz
chrony_conf_file: /etc/chrony.conf
daemon_init_params_file: /etc/init.d/functions
# Service names
cron_service: crond

View File

@ -33,6 +33,7 @@ grub_defaults_file: /etc/default/grub
aide_cron_job_path: /etc/cron.daily/aide
aide_database_file: /var/lib/aide/aide.db
chrony_conf_file: /etc/chrony/chrony.conf
daemon_init_params_file: /etc/init.d/rc
# Service name
cron_service: cron