diff --git a/common/tools.py b/common/tools.py index 4a89c47..b7988cb 100644 --- a/common/tools.py +++ b/common/tools.py @@ -50,10 +50,13 @@ def sed_i(file_path, pattern, subst): from tempfile import mkstemp from shutil import move from os import close + import os temp_fd, temp_path = mkstemp() + mode = os.stat(file_path).st_mode with open(temp_path, 'w') as new_file: with open(file_path) as old_file: for line in old_file: new_file.write(line.replace(pattern, subst)) close(temp_fd) + os.chmod(temp_path, mode) move(temp_path, file_path) diff --git a/plugins/admin_user/tasks.py b/plugins/admin_user/tasks.py index 2183b93..387894f 100644 --- a/plugins/admin_user/tasks.py +++ b/plugins/admin_user/tasks.py @@ -52,11 +52,6 @@ class AdminUserCredentials(Task): getcreds_path = os.path.join(info.root, 'etc/init.d/ec2-get-credentials') username = info.manifest.plugins['admin_user']['username'] sed_i(getcreds_path, 'username=\'root\'', 'username=\'{username}\''.format(username=username)) - import stat - rwxr_xr_x = (stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR | - stat.S_IRGRP | stat.S_IXGRP | - stat.S_IROTH | stat.S_IXOTH) - os.chmod(getcreds_path, rwxr_xr_x) class DisableRootLogin(Task):