From f808c8efe4d653e3f7b503629ab2bd017567401b Mon Sep 17 00:00:00 2001 From: Andrew Starr-Bochicchio Date: Tue, 16 Dec 2014 16:48:28 -0500 Subject: [PATCH] Add support for multiple keys in the installer. --- contrib/dokku-installer.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/contrib/dokku-installer.rb b/contrib/dokku-installer.rb index ef323bd6f..797dd7a7a 100755 --- a/contrib/dokku-installer.rb +++ b/contrib/dokku-installer.rb @@ -23,7 +23,7 @@ end version = "v0.3.9" dokku_root = ENV["DOKKU_ROOT"] || "/home/dokku" -admin_key = `cat /root/.ssh/authorized_keys`.split("\n").first +admin_keys = `cat /root/.ssh/authorized_keys`.split("\n") hostname = `bash -c '[[ $(dig +short $HOSTNAME) ]] && echo $HOSTNAME || curl icanhazip.com'`.strip template = DATA.read @@ -42,7 +42,10 @@ post "/setup" do `rm #{dokku_root}/VHOST` end File.open("#{dokku_root}/HOSTNAME", "w") {|f| f.write params[:hostname] } - Open3.capture2("sshcommand acl-add dokku admin", :stdin_data => params[:key]) + keys = params[:keys].split("\n") + keys.each do |k| + Open3.capture2("sshcommand acl-add dokku admin", :stdin_data => k) + end Thread.new { `rm /etc/nginx/conf.d/dokku-installer.conf && /etc/init.d/nginx stop && /etc/init.d/nginx start` `rm /etc/init/dokku-installer.conf && stop dokku-installer` @@ -63,7 +66,7 @@ __END__

Admin Access


- +

Hostname Configuration