Renamed ec2-user to admin

CHANGELOG.md

@@ -4,6 +4,7 @@
 * Plugin removed: "ec2-run-user-data" is back in the standard bootstrapping process and has been simplified
 
 #### Minor changes: ####
+* Plugin modified: "ec2-user" renamed to "admin-user". Login name is now "admin"
 
 ### 2012-11-06 Anders Ingemann <[email protected]> ###
 

plugins/README.md

@@ -9,8 +9,8 @@ You can run them via the ``--plugin`` option when bootstrapping:
   Adds some common packages to the AMI.
 * ``unattended-upgrades``  
   Enables unattended upgrades with aptitude. Your EC2 server will upgrade itself daily.
-* ``ec2-user``  
-  Creates a user named 'ec2-user', gives it sudo rights and disables the root login.
+* ``admin-user``  
+  Creates a user named 'admin', gives it sudo rights and disables the root login.
 * ``remount``  
   Remounts the bootstrapped volume.
   With this plugin you can inspect the results of the bootstrapping process without launching an instance.

plugins/admin-user

@@ -0,0 +1,5 @@
+#!/bin/bash
+insert_task_after $TASK_PACKAGES \
+	$plugindir/admin-user-tasks/add-sudo-package
+insert_task_after $TASK_INITSCRIPTS \
+	$plugindir/admin-user-tasks/create-user

plugins/ec2-user-tasks/create-user → plugins/admin-user-tasks/create-user

@@ -1,14 +1,14 @@
 #!/bin/bash
-ec2user_name='ec2-user'
+admin_username='admin'
 
 # Create the user and add him to the 'sudo' group
-chroot $imagedir useradd --create-home --shell /bin/bash $ec2user_name
+chroot $imagedir useradd --create-home --shell /bin/bash $admin_username
 
 # Allow ec2-user to use sudo without a password
-sed -i "/^root\tALL=(ALL) ALL/a ec2-user\tALL=(ALL) NOPASSWD: ALL" $imagedir/etc/sudoers
+sed -i "/^root\tALL=(ALL) ALL/a $admin_username\tALL=(ALL) NOPASSWD: ALL" $imagedir/etc/sudoers
 
 # ec2-get-credentials should add the pubkey to the new user account and not root
-sed -i "s/^username='root'/username='$ec2user_name'/" $imagedir/etc/init.d/ec2-get-credentials
+sed -i "s/^username='root'/username='$admin_username'/" $imagedir/etc/init.d/ec2-get-credentials
 
 # Disallow root login
 sed -i "s/^PermitRootLogin yes/PermitRootLogin no/" $imagedir/etc/ssh/sshd_config