Browse Source

FIX config drone database

tags/v1.0.0
Jasder 5 years ago
parent
commit
af220cfffc
2 changed files with 5 additions and 5 deletions
  1. +1
    -1
      app/controllers/ci/cloud_accounts_controller.rb
  2. +4
    -4
      app/libs/ci/drone/server.rb

+ 1
- 1
app/controllers/ci/cloud_accounts_controller.rb View File

@@ -11,7 +11,7 @@ class Ci::CloudAccountsController < Ci::BaseController

# 1. 保存华为云服务器帐号
create_params = devops_params.merge(ip_num: IPAddr.new(devops_params[:ip_num]).to_i, secret: Ci::CloudAccount.encrypted_secret(devops_params[:secret]))
if cloud_account = @project.dev_ops_cloud_account
if cloud_account = @project.ci_cloud_account
return render_error('该仓库已绑定了云帐号.')
else
cloud_account = Ci::CloudAccount.new(create_params)


+ 4
- 4
app/libs/ci/drone/server.rb View File

@@ -40,19 +40,19 @@ class Ci::Drone::Server
end

def database_username
database_config[Rails.env]["username"]
database_config[Rails.env]["ci"]["username"]
end

def database_password
database_config[Rails.env]["password"]
database_config[Rails.env]["ci"]["password"]
end

def database_host
database_config[Rails.env]["host"]
database_config[Rails.env]["ci"]["host"]
end

def database
database_config[Rails.env]["database"]
database_config[Rails.env]["ci"]["database"]
end

def database_config


Loading…
Cancel
Save