puppetdb_foreman 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2be90389f7d589d0528935011494b49bc19d4898
-  data.tar.gz: 930be56d170f4a5d2ed8583657cc701bfb077a70
+  metadata.gz: 8a81b111e883eae3b66330a375019b9f65227baa
+  data.tar.gz: 3611a9e15096142d581d8c35eef162b23050d0d1
 SHA512:
-  metadata.gz: 05f1f3b7eeda1dde8582309bd6a985d1aad7f2bc4772046284849bd319cfb7f6cc493e5716e31b2776547f80d4d1c359c04f30452bc2ce21b7572851129fe996
-  data.tar.gz: 39fb3e971c4f7563b61eb374d5f1ef59b064d9f47019ee682053fc0edfee3ab87aee6f21855a3f6e80f11be696fda40c5c6471ff0ab2bab663c4acbb5745d24e
+  metadata.gz: ca1268d68b4d4fc521f4bd6cc79efdb2bb9a3e0823067a1ad50b8c52b6dfa2268a9dd968b729b82baf6b3614b03a5cdb865d8e612e63fd4ca579aed914e6e1dc
+  data.tar.gz: 23f80d5b4ae21f6ecfc96630f7d36699d1ce5a11144347fe2f0e33ffab154a37fd1bbcad52bb71f6056fc0bab9f7bf96802283a878bd2cdf6f84cfc243508940

data/app/controllers/puppetdb_foreman/puppetdb_controller.rb

@@ -12,6 +12,13 @@ module PuppetdbForeman
         result = Net::HTTP.get_response(uri.host, puppetdb_url, uri.port)
         render :text => result.body, :layout => layout
       rescue SocketError => error
+        @proxy_error = "Problem connecting to host #{uri.host} on port #{uri.port}"
+        render :action => :error, :layout => true
+      rescue Errno::ECONNREFUSED => error
+        @proxy_error = "#{uri.host} refused our conneciton"
+        render :action => :error, :layout => true
+      rescue EOFError => error
+        @proxy_error = "Don't use ssl (https)"
         render :action => :error, :layout => true
       end
     end

data/app/models/puppetdb_foreman/host_extensions.rb

@@ -1,19 +1,3 @@
-#
-# Copyright 2013 CERN, Switzerland
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
 module PuppetdbForeman
   module HostExtensions
     extend ActiveSupport::Concern

data/app/views/puppetdb_foreman/puppetdb/error.html.erb

@@ -1,4 +1,4 @@
 <div class="alert alert-block alert-warning">
-  <p><strong><%= _("Notice") %></strong> <%= _("Error Proxying PuppetDB Dashboard") %></p>
+  <p><strong><%= _("Notice") %></strong> <%= _("Error Proxying PuppetDB Dashboard: #{@proxy_error}") %></p>
   <p><%= _("Maybe you need to set") %> <%= link_to(_("puppetdb_dashboard_address"), settings_path(:search => 'puppetdb_dashboard_address')) %> <%= _("in Settings") %></p>
 </div>

data/lib/puppetdb_foreman/engine.rb

@@ -1,18 +1,3 @@
-#
-# Copyright 2013 CERN, Switzerland
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 module PuppetdbForeman
   class Engine < ::Rails::Engine
 

data/lib/puppetdb_foreman.rb

@@ -1,19 +1,3 @@
-#
-# Copyright 2013 CERN, Switzerland
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
 module PuppetdbForeman
   require 'puppetdb_foreman/engine' if defined?(Rails) && Rails::VERSION::MAJOR == 3
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppetdb_foreman
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-11 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies: []
 description: 'Disable hosts on PuppetDB after they are deleted or built in Foreman,
   and proxy the PuppetDB dashboard to Foreman. Follow https://github.com/theforeman/puppetdb_foreman
@@ -28,7 +28,7 @@ files:
 - lib/puppetdb_foreman/engine.rb
 homepage: http://www.github.com/theforeman/puppetdb_foreman
 licenses:
-- Apache-2.0
+- GPL-3
 metadata: {}
 post_install_message: 
 rdoc_options: []