linux_admin 0.5.5 → 0.5.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzkxZDkxZDkxMDNiNzlkMTkxNDY2MDExZDVlNzgwZGU3YTMyNDhkOQ==
+    NzNkYTcwOThkNWI2YzgwODM1M2E3NmIyODA0YjUyMTFmODM1ZWYyZg==
   data.tar.gz: !binary |-
-    NzQyODliMjBlMzMwMzY0NGM2YmI5YjdhYWYyYzNmMjgwNzJjYTExNg==
+    NDIwMWRiNWQyYjUzNDUwMjRkMzZmZDc1Zjc1YjM2ZDgzZmVkNDg5NA==
 SHA512:
   metadata.gz: !binary |-
-    ZjZhZjg4NjczY2I3NGIxNjExNTI0Y2EwZDY5ZjNiMjE0ODcxZmU3NzkwM2Nj
-    NWMyMWI0NTAxNzA4N2FmNmJmNmM2NmFmMWJhNTgzODVlOGRjMzk0MDNhZDhi
-    YmE4ZDk5ZTNlZTgwMDI3OGM2MmQ4ZjBjOWYxODRkZDUwMzAzYTg=
+    NTNiMTg1NTM2YWM4MTczMDgyOTBkMWU0OWVhMTI2MDYzNzJkNWY0NmVjMWZk
+    ZGVkNTgyODkzYzVjNGUzNzAwZDhhMzdmMjAyODg1YjYzMzNlMmYxZWEyODM5
+    ZGQ4MjY1YmE1YWRhZDY3NDdmOTMxMjM4N2IxYzU4NmU1ZjMyZDc=
   data.tar.gz: !binary |-
-    MGVkMmEzNjAxNTQ4ZTZmZTQ1YjVjMDMxMjZmYzI2NDA4N2RiMDllYzdlZmU5
-    MzI3YzU3MTQ0ZWQ0ZWVjZDEwY2I0NDQ3Y2IyOGM3NTk5MjhlYWRhZmJkMmY3
-    MDFjODIzMzJlODA4OTg1MDI3MGIyZjY4ZmI4NmFmMDljNTg5NGE=
+    YWFjZDA3MjViZmI2MGFhYTdlNmJjYmM1MGE5YTZmYWFhYmZmNTcxMjkwMDU3
+    NTdiNWE3OGUxMGJjMGFjNmYzMWM0YzU4MGYwNWQyZjBlYmUwNzExYWUwM2E3
+    ODIyYmIxZTM4NTUyNmI1NDNkYTI1MDk1NGM0MDZjNzM3ZjI1NzY=

data/lib/linux_admin/registration_system/rhn.rb

@@ -3,6 +3,7 @@ require 'nokogiri'
 class LinuxAdmin
   class Rhn < RegistrationSystem
     SATELLITE5_SERVER_CERT_PATH = "pub/rhn-org-trusted-ssl-cert-1.0-1.noarch.rpm"
+    INSTALLED_SERVER_CERT_PATH  = "/usr/share/rhn/RHN-ORG-TRUSTED-SSL-CERT"
 
     def registered?
       id = ""
@@ -27,13 +28,14 @@ class LinuxAdmin
       end
 
       install_server_certificate(options[:server_url], SATELLITE5_SERVER_CERT_PATH) if options[:server_url]
+      certificate_installed = LinuxAdmin::Rpm.list_installed["rhn-org-trusted-ssl-cert"]
 
-      params["--proxy="]          = options[:proxy_address]   if options[:proxy_address]
-      params["--proxyUser="]      = options[:proxy_username]  if options[:proxy_username]
-      params["--proxyPassword="]  = options[:proxy_password]  if options[:proxy_password]
-      params["--serverUrl="]      = options[:server_url]      if options[:server_url]
-      params["--systemorgid="]    = options[:org]             if options[:server_url] && options[:org]
-      params["--sslCACert="]      = options[:server_cert]     if options[:server_cert]
+      params["--proxy="]          = options[:proxy_address]     if options[:proxy_address]
+      params["--proxyUser="]      = options[:proxy_username]    if options[:proxy_username]
+      params["--proxyPassword="]  = options[:proxy_password]    if options[:proxy_password]
+      params["--serverUrl="]      = options[:server_url]        if options[:server_url]
+      params["--systemorgid="]    = options[:org]               if options[:server_url] && options[:org]
+      params["--sslCACert="]      = INSTALLED_SERVER_CERT_PATH  if certificate_installed
 
       run!(cmd, :params => params)
     end

data/lib/linux_admin/version.rb

@@ -1,3 +1,3 @@
 class LinuxAdmin
-  VERSION = "0.5.5"
+  VERSION = "0.5.6"
 end

data/spec/rhn_spec.rb

@@ -33,15 +33,17 @@ describe LinuxAdmin::Rhn do
                             :server_cert    => "/path/to/cert",
                           }
                         }
-      let(:run_params) { {:params=>{"--username="=>"SomeUser@SomeDomain.org", "--password="=>"SomePass", "--proxy="=>"1.2.3.4", "--proxyUser="=>"ProxyUser", "--proxyPassword="=>"ProxyPass", "--sslCACert="=>"/path/to/cert"}} }
+      let(:run_params) { {:params=>{"--username="=>"SomeUser@SomeDomain.org", "--password="=>"SomePass", "--proxy="=>"1.2.3.4", "--proxyUser="=>"ProxyUser", "--proxyPassword="=>"ProxyPass"}} }
 
       it "with server_url" do
         run_params.store_path(:params, "--systemorgid=", "2")
         run_params.store_path(:params, "--serverUrl=", "https://server.url")
+        run_params.store_path(:params, "--sslCACert=", "/usr/share/rhn/RHN-ORG-TRUSTED-SSL-CERT")
         base_options.store_path(:server_url, "https://server.url")
 
         described_class.any_instance.should_receive(:run!).once.with("rhnreg_ks", run_params)
         LinuxAdmin::Rpm.should_receive(:upgrade).with("http://server.url/pub/rhn-org-trusted-ssl-cert-1.0-1.noarch.rpm")
+        LinuxAdmin::Rpm.should_receive(:list_installed).and_return({"rhn-org-trusted-ssl-cert" => "1.0"})
 
         described_class.new.register(base_options)
       end
@@ -49,6 +51,7 @@ describe LinuxAdmin::Rhn do
       it "without server_url" do
         described_class.any_instance.should_receive(:run!).once.with("rhnreg_ks", run_params)
         described_class.any_instance.should_not_receive(:install_server_certificate)
+        LinuxAdmin::Rpm.should_receive(:list_installed).and_return({"rhn-org-trusted-ssl-cert" => nil})
 
         described_class.new.register(base_options)
       end
@@ -56,6 +59,8 @@ describe LinuxAdmin::Rhn do
 
     it "with activation key" do
       described_class.any_instance.should_receive(:run!).once.with("rhnreg_ks", {:params=>{"--activationkey="=>"123abc", "--proxy="=>"1.2.3.4", "--proxyUser="=>"ProxyUser", "--proxyPassword="=>"ProxyPass"}})
+      LinuxAdmin::Rpm.should_receive(:list_installed).and_return({"rhn-org-trusted-ssl-cert" => nil})
+
       described_class.new.register(
         :activationkey  => "123abc",
         :proxy_address  => "1.2.3.4",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linux_admin
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Brandon Dunne