Disable SSH key-deleting on startup
This commit is contained in:
parent
1a48e763cf
commit
87f33190f4
@ -22,7 +22,7 @@ Index: cloud-init-fedora/cloudinit/CloudConfig/cc_ssh.py
|
|||||||
- for f in glob.glob("/etc/ssh/ssh_host_*key*"):
|
- for f in glob.glob("/etc/ssh/ssh_host_*key*"):
|
||||||
- try: os.unlink(f)
|
- try: os.unlink(f)
|
||||||
- except: pass
|
- except: pass
|
||||||
+ if cfg.get("delete_system_ssh_keys", True):
|
+ if cfg.get("ssh_deletekeys", True):
|
||||||
+ for f in glob.glob("/etc/ssh/ssh_host_*key*"):
|
+ for f in glob.glob("/etc/ssh/ssh_host_*key*"):
|
||||||
+ try: os.unlink(f)
|
+ try: os.unlink(f)
|
||||||
+ except: pass
|
+ except: pass
|
||||||
|
@ -3,11 +3,12 @@ disable_root: 1
|
|||||||
ssh_pwauth: 0
|
ssh_pwauth: 0
|
||||||
|
|
||||||
cc_ready_cmd: ['/bin/true']
|
cc_ready_cmd: ['/bin/true']
|
||||||
mount_default_fields: [~, ~, 'auto', 'defaults,nofail', '0', '2']
|
|
||||||
ssh_genkeytypes: ~
|
|
||||||
ssh_svcname: sshd
|
|
||||||
syslog_fix_perms: ~
|
|
||||||
locale_configfile: /etc/sysconfig/i18n
|
locale_configfile: /etc/sysconfig/i18n
|
||||||
|
mount_default_fields: [~, ~, 'auto', 'defaults,nofail', '0', '2']
|
||||||
|
ssh_deletekeys: 0
|
||||||
|
ssh_genkeytypes: ~
|
||||||
|
ssh_svcname: sshd
|
||||||
|
syslog_fix_perms: ~
|
||||||
|
|
||||||
cloud_init_modules:
|
cloud_init_modules:
|
||||||
- bootcmd
|
- bootcmd
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
Name: cloud-init
|
Name: cloud-init
|
||||||
Version: 0.6.2
|
Version: 0.6.2
|
||||||
Release: 0.6.bzr457%{?dist}
|
Release: 0.7.bzr457%{?dist}
|
||||||
Summary: Cloud instance init scripts
|
Summary: Cloud instance init scripts
|
||||||
|
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
@ -155,6 +155,9 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Oct 5 2011 Garrett Holmstrom <gholms@fedoraproject.org> - 0.6.2-0.7.bzr457
|
||||||
|
- Disabled SSH key-deleting on startup
|
||||||
|
|
||||||
* Wed Sep 28 2011 Garrett Holmstrom <gholms@fedoraproject.org> - 0.6.2-0.6.bzr457
|
* Wed Sep 28 2011 Garrett Holmstrom <gholms@fedoraproject.org> - 0.6.2-0.6.bzr457
|
||||||
- Consolidated selinux file context patches
|
- Consolidated selinux file context patches
|
||||||
- Fixed cloud-init.service dependencies
|
- Fixed cloud-init.service dependencies
|
||||||
|
Loading…
Reference in New Issue
Block a user