foreman_bootdisk 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7d9d5c7d08c4fbdd36d96a0ba1da3f6c2100f3f
-  data.tar.gz: 3a57d414fd37afbaa302efa93995455a0fedc1da
+  metadata.gz: ada1629fb10bac22102cbd9eefade4131d825734
+  data.tar.gz: d3c3d123abc34f9d80b7aabb533a413402787820
 SHA512:
-  metadata.gz: 04039858a9dde5442a877d40f845e159f21cdcde8972149d4e0c8cb540dc6a3221d5b18f6d36a14610604993e0f942d50ed65bd805bebb5a104652b9411785d6
-  data.tar.gz: 38e34c53e31d0b330db0433ac64abf87b620586b2b951f577b5ba36ee138c57e874cf003203d2d902f5aed2874d788621dc0f8242a017a1ee9d364795ca6d1b5
+  metadata.gz: 85bf056ee2b9ffafb0ab4ac605a65a9c5e9e400e9f920c93f66c270a949ed3d7f47fca3322e3d9ffa21a48cf62e6141a94210f20edc155dd93c0a5fe925d13da
+  data.tar.gz: d8e071b412f3db4636a7379154f408864149e3019e34b084f066ccb0115e2e0eda3c8d0e21fa99f3c15012c444c4c0b04a279c288281acfaaf5e15366a8246e5

data/CHANGES.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v2.0.3
+* fix Foreman 1.5 auth system compatibility (#4893)
+* fix filename of generic ISO image in rake task
+
 ## v2.0.2
 * add MAC address to iPXE chain request for NAT (#3562, Jon Fautley)
 * raise friendly error if safemode is enabled (#4184, #2948)

data/app/controllers/bootdisk/disks_controller.rb

@@ -15,5 +15,16 @@ module Bootdisk
         send_data File.read(iso), :filename => "bootdisk_#{URI.parse(Setting[:foreman_url]).host}.iso"
       end
     end
+
+    private
+
+    def action_permission
+      case params[:action]
+        when 'generic_iso'
+          :download
+      else
+        super
+      end
+    end
   end
 end

data/app/controllers/concerns/bootdisk/hosts_controller_ext.rb

@@ -4,6 +4,7 @@ module Bootdisk::HostsControllerExt
   included do
     alias_method :find_by_name_bootiso, :find_by_name
     before_filter :find_by_name_bootiso, :only => %w[bootdisk_iso]
+    alias_method_chain :current_permission, :bootdisk if method_defined?(:current_permission)
   end
 
   def bootdisk_iso
@@ -19,4 +20,12 @@ module Bootdisk::HostsControllerExt
       send_data File.read(iso), :filename => "#{@host.name}.iso"
     end
   end
+
+  def current_permission_with_bootdisk
+    if params[:action] == 'bootdisk_iso'
+      'download_bootdisk'
+    else
+      current_permission_without_bootdisk
+    end
+  end
 end

data/lib/bootdisk/version.rb

@@ -1,3 +1,3 @@
 module Bootdisk
-  VERSION = '2.0.2'
+  VERSION = '2.0.3'
 end

data/lib/tasks/bootdisk.rake

@@ -17,7 +17,7 @@ namespace :bootdisk do
       tmpl = Bootdisk::Renderer.new.generic_template_render
 
       Bootdisk::ISOGenerator.new(tmpl).generate do |image|
-        output = ENV['OUTPUT'] || "bootdisk_#{Setting[:foreman_url]}.iso"
+        output = ENV['OUTPUT'] || "bootdisk_#{URI.parse(Setting[:foreman_url]).host}.iso"
         FileUtils.cp image, output
         puts "Wrote #{output}"
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_bootdisk
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Dominic Cleal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2014-03-27 00:00:00.000000000 Z
 dependencies: []
 description: Plugin for Foreman that creates iPXE-based boot disks to provision hosts
   without the need for PXE infrastructure.