Added pub key place
This commit is contained in:
2
app.rb
2
app.rb
@@ -1282,7 +1282,7 @@ post "/prjsign/:id" do
|
|||||||
print_error_page(503, "Путь к проектам не существует")
|
print_error_page(503, "Путь к проектам не существует")
|
||||||
else
|
else
|
||||||
if params["cancel"].nil? && params["sign"] == "sign"
|
if params["cancel"].nil? && params["sign"] == "sign"
|
||||||
err = prj.sign_project(params["id"], cfg.get_keys_path, params["password"], "/prjsignview/#{prj_info["id"]}", cfg.get_repoview_path)
|
err = prj.sign_project(params["id"], cfg.get_keys_path, params["password"], "/prjsignview/#{prj_info[:id]}", cfg.get_repoview_path)
|
||||||
unless err.nil?
|
unless err.nil?
|
||||||
session[:prj_modal_info] = "Ошибка добавления подписи пакетов проекта"
|
session[:prj_modal_info] = "Ошибка добавления подписи пакетов проекта"
|
||||||
session[:prj_modal_text] = err
|
session[:prj_modal_text] = err
|
||||||
|
|||||||
@@ -430,6 +430,11 @@ class ProjectsActions
|
|||||||
end
|
end
|
||||||
repo_sign.repoview(repo_url, prj[:projname], tpl_dir)
|
repo_sign.repoview(repo_url, prj[:projname], tpl_dir)
|
||||||
repo_sign.create_repo
|
repo_sign.create_repo
|
||||||
|
pub_key = repo_key.get_publick_key
|
||||||
|
proj_repo_key = File.join(sign_repo_path, "#{prj[:projname]}-gpg-key")
|
||||||
|
unless File.exist?(proj_repo_key)
|
||||||
|
FileUtils.cp_r(pub_key, proj_repo_key, verbose: false, remove_destination: false)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
|
|||||||
Reference in New Issue
Block a user