70 lines
2.6 KiB
Diff
70 lines
2.6 KiB
Diff
Index: cloud-init/cloudinit/SshUtil.py
|
|
===================================================================
|
|
--- cloud-init.orig/cloudinit/SshUtil.py
|
|
+++ cloud-init/cloudinit/SshUtil.py
|
|
@@ -147,6 +147,7 @@ def setup_user_keys(keys, user, key_pref
|
|
util.write_file(authorized_keys, content, 0600)
|
|
|
|
os.chown(authorized_keys, pwent.pw_uid, pwent.pw_gid)
|
|
+ util.restorecon_if_possible(ssh_dir, recursive=True)
|
|
|
|
os.umask(saved_umask)
|
|
|
|
Index: cloud-init/cloudinit/util.py
|
|
===================================================================
|
|
--- cloud-init.orig/cloudinit/util.py
|
|
+++ cloud-init/cloudinit/util.py
|
|
@@ -28,6 +28,12 @@ import time
|
|
import traceback
|
|
import re
|
|
|
|
+try:
|
|
+ import selinux
|
|
+ HAVE_LIBSELINUX = True
|
|
+except ImportError:
|
|
+ HAVE_LIBSELINUX = False
|
|
+
|
|
def read_conf(fname):
|
|
try:
|
|
stream = open(fname,"r")
|
|
@@ -113,6 +119,11 @@ def write_file(file,content,mode=0644,om
|
|
os.chmod(file,mode)
|
|
f.write(content)
|
|
f.close()
|
|
+ restorecon_if_possible(file)
|
|
+
|
|
+def restorecon_if_possible(path, recursive=False):
|
|
+ if HAVE_LIBSELINUX and selinux.is_selinux_enabled():
|
|
+ selinux.restorecon(path, recursive=recursive)
|
|
|
|
# get keyid from keyserver
|
|
def getkeybyid(keyid,keyserver):
|
|
Index: cloud-init/cloudinit/CloudConfig/cc_puppet.py
|
|
===================================================================
|
|
--- cloud-init.orig/cloudinit/CloudConfig/cc_puppet.py
|
|
+++ cloud-init/cloudinit/CloudConfig/cc_puppet.py
|
|
@@ -22,6 +22,7 @@ import subprocess
|
|
import StringIO
|
|
import ConfigParser
|
|
import cloudinit.CloudConfig as cc
|
|
+import cloudinit.util as util
|
|
|
|
def handle(name,cfg,cloud,log,args):
|
|
# If there isn't a puppet key in the configuration don't do anything
|
|
@@ -58,6 +59,7 @@ def handle(name,cfg,cloud,log,args):
|
|
ca_fh.close()
|
|
os.chown('/var/lib/puppet/ssl/certs/ca.pem',
|
|
pwd.getpwnam('puppet').pw_uid, 0)
|
|
+ util.restorecon_if_possible('/var/lib/puppet', recursive=True)
|
|
else:
|
|
#puppet_conf_fh.write("\n[%s]\n" % (cfg_name))
|
|
# If puppet.conf already has this section we don't want to write it again
|
|
@@ -81,6 +83,7 @@ def handle(name,cfg,cloud,log,args):
|
|
os.rename('/etc/puppet/puppet.conf','/etc/puppet/puppet.conf.old')
|
|
with open('/etc/puppet/puppet.conf', 'wb') as configfile:
|
|
puppet_config.write(configfile)
|
|
+ util.restorecon_if_possible('/etc/puppet/puppet.conf')
|
|
# Set puppet default file to automatically start
|
|
subprocess.check_call(['sed', '-i',
|
|
'-e', 's/^START=.*/START=yes/',
|