Skip to content

Commit

Permalink
change back to server_user and added some items on README
Browse files Browse the repository at this point in the history
  • Loading branch information
@cocoy
cocoy authored and cocoy committed May 19, 2010
1 parent bb42195 commit cfcce38
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions mr/awsome/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,10 @@ def init_ssh_key(self, user=None):
log.error("Can't establish ssh connection.")
return
if user is None:
user = 'root'
# check user at config file
user = self.config['server_user']
if user is None:
user = 'root'
host = str(instance.public_dns_name)
port = 22
client = paramiko.SSHClient()
Expand Down Expand Up @@ -690,4 +693,4 @@ def aws_ssh(configpath=None):
argv = sys.argv[:]
argv.insert(1, "ssh")
aws = AWS(configfile=configpath)
return aws(argv)
return aws(argv)

1 comment on commit cfcce38

@cocoy
Copy link
Owner Author

@cocoy cocoy commented on cfcce38 May 19, 2010

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

aws.conf  setting is back to use server_user option:

[instance:demo-webserver]
keypair = gsg-keypair
securitygroups = webserver 
region = us-east-1
placement = us-east-1a
# we use images from `http://alestic.com/`
image = ami-bb709dd2
#startup_script = startup.sh
fabfile = fabfile.py
server_user = ubuntu

Please sign in to comment.