Skip to content
This repository was archived by the owner on May 12, 2018. It is now read-only.

Commit deaf47c

Browse files
committed
Merge branch 'drop-ssh-keygen' into 'master'
Drop ssh keygen
2 parents 94b120d + 8dba532 commit deaf47c

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
lines changed

lib/network.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,8 @@ def update_build(id, state, trace)
7373
:failure
7474
end
7575

76-
def register_runner(public_key, token)
76+
def register_runner(token)
7777
body = {
78-
public_key: public_key,
7978
token: token
8079
}
8180

lib/setup.rb

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ module GitlabCi
66
class Setup
77
def initialize
88
build_config
9-
generate_ssh_key
109
register_runner
1110
end
1211

@@ -22,24 +21,18 @@ def build_config
2221
Config.new.write('url', url)
2322
end
2423

25-
def generate_ssh_key
26-
system('ssh-keygen -t rsa -f ~/.ssh/id_rsa -N ""') # Create a key without a password.
27-
end
28-
2924
def register_runner
3025
registered = false
3126

32-
public_key = File.read(File.expand_path('~/.ssh/id_rsa.pub'))
33-
3427
until registered
3528
token = ENV['REGISTRATION_TOKEN']
3629
unless token
3730
puts 'Please enter the gitlab-ci token for this runner: '
3831
token = gets.chomp
3932
end
4033

41-
puts "Registering runner with public key type: #{public_key[0..6]}, registration token: #{token}, url: #{Config.new.url}."
42-
runner = Network.new.register_runner(public_key, token)
34+
puts "Registering runner with registration token: #{token}, url: #{Config.new.url}."
35+
runner = Network.new.register_runner(token)
4336

4437
if runner
4538
write_token(runner[:token])

0 commit comments

Comments
 (0)