No ubuntu user, disallow root login, root shell on tty1
Conflicts:
ubuntu-14.04/scripts/base.sh
ubuntu-14.04/template.json
diff --git a/ubuntu-14.04/configs/cloud/cloud.cfg b/ubuntu-14.04/configs/cloud/cloud.cfg
index 3de7043..929840e 100644
--- a/ubuntu-14.04/configs/cloud/cloud.cfg
+++ b/ubuntu-14.04/configs/cloud/cloud.cfg
@@ -1,9 +1,6 @@
-users:
- - default
-
# If this is set, 'root' will not be able to ssh in and they
# will get a message to login instead as the above $user (ubuntu)
-disable_root: true
+disable_root: false
# This will cause the set+update hostname module to not operate (if true)
preserve_hostname: false
diff --git a/ubuntu-14.04/configs/cloud/cloud.cfg.d/99_tcp.cfg b/ubuntu-14.04/configs/cloud/cloud.cfg.d/99_tcp.cfg
index ce94590..e4f11d1 100644
--- a/ubuntu-14.04/configs/cloud/cloud.cfg.d/99_tcp.cfg
+++ b/ubuntu-14.04/configs/cloud/cloud.cfg.d/99_tcp.cfg
@@ -6,14 +6,6 @@
system_info:
# This will affect which distro class gets used
distro: ubuntu
- # Default user name + that default users groups (if added/used)
- default_user:
- name: ubuntu
- lock_passwd: True
- gecos: Ubuntu
- groups: [adm, audio, cdrom, dialout, dip, floppy, netdev, plugdev, sudo, video]
- sudo: ["ALL=(ALL) NOPASSWD:ALL"]
- shell: /bin/bash
# Other config here will be given to the distro class and/or path classes
paths:
cloud_dir: /var/lib/cloud/