* ec2-fetch-credentials.py:

  - Allow user to choose which user they wish to configure for.
  - Allow user to disable root user if they wish to.
* ec2-set-defaults.py:
  - Set default timezone to UTC.
  - Set locale depending on zone.
* debian/init:
  - Removed nash plugin.
  - Add ec2-set-defaults.

1 files changed, 31 insertions, 16 deletions

diff --git a/ec2-fetch-credentials.py b/ec2-fetch-credentials.py
index e8216ec4..33b4fb02 100755
--- a/ec2-fetch-credentials.py
+++ b/ec2-fetch-credentials.py
@@ -20,9 +20,15 @@
 #
 import urllib
 import os
+from configobj import ConfigObj
 
 api_ver = '2008-02-01'
 metadata = None
+filename='/etc/ec2-init/ec2-config.cfg'
+
+config = ConfigObj(filename)
+user = config['user']
+config_root = config['DISABLE_ROOT']
 
 def get_ssh_keys():
     base_url = 'http://169.254.169.254/%s/meta-data' % api_ver
@@ -30,23 +36,32 @@ def get_ssh_keys():
     keyids = [line.split('=')[0] for line in data.split('\n')]
     return [urllib.urlopen('%s/public-keys/%d/openssh-key' % (base_url, int(keyid))).read().rstrip() for keyid in keyids]
 
-keys = get_ssh_keys()
-
-os.umask(077)
+def setup_user_keys(k,user):
+    if not os.path.exists('/home/%s/.ssh' %(user)):
+	os.mkdir('/home/%s/.ssh' %(user))
 
-if not os.path.exists('/home/ubuntu/.ssh'):
-    os.mkdir('/home/ubuntu/.ssh')
+    authorized_keys = '/home/%s/.ssh/authorized_keys' % user
+    fp = open(authorized_keys, 'a')
+    fp.write(''.join(['%s\n' % key for key in keys]))
+    fp.close()
+    os.system('chown -R %s:%s /home/%s/.ssh' %(user,user,user))
 
-if not os.path.exists('/root/.ssh'):
-    os.mkdir('/root/.ssh')
+def setup_root_user(k,root_config):
+    if root_config == "1":
+        fp = open('/root/.ssh/authorized_keys', 'a')
+	fp.write("command=\"echo \'Please ssh to the ubuntu user on this host instead of root\';echo;sleep 10\" ")
+	fp.write(''.join(['%s\n' % key for key in keys]))
+	fp.close()
+    elif root_config == "0":
+	print "You choose to disable the root user, god help you."
+    else:
+	print "%s - I dont understand that opion."
 
-fp = open('/home/ubuntu/.ssh/authorized_keys', 'a')
-fp.write(''.join(['%s\n' % key for key in keys]))
-fp.close()
-
-os.system('chown -R ubuntu:ubuntu /home/ubuntu/.ssh')
+os.umask(077)
+if user == "":
+	print "User must exist in %s" %(filename)
+	sys.exit(0)
 
-fp = open('/root/.ssh/authorized_keys', 'a')
-fp.write("command=\"echo \'Please ssh to the ubuntu user on this host instead of root\';echo;sleep 10\" ") 
-fp.write(''.join(['%s\n' % key for key in keys]))
-fp.close()
+keys = get_ssh_keys()
+setup_user_keys(keys,user)
+setup_root_user(keys,config_root)