Revert "No ubuntu user, disallow root login, root shell on tty1"
This reverts commit 64e8cc5aacd60c748213ca891f5503d379d18786.
diff --git a/ubuntu-14.04/template.json b/ubuntu-14.04/template.json
index 4a19baf..2f0dccb 100644
--- a/ubuntu-14.04/template.json
+++ b/ubuntu-14.04/template.json
@@ -1,7 +1,7 @@
{
"variables": {
- "user": "root",
- "password": "ho5uo7Uome5d",
+ "user": "{{ env `BUILD_USER` }}",
+ "password": "{{ env `BUILD_PASSWORD` }}",
"do_api_token": "{{ env `DO_API_TOKEN` }}",
"distro": "ubuntu-14-04-x64",
"disk_size": "8000"
@@ -18,7 +18,6 @@
"scripts/salt.sh",
"scripts/vagrant.sh",
"scripts/virtualbox.sh",
- "scripts/security.sh",
"scripts/cleanup.sh",
"scripts/zerodisk.sh"
]
@@ -28,7 +27,6 @@
"scripts/base.sh",
"scripts/salt.sh",
"scripts/vmware.sh",
- "scripts/security.sh",
"scripts/cleanup.sh",
"scripts/zerodisk.sh"
]
@@ -37,7 +35,6 @@
"scripts": [
"scripts/base.sh",
"scripts/salt.sh",
- "scripts/security.sh",
"scripts/cleanup.sh",
"scripts/zerodisk.sh"
]
@@ -46,7 +43,6 @@
"scripts": [
"scripts/base.sh",
"scripts/salt.sh",
- "scripts/security.sh",
"scripts/cleanup.sh"
]
}
@@ -96,8 +92,10 @@
" kbd-chooser/method=us<wait>",
" keyboard-configuration/layout=USA<wait>",
" keyboard-configuration/variant=USA<wait>",
- " passwd/root-password={{user `password`}} ",
- " passwd/root-password-again={{user `password`}} ",
+ " passwd/user-fullname={{user `user`}} ",
+ " passwd/user-password-again={{user `password`}} ",
+ " passwd/user-password={{user `password`}} ",
+ " passwd/username={{user `user`}} ",
" locale=en_US<wait>",
" netcfg/get_hostname=ubuntu-1404<wait>",
" netcfg/get_domain=cloudlab.cz<wait>",
@@ -142,8 +140,10 @@
" kbd-chooser/method=us<wait>",
" keyboard-configuration/layout=USA<wait>",
" keyboard-configuration/variant=USA<wait>",
- " passwd/root-password={{user `password`}} ",
- " passwd/root-password-again={{user `password`}} ",
+ " passwd/user-fullname={{user `user`}} ",
+ " passwd/user-password-again={{user `password`}} ",
+ " passwd/user-password={{user `password`}} ",
+ " passwd/username={{user `user`}} ",
" locale=en_US<wait>",
" netcfg/get_hostname=ubuntu-1404<wait>",
" netcfg/get_domain=changeme<wait>",
@@ -206,8 +206,10 @@
" kbd-chooser/method=us<wait>",
" keyboard-configuration/layout=USA<wait>",
" keyboard-configuration/variant=USA<wait>",
- " passwd/root-password={{user `password`}} ",
- " passwd/root-password-again={{user `password`}} ",
+ " passwd/user-fullname={{user `user`}} ",
+ " passwd/user-password-again={{user `password`}} ",
+ " passwd/user-password={{user `password`}} ",
+ " passwd/username={{user `user`}} ",
" locale=en_US<wait>",
" netcfg/get_hostname=ubuntu-1404<wait>",
" netcfg/get_domain=changeme<wait>",
@@ -217,7 +219,7 @@
"<enter><wait>"
]
},
- {
+ {
"type": "digitalocean",
"api_token": "{{user `do_api_token`}}",
"image": "{{user `distro`}}",