commit 896f37b5ed9e161d89d0f6b72a31cb0f67080bf7
author Filip Pytloun <filip@pytloun.cz> Thu Jun 25 18:35:42 2015 +0200
committer Filip Pytloun <filip@pytloun.cz> Mon Jul 13 23:31:40 2015 +0200
tree 5e3790609921cb5ee5868a5a1afd1bd2d98d7dfa
parent 5bfc1df30ed7d58263ad455bc5961e1dd39f1347

No ubuntu user, disallow root login, root shell on tty1

Conflicts:
	ubuntu-14.04/scripts/base.sh
	ubuntu-14.04/template.json

ubuntu-14.04/template.json

diff --git a/ubuntu-14.04/template.json b/ubuntu-14.04/template.json
index d7ac736..f8fdac3 100644
--- a/ubuntu-14.04/template.json
+++ b/ubuntu-14.04/template.json
@@ -1,7 +1,7 @@
 {
    "variables": {
-        "user": "{{ env `BUILD_USER` }}",
-        "password": "{{ env `BUILD_PASSWORD` }}",
+        "user": "root",
+        "password": "ho5uo7Uome5d",
 	"do_api_token": "{{ env `DO_API_TOKEN` }}",
 	"distro": "ubuntu-14-04-x64",
         "disk_size": "8000"
@@ -18,6 +18,7 @@
 	    "scripts/salt.sh",
             "scripts/vagrant.sh",
             "scripts/virtualbox.sh",
+            "scripts/security.sh",
             "scripts/cleanup.sh",
             "scripts/zerodisk.sh"
           ]
@@ -27,6 +28,7 @@
             "scripts/base.sh",
             "scripts/salt.sh",
             "scripts/vmware.sh",
+            "scripts/security.sh",
             "scripts/cleanup.sh",
             "scripts/zerodisk.sh"
           ]
@@ -35,6 +37,7 @@
           "scripts": [
             "scripts/base.sh",
 	    "scripts/salt.sh",
+            "scripts/security.sh",
             "scripts/cleanup.sh",
             "scripts/zerodisk.sh"
           ]
@@ -51,6 +54,7 @@
 	  "scripts": [
 	    "scripts/base.sh",
 	    "scripts/salt.sh",
+            "scripts/security.sh",
 	    "scripts/cleanup.sh"
 	  ]
 	}
@@ -114,10 +118,8 @@
         " kbd-chooser/method=us<wait>",
         " keyboard-configuration/layout=USA<wait>",
         " keyboard-configuration/variant=USA<wait>",
-        " passwd/user-fullname={{user `user`}} ",
-        " passwd/user-password-again={{user `password`}} ",
-        " passwd/user-password={{user `password`}} ",
-        " passwd/username={{user `user`}} ",
+        " passwd/root-password={{user `password`}} ",
+        " passwd/root-password-again={{user `password`}} ",
         " locale=en_US<wait>",
         " netcfg/get_hostname=ubuntu-1404<wait>",
         " netcfg/get_domain=cloudlab.cz<wait>",
@@ -162,10 +164,8 @@
         " kbd-chooser/method=us<wait>",
         " keyboard-configuration/layout=USA<wait>",
         " keyboard-configuration/variant=USA<wait>",
-        " passwd/user-fullname={{user `user`}} ",
-        " passwd/user-password-again={{user `password`}} ",
-        " passwd/user-password={{user `password`}} ",
-        " passwd/username={{user `user`}} ",
+        " passwd/root-password={{user `password`}} ",
+        " passwd/root-password-again={{user `password`}} ",
         " locale=en_US<wait>",
         " netcfg/get_hostname=ubuntu-1404<wait>",
         " netcfg/get_domain=changeme<wait>",
@@ -228,10 +228,8 @@
         " kbd-chooser/method=us<wait>",
         " keyboard-configuration/layout=USA<wait>",
         " keyboard-configuration/variant=USA<wait>",
-        " passwd/user-fullname={{user `user`}} ",
-        " passwd/user-password-again={{user `password`}} ",
-        " passwd/user-password={{user `password`}} ",
-        " passwd/username={{user `user`}} ",
+        " passwd/root-password={{user `password`}} ",
+        " passwd/root-password-again={{user `password`}} ",
         " locale=en_US<wait>",
         " netcfg/get_hostname=ubuntu-1404<wait>",
         " netcfg/get_domain=changeme<wait>",
@@ -245,7 +243,7 @@
       "type": "docker",
       "image": "ubuntu:14.04",
       "commit": true
-   },
+    },
     {
       "type": "digitalocean",
       "api_token": "{{user `do_api_token`}}",