1 files changed, 6 insertions, 2 deletions

diff --git a/tiny-ec2-bootstrap b/tiny-ec2-bootstrap
index c03fcd3..83aeba7 100644
--- a/tiny-ec2-bootstrap
+++ b/tiny-ec2-bootstrap
@@ -64,13 +64,17 @@ start() {
     # Don't bootstrap if the host has already been bootstrapped
     [ -f "/var/lib/cloud/.bootstrap-complete" ] && return 0
 
+    # load configuration, set defaults
+    [ -f "/etc/conf.d/tiny-ec2-bootstrap" ] && . /etc/conf.d/tiny-ec2-bootstrap
+    EC2_USER=${EC2_USER:-alpine}
+
     [ -d "/var/lib/cloud" ] || mkdir -p /var/lib/cloud
 
     ebegin "Disabling root password"; _disable_password root; eend $?
-    ebegin "Disabling alpine password"; _disable_password alpine; eend $?
+    ebegin "Disabling $EC2_USER password"; _disable_password "$EC2_USER"; eend $?
     ebegin "Resizing root partition"; _resize_root_partition; eend $?
     ebegin "Setting ec2 hostname"; _update_hostname; eend $?
-    ebegin "Setting ec2 user ssh keys"; _set_ssh_keys "alpine"; eend $?
+    ebegin "Setting ec2 user ssh keys"; _set_ssh_keys "$EC2_USER"; eend $?
     ebegin "Running ec2 user data script"; _run_userdata; eend $?
 
     touch "/var/lib/cloud/.bootstrap-complete"