openstack/fuel-agent
Code Issues Proposed changes

Merge "Make /var/log/puppet.log readable only to root"

Browse Source
This commit is contained in:
Jenkins 2015-08-20 11:53:16 +00:00 committed by Gerrit Code Review
commit f2df59bb3f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cloud-init-templates/boothook_centos.jinja2
View File

@ -103,7 +103,8 @@ cloud-init-per instance skel_bash cp -f /etc/skel/.bash* /root/
# Puppet config
cloud-init-per instance hiera_puppet mkdir -p /etc/puppet /var/lib/hiera
cloud-init-per instance touch_puppet touch /var/lib/hiera/common.yaml /etc/puppet/hiera.yaml
cloud-init-per instance touch_puppet touch /var/lib/hiera/common.yaml /etc/puppet/hiera.yaml /var/log/puppet.log
cloud-init-per instance chmod_puppet chmod 600 /var/log/puppet.log
# Mcollective enable
cloud-init-per instance mcollective_enable sed -i /etc/rc.d/init.d/mcollective -e 's/\(# chkconfig:\s\+[-0-6]\+\) [0-9]\+ \([0-9]\+\)/\1 81 \2/'

3
cloud-init-templates/boothook_ubuntu.jinja2
View File

@ -93,4 +93,5 @@ cloud-init-per instance nailgun_agent_1 /bin/sh -c 'echo "flock -w 0 -o /var/loc
cloud-init-per instance skel_bash cp -f /etc/skel/.bash* /root/
cloud-init-per instance hiera_puppet mkdir -p /etc/puppet /var/lib/hiera
cloud-init-per instance touch_puppet touch /var/lib/hiera/common.yaml /etc/puppet/hiera.yaml
cloud-init-per instance touch_puppet touch /var/lib/hiera/common.yaml /etc/puppet/hiera.yaml /var/log/puppet.log
cloud-init-per instance chmod_puppet chmod 600 /var/log/puppet.log