Skip to content

Commit

Permalink
Move cockpit-auth-miq to manageiq-appliance repo
Browse files Browse the repository at this point in the history
This doesn't need to live here, it isn't tested, doesn't use our
models and moving it removes a few AVC denials when running cockpit-ws

https://bugzilla.redhat.com/show_bug.cgi?id=1779988
  • Loading branch information
carbonin committed Dec 11, 2019
1 parent 733fde2 commit 53207cb
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 280 deletions.
2 changes: 1 addition & 1 deletion lib/miq_cockpit.rb
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ def web_ui_url
def update_config
title = @opts[:title] || "ManageIQ Cockpit"

login_command = Rails.root.join("tools", "cockpit", "cockpit-auth-miq")
login_command = File.join("/usr", "bin", "cockpit-auth-miq")

@config = <<-END_OF_CONFIG
[Webservice]
Expand Down
6 changes: 1 addition & 5 deletions spec/lib/miq_cockpit_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -104,15 +104,11 @@
end

describe 'update_config' do
before do
@login_command = Rails.root.join("tools", "cockpit", "cockpit-auth-miq")
end

context "when using empty opts" do
it "it uses defaults" do
ins = MiqCockpit::WS.new(nil)
config = ins.update_config
expect(config).to include("\n[SSH-Login]\ncommand = #{@login_command}\n")
expect(config).to include("\n[SSH-Login]\ncommand = /usr/bin/cockpit-auth-miq\n")
expect(config).to include("\n[Basic]\nAction = none\n")
expect(config).to include("\n[Negotiate]\nAction = none\n")
expect(config).to include("\nLoginTitle = ManageIQ Cockpit\n")
Expand Down
274 changes: 0 additions & 274 deletions tools/cockpit/cockpit-auth-miq

This file was deleted.

0 comments on commit 53207cb

Please sign in to comment.