foreman_bootdisk 2.0.8 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7dc3b370c05e00255c22c4ea339b2a713738b506
-  data.tar.gz: 55c4f0a822d7c2b37109d1335a7b05e0e2598d70
+  metadata.gz: 51adf08513ffcceb95f046aed88d330303cdb16d
+  data.tar.gz: 4b5ca7c65af66d5f64a024f44bf7b50b7c20cad9
 SHA512:
-  metadata.gz: d9cc91f4d6a7ae13a3296e322149163325ec94d42e07cabf7a2201efcbc7cae83b3799370e395740039acde09052a75bf899d3b1a94b02da300df4a3ed0f90fd
-  data.tar.gz: e4dda5788b2eb5f80e36d63bf3e4945733bf2173cb509fa32c674491cf99d57819a46c43625c23858550a536092d2c877059164a588e42610b6f16ac4c846fee
+  metadata.gz: eec946e5bbc5be09fefd2e09f0d20ea6c69963a58018554e8998490ee422dbeaf9cbbdc6538586fbd92086da638f0ab8e4f738d84730445481fe0d043fac2bcc
+  data.tar.gz: 8b5ddcc2f1cbb5f5cfa5f86d49b3fd0c125aabb2e303f3763e041e183d6d426ec597349103b85a477f130ecba342e56c95d58a9a2249cc8e11de1189e576989d

data/.tx/config

@@ -2,7 +2,7 @@
 host = https://www.transifex.com
 
 [foreman.bootdisk]
-file_filter = locale/<lang>/bootdisk.po
-source_file = locale/bootdisk.pot
+file_filter = locale/<lang>/foreman_bootdisk.po
+source_file = locale/foreman_bootdisk.pot
 source_lang = en
 type = PO

data/CHANGES.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v3.0.0
+* modernised to use Foreman 1.6 features, no new functionality
+* use template locking mechanism from Foreman 1.6 (#6843, Stephen Benjamin)
+* use seeds.d mechanism instead of extending db:seed
+* add de, es, fr, pt_BR, sv_SE translations (thanks to the translator teams)
+
 ## v2.0.8
 * fix DB migration when setting when using empty database (#5970)
 * updates to README

data/README.md

@@ -11,9 +11,9 @@ management device).
 
 # Installation
 
-Please see the Foreman wiki for appropriate instructions:
+Please see the Foreman manual for appropriate instructions:
 
-* [Foreman: How to Install a Plugin](http://projects.theforeman.org/projects/foreman/wiki/How_to_Install_a_Plugin)
+* [Foreman: How to Install a Plugin](http://theforeman.org/manuals/latest/index.html#6.Plugins)
 
 The gem name is "foreman_bootdisk".  Run `foreman-rake db:migrate`,
 `foreman-rake db:seed` after installation.
@@ -37,6 +37,7 @@ gPXE images are unsupported due to lack of initrd support.
 | --------------- | --------------:|
 | <= 1.3          | ~> 1.0         |
 | >= 1.4          | ~> 2.0         |
+| >= 1.6          | ~> 3.0         |
 
 # Usage
 

data/app/controllers/concerns/{bootdisk → foreman_bootdisk}/hosts_controller_ext.rb

@@ -1,4 +1,4 @@
-module Bootdisk::HostsControllerExt
+module ForemanBootdisk::HostsControllerExt
   extend ActiveSupport::Concern
 
   included do
@@ -16,7 +16,7 @@ module Bootdisk::HostsControllerExt
       return
     end
 
-    Bootdisk::ISOGenerator.new(tmpl).generate do |iso|
+    ForemanBootdisk::ISOGenerator.new(tmpl).generate do |iso|
       send_data File.read(iso), :filename => "#{@host.name}.iso"
     end
   end

data/app/controllers/concerns/{bootdisk → foreman_bootdisk}/unattended_controller_ext.rb

@@ -1,4 +1,4 @@
-module Bootdisk::UnattendedControllerExt
+module ForemanBootdisk::UnattendedControllerExt
   extend ActiveSupport::Concern
 
   included do

data/app/controllers/{bootdisk → foreman_bootdisk}/disks_controller.rb

@@ -1,17 +1,17 @@
 require 'uri'
 
-module Bootdisk
+module ForemanBootdisk
   class DisksController < ::ApplicationController
     def generic_iso
       begin
-        tmpl = Bootdisk::Renderer.new.generic_template_render
+        tmpl = ForemanBootdisk::Renderer.new.generic_template_render
       rescue => e
         error _('Failed to render boot disk template: %s') % e
         redirect_to :back
         return
       end
 
-      Bootdisk::ISOGenerator.new(tmpl).generate do |iso|
+      ForemanBootdisk::ISOGenerator.new(tmpl).generate do |iso|
         send_data File.read(iso), :filename => "bootdisk_#{URI.parse(Setting[:foreman_url]).host}.iso"
       end
     end

data/app/helpers/concerns/{bootdisk → foreman_bootdisk}/hosts_helper_ext.rb

@@ -1,4 +1,4 @@
-module Bootdisk::HostsHelperExt
+module ForemanBootdisk::HostsHelperExt
   extend ActiveSupport::Concern
 
   included do

data/app/models/concerns/{bootdisk → foreman_bootdisk}/host_ext.rb

@@ -1,6 +1,6 @@
 require 'uri'
 
-module Bootdisk::HostExt
+module ForemanBootdisk::HostExt
   extend ActiveSupport::Concerns
 
   def bootdisk_template

data/app/services/{bootdisk → foreman_bootdisk}/iso_generator.rb

@@ -1,7 +1,7 @@
 # Generates an iPXE ISO hybrid image
 #
 # requires syslinux, ipxe/ipxe-bootimgs, genisoimage, isohybrid
-class Bootdisk::ISOGenerator
+class ForemanBootdisk::ISOGenerator
   attr_reader :script
 
   def initialize(script, opts = {})

data/app/services/{bootdisk → foreman_bootdisk}/renderer.rb

@@ -1,6 +1,6 @@
 require 'uri'
 
-module Bootdisk
+module ForemanBootdisk
   class Renderer
     include ::Foreman::Renderer
     include Rails.application.routes.url_helpers

data/config/routes.rb

@@ -1,5 +1,5 @@
 Rails.application.routes.draw do
-  resources :disks, :module => 'bootdisk', :only => :index do
+  resources :disks, :module => 'foreman_bootdisk', :only => :index do
     get 'generic_iso', :on => :collection
   end
 

data/db/seeds.d/50-bootdisk_templates.rb

@@ -0,0 +1,25 @@
+kind = TemplateKind.find_or_create_by_name('Bootdisk')
+
+ConfigTemplate.without_auditing do
+  content = File.read(File.join(ForemanBootdisk::Engine.root, 'app', 'views', 'foreman_bootdisk', 'host.erb'))
+  ConfigTemplate.find_or_create_by_name(
+    :name => 'Boot disk iPXE - host',
+    :template_kind_id => kind.id,
+    :snippet => false,
+    :template => content
+  ).update_attributes(:template => content,
+                      :default  => true,
+                      :vendor   => "Foreman boot disk",
+                      :locked   => true)
+
+  content = File.read(File.join(ForemanBootdisk::Engine.root, 'app', 'views', 'foreman_bootdisk', 'generic_host.erb'))
+  ConfigTemplate.find_or_create_by_name(
+    :name => 'Boot disk iPXE - generic host',
+    :template_kind_id => kind.id,
+    :snippet => false,
+    :template => content
+  ).update_attributes(:template => content,
+                      :default  => true,
+                      :vendor   => "Foreman boot disk",
+                      :locked   => true)
+end

data/lib/foreman_bootdisk.rb

@@ -1,7 +1,7 @@
-require 'bootdisk/version'
+require 'foreman_bootdisk/version'
 
-module Bootdisk
-  ENGINE_NAME = 'bootdisk'
+module ForemanBootdisk
+  ENGINE_NAME = 'foreman_bootdisk'
 
-  require 'bootdisk/engine' if defined?(Rails) && Rails::VERSION::MAJOR == 3
+  require 'foreman_bootdisk/engine' if defined?(Rails) && Rails::VERSION::MAJOR == 3
 end

data/lib/{bootdisk → foreman_bootdisk}/engine.rb

@@ -2,9 +2,9 @@ require 'foreman_bootdisk'
 require 'fast_gettext'
 require 'gettext_i18n_rails'
 
-module Bootdisk
+module ForemanBootdisk
   class Engine < ::Rails::Engine
-    engine_name Bootdisk::ENGINE_NAME
+    engine_name ForemanBootdisk::ENGINE_NAME
 
     config.autoload_paths += Dir["#{config.root}/app/controllers/concerns"]
     config.autoload_paths += Dir["#{config.root}/app/helpers/concerns"]
@@ -15,12 +15,12 @@ module Bootdisk
     end
 
     initializer "foreman_bootdisk.load_app_instance_data" do |app|
-      app.config.paths['db/migrate'] += Bootdisk::Engine.paths['db/migrate'].existent
+      app.config.paths['db/migrate'] += ForemanBootdisk::Engine.paths['db/migrate'].existent
     end
 
     initializer 'foreman_bootdisk.register_plugin', :after=> :finisher_hook do |app|
       Foreman::Plugin.register :foreman_bootdisk do
-        requires_foreman '>= 1.4'
+        requires_foreman '>= 1.6'
 
         security_block :bootdisk do |map|
           permission :download_bootdisk, {:hosts => [:bootdisk_iso],
@@ -35,25 +35,18 @@ module Bootdisk
 
     initializer 'foreman_bootdisk.register_gettext', :after => :load_config_initializers do |app|
       locale_dir = File.join(File.expand_path('../../..', __FILE__), 'locale')
-      locale_domain = 'bootdisk'
+      locale_domain = 'foreman_bootdisk'
       Foreman::Gettext::Support.add_text_domain locale_domain, locale_dir
     end
 
     config.to_prepare do
       begin
-        ConfigTemplate.send(:include, Bootdisk::ConfigTemplateExt)
-        Host::Managed.send(:include, Bootdisk::HostExt)
-        HostsController.send(:include, Bootdisk::HostsControllerExt)
-        HostsHelper.send(:include, Bootdisk::HostsHelperExt)
-        UnattendedController.send(:include, Bootdisk::UnattendedControllerExt)
+        Host::Managed.send(:include, ForemanBootdisk::HostExt)
+        HostsController.send(:include, ForemanBootdisk::HostsControllerExt)
+        HostsHelper.send(:include, ForemanBootdisk::HostsHelperExt)
+        UnattendedController.send(:include, ForemanBootdisk::UnattendedControllerExt)
       rescue => e
-        puts "#{Bootdisk::ENGINE_NAME}: skipping engine hook (#{e.to_s})"
-      end
-    end
-
-    rake_tasks do
-      Rake::Task['db:seed'].enhance do
-        Bootdisk::Engine.load_seed
+        puts "#{ForemanBootdisk::ENGINE_NAME}: skipping engine hook (#{e.to_s})"
       end
     end
   end

data/lib/foreman_bootdisk/version.rb

@@ -0,0 +1,3 @@
+module ForemanBootdisk
+  VERSION = '3.0.0'
+end

data/lib/tasks/bootdisk.rake

@@ -5,7 +5,7 @@ namespace :bootdisk do
       host = Host::Base.find_by_name(ENV['NAME']) || raise("cannot find host '#{ENV['NAME']}', specify NAME=fqdn")
       tmpl = host.bootdisk_template_render
 
-      Bootdisk::ISOGenerator.new(tmpl).generate do |image|
+      ForemanBootdisk::ISOGenerator.new(tmpl).generate do |image|
         output = ENV['OUTPUT'] || "#{host.name}.iso"
         FileUtils.cp image, output
         puts "Wrote #{output}"
@@ -14,9 +14,9 @@ namespace :bootdisk do
 
     desc 'Generate a generic boot disk.  OUTPUT=path'
     task :generic => :environment do
-      tmpl = Bootdisk::Renderer.new.generic_template_render
+      tmpl = ForemanBootdisk::Renderer.new.generic_template_render
 
-      Bootdisk::ISOGenerator.new(tmpl).generate do |image|
+      ForemanBootdisk::ISOGenerator.new(tmpl).generate do |image|
         output = ENV['OUTPUT'] || "bootdisk_#{URI.parse(Setting[:foreman_url]).host}.iso"
         FileUtils.cp image, output
         puts "Wrote #{output}"

data/locale/de/foreman_bootdisk.po

@@ -0,0 +1,84 @@
+# foreman_bootdisk
+# 
+# This file is distributed under the same license as foreman_bootdisk.
+# 
+# Translators:
+# Paul Puschmann, 2014
+# simon11 <simon.stieger.98@live.de>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Foreman\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-02-13 12:18+0000\n"
+"PO-Revision-Date: 2014-07-09 08:11+0000\n"
+"Last-Translator: simon11 <simon.stieger.98@live.de>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/foreman/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Boot disk"
+msgstr "Boot disk"
+
+msgid ""
+"Bootdisk is not supported with safemode rendering, please disable "
+"safemode_render under Adminster>Settings"
+msgstr "Bootdisk mit Safemode-Abbildung wird nicht unterstützt, bitte deaktiviere safemode_render unter Verwalten > Einstellungen"
+
+msgid "Command to generate ISO image, use genisoimage or mkisofs"
+msgstr "Kommando zur Erstellung von ISO-Images, verwende genisoimage oder mkisofs"
+
+msgid "Failed to render boot disk template: %s"
+msgstr "Fehler beim Abbilden der Bootdisk-Vorlage: %s"
+
+msgid "Generic image"
+msgstr "Generisches Image"
+
+msgid "Host '%s' image"
+msgstr "Host '%s' Image"
+
+msgid "Host has no IP address defined"
+msgstr "Host hat keine IP-Adresse definiert"
+
+msgid "Host has no domain defined"
+msgstr "Host hat keine Domäne definiert"
+
+msgid "Host has no subnet defined"
+msgstr "Host hat kein Subnetz definiert"
+
+msgid "ISO build failed"
+msgstr "ISO-Erstellung fehlgeschlagen"
+
+msgid "ISO hybrid conversion failed"
+msgstr "ISO hybrid Konvertierung fehlgeschlagen"
+
+msgid "Path to directory containing iPXE images"
+msgstr "Pfad zum Verzeichnis mit iPXE Images"
+
+msgid "Path to directory containing syslinux images"
+msgstr "Pfad zum Verzeichnis mit syslinux Images"
+
+msgid "Please ensure the ipxe-bootimgs and syslinux packages are installed."
+msgstr "Bitte stelle sicher, dass die Pakete ipxe-bootimgs und syslinux installiert sind."
+
+msgid "Subnet (%s) has no gateway defined"
+msgstr "Subnetz (%s) hat keinen Gateway definiert"
+
+msgid "Subnet (%s) has no primary DNS server defined"
+msgstr "Subnetz (%s) hat keinen primären DNS-Server definiert"
+
+msgid ""
+"Template is read-only as it's supplied in foreman_bootdisk.  Please copy it "
+"to a new template to customize."
+msgstr "Template is read-only as it's supplied in foreman_bootdisk.  Please copy it to a new template to customize."
+
+msgid "Unable to find template specified by %s setting"
+msgstr "Konnte Vorlage mit der %s-Einstellung nicht finden"
+
+msgid "iPXE template to use for generic host boot disks"
+msgstr "iPXE Vorlage zur Verwendung für generische host boot disks"
+
+msgid "iPXE template to use for host-specific boot disks"
+msgstr "iPXE Vorlage zur Verwendung für host-spezifische boot disks"

data/locale/{bootdisk.pot → en/foreman_bootdisk.po}

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: version 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-13 12:18+0000\n"
+"POT-Creation-Date: 2014-08-05 10:56+0100\n"
 "PO-Revision-Date: 2014-02-13 12:09+0000\n"
 "Last-Translator: Dominic Cleal <dcleal@redhat.com>\n"
 "Language-Team: Foreman Team <foreman-dev@googlegroups.com>\n"
@@ -65,9 +65,6 @@ msgstr ""
 msgid "Subnet (%s) has no primary DNS server defined"
 msgstr ""
 
-msgid "Template is read-only as it's supplied in foreman_bootdisk.  Please copy it to a new template to customize."
-msgstr ""
-
 msgid "Unable to find template specified by %s setting"
 msgstr ""
 

data/locale/en_GB/{bootdisk.po → foreman_bootdisk.po}

@@ -1,16 +1,16 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
+# foreman_bootdisk
+# 
+# This file is distributed under the same license as foreman_bootdisk.
+# 
 # Translators:
-# domcleal <dcleal@redhat.com>, 2014
+# Dominic Cleal <dcleal@redhat.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Foreman\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-13 12:09+0000\n"
-"PO-Revision-Date: 2014-02-13 12:14+0000\n"
-"Last-Translator: domcleal <dcleal@redhat.com>\n"
+"POT-Creation-Date: 2014-02-13 12:18+0000\n"
+"PO-Revision-Date: 2014-02-13 12:20+0000\n"
+"Last-Translator: Dominic Cleal <dcleal@redhat.com>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/foreman/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,89 +18,66 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app/services/bootdisk/iso_generator.rb:25
-msgid "Please ensure the ipxe-bootimgs and syslinux packages are installed."
-msgstr "Please ensure the ipxe-bootimgs and syslinux packages are installed."
-
-#: app/services/bootdisk/iso_generator.rb:34
-msgid "ISO build failed"
-msgstr "ISO build failed"
-
-#: app/services/bootdisk/iso_generator.rb:39
-msgid "ISO hybrid conversion failed"
-msgstr "ISO hybrid conversion failed"
+msgid "Boot disk"
+msgstr "Boot disk"
 
-#: app/services/bootdisk/renderer.rb:8
-#: app/models/concerns/bootdisk/host_ext.rb:10
 msgid ""
 "Bootdisk is not supported with safemode rendering, please disable "
 "safemode_render under Adminster>Settings"
 msgstr "Bootdisk is not supported with safemode rendering, please disable safemode_render under Adminster>Settings"
 
-#: app/services/bootdisk/renderer.rb:10
-#: app/models/concerns/bootdisk/host_ext.rb:5
-msgid "Unable to find template specified by %s setting"
-msgstr "Unable to find template specified by %s setting"
-
-#: app/controllers/bootdisk/disks_controller.rb:9
-#: app/controllers/concerns/bootdisk/hosts_controller_ext.rb:13
-msgid "Failed to render boot disk template: %s"
-msgstr "Failed to render boot disk template: %s"
-
-#: app/models/setting/bootdisk.rb:11
-msgid "Path to directory containing iPXE images"
-msgstr "Path to directory containing iPXE images"
-
-#: app/models/setting/bootdisk.rb:12
-msgid "Path to directory containing syslinux images"
-msgstr "Path to directory containing syslinux images"
-
-#: app/models/setting/bootdisk.rb:13
-msgid "iPXE template to use for host-specific boot disks"
-msgstr "iPXE template to use for host-specific boot disks"
-
-#: app/models/setting/bootdisk.rb:14
-msgid "iPXE template to use for generic host boot disks"
-msgstr "iPXE template to use for generic host boot disks"
-
-#: app/models/setting/bootdisk.rb:15
 msgid "Command to generate ISO image, use genisoimage or mkisofs"
 msgstr "Command to generate ISO image, use genisoimage or mkisofs"
 
-#: app/models/concerns/bootdisk/config_template_ext.rb:33
-msgid ""
-"Template is read-only as it's supplied in foreman_bootdisk.  Please copy it "
-"to a new template to customize."
-msgstr "Template is read-only as it's supplied in foreman_bootdisk.  Please copy it to a new template to customise."
+msgid "Failed to render boot disk template: %s"
+msgstr "Failed to render boot disk template: %s"
 
-#: app/helpers/concerns/bootdisk/hosts_helper_ext.rb:11
-msgid "Boot disk"
-msgstr "Boot disk"
+msgid "Generic image"
+msgstr "Generic image"
 
-#: app/helpers/concerns/bootdisk/hosts_helper_ext.rb:12
 msgid "Host '%s' image"
 msgstr "Host '%s' image"
 
-#: app/helpers/concerns/bootdisk/hosts_helper_ext.rb:13
-msgid "Generic image"
-msgstr "Generic image"
-
-#: app/views/bootdisk/host.erb:8
 msgid "Host has no IP address defined"
 msgstr "Host has no IP address defined"
 
-#: app/views/bootdisk/host.erb:9
+msgid "Host has no domain defined"
+msgstr "Host has no domain defined"
+
 msgid "Host has no subnet defined"
 msgstr "Host has no subnet defined"
 
-#: app/views/bootdisk/host.erb:10
-msgid "Host has no domain defined"
-msgstr "Host has no domain defined"
+msgid "ISO build failed"
+msgstr "ISO build failed"
+
+msgid "ISO hybrid conversion failed"
+msgstr "ISO hybrid conversion failed"
+
+msgid "Path to directory containing iPXE images"
+msgstr "Path to directory containing iPXE images"
+
+msgid "Path to directory containing syslinux images"
+msgstr "Path to directory containing syslinux images"
+
+msgid "Please ensure the ipxe-bootimgs and syslinux packages are installed."
+msgstr "Please ensure the ipxe-bootimgs and syslinux packages are installed."
 
-#: app/views/bootdisk/host.erb:11
 msgid "Subnet (%s) has no gateway defined"
 msgstr "Subnet (%s) has no gateway defined"
 
-#: app/views/bootdisk/host.erb:12
 msgid "Subnet (%s) has no primary DNS server defined"
 msgstr "Subnet (%s) has no primary DNS server defined"
+
+msgid ""
+"Template is read-only as it's supplied in foreman_bootdisk.  Please copy it "
+"to a new template to customize."
+msgstr "Template is read-only as it's supplied in foreman_bootdisk.  Please copy it to a new template to customise."
+
+msgid "Unable to find template specified by %s setting"
+msgstr "Unable to find template specified by %s setting"
+
+msgid "iPXE template to use for generic host boot disks"
+msgstr "iPXE template to use for generic host boot disks"
+
+msgid "iPXE template to use for host-specific boot disks"
+msgstr "iPXE template to use for host-specific boot disks"

data/locale/es/foreman_bootdisk.po

@@ -0,0 +1,83 @@
+# foreman_bootdisk
+# 
+# This file is distributed under the same license as foreman_bootdisk.
+# 
+# Translators:
+# Sergio Ocón <sergio@redhat.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Foreman\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-02-13 12:18+0000\n"
+"PO-Revision-Date: 2014-05-21 10:02+0000\n"
+"Last-Translator: Sergio Ocón <sergio@redhat.com>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/foreman/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Boot disk"
+msgstr "Disco de arranque"
+
+msgid ""
+"Bootdisk is not supported with safemode rendering, please disable "
+"safemode_render under Adminster>Settings"
+msgstr "No se soporta un disco de arranque en el modo seguro de representación, deshabilite safemode_render bajo Administración>Configuración"
+
+msgid "Command to generate ISO image, use genisoimage or mkisofs"
+msgstr "Comando para generar una imagen ISO, use genisoimage o mkisofs"
+
+msgid "Failed to render boot disk template: %s"
+msgstr "Fallo en la entrega de la plantilla del disco de arranque: %s"
+
+msgid "Generic image"
+msgstr "Imagen genérica"
+
+msgid "Host '%s' image"
+msgstr "Imagen del host '%s'"
+
+msgid "Host has no IP address defined"
+msgstr "El host no tiene dirección IP definida"
+
+msgid "Host has no domain defined"
+msgstr "El host no tiene dominio definido"
+
+msgid "Host has no subnet defined"
+msgstr "El host no tiene subred definida"
+
+msgid "ISO build failed"
+msgstr "Error en la construcción del ISO"
+
+msgid "ISO hybrid conversion failed"
+msgstr "Error en la conversión del ISO Híbrido"
+
+msgid "Path to directory containing iPXE images"
+msgstr "Ruta al directorio que contiene las imágenes iPXE"
+
+msgid "Path to directory containing syslinux images"
+msgstr "Ruta al directorio que contiene las imágenes syslinux"
+
+msgid "Please ensure the ipxe-bootimgs and syslinux packages are installed."
+msgstr "Asegúrese de que los paquetes ipxe-bootimgs y syslinux están instalados."
+
+msgid "Subnet (%s) has no gateway defined"
+msgstr "La subred (%s) no tiene gateway definida"
+
+msgid "Subnet (%s) has no primary DNS server defined"
+msgstr "La subred (%s) no tiene servidor DNS primario definido"
+
+msgid ""
+"Template is read-only as it's supplied in foreman_bootdisk.  Please copy it "
+"to a new template to customize."
+msgstr "La plantilla es de solo lectura al proporcionarse en foreman_bootdisk. Cópiela en una nueva plantilla para customizarla"
+
+msgid "Unable to find template specified by %s setting"
+msgstr "No ha sido posible encontrar la plantilla especificada por el parámetro de configuración %s"
+
+msgid "iPXE template to use for generic host boot disks"
+msgstr "Plantilla iPXE para usar en discos de arranque de host genéricos"
+
+msgid "iPXE template to use for host-specific boot disks"
+msgstr "Plantilla iPXE para usar en discos de arranque de hosts particulares"

data/locale/foreman_bootdisk.pot

@@ -0,0 +1,75 @@
+# foreman_bootdisk
+#
+# This file is distributed under the same license as foreman_bootdisk.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: version 0.0.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-08-05 10:56+0100\n"
+"PO-Revision-Date: 2014-02-13 12:09+0000\n"
+"Last-Translator: Dominic Cleal <dcleal@redhat.com>\n"
+"Language-Team: Foreman Team <foreman-dev@googlegroups.com>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+msgid "Boot disk"
+msgstr ""
+
+msgid "Bootdisk is not supported with safemode rendering, please disable safemode_render under Adminster>Settings"
+msgstr ""
+
+msgid "Command to generate ISO image, use genisoimage or mkisofs"
+msgstr ""
+
+msgid "Failed to render boot disk template: %s"
+msgstr ""
+
+msgid "Generic image"
+msgstr ""
+
+msgid "Host '%s' image"
+msgstr ""
+
+msgid "Host has no IP address defined"
+msgstr ""
+
+msgid "Host has no domain defined"
+msgstr ""
+
+msgid "Host has no subnet defined"
+msgstr ""
+
+msgid "ISO build failed"
+msgstr ""
+
+msgid "ISO hybrid conversion failed"
+msgstr ""
+
+msgid "Path to directory containing iPXE images"
+msgstr ""
+
+msgid "Path to directory containing syslinux images"
+msgstr ""
+
+msgid "Please ensure the ipxe-bootimgs and syslinux packages are installed."
+msgstr ""
+
+msgid "Subnet (%s) has no gateway defined"
+msgstr ""
+
+msgid "Subnet (%s) has no primary DNS server defined"
+msgstr ""
+
+msgid "Unable to find template specified by %s setting"
+msgstr ""
+
+msgid "iPXE template to use for generic host boot disks"
+msgstr ""
+
+msgid "iPXE template to use for host-specific boot disks"
+msgstr ""

data/locale/fr/foreman_bootdisk.po

@@ -0,0 +1,83 @@
+# foreman_bootdisk
+# 
+# This file is distributed under the same license as foreman_bootdisk.
+# 
+# Translators:
+# Claer <transiblu@claer.hammock.fr>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Foreman\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-02-13 12:18+0000\n"
+"PO-Revision-Date: 2014-02-13 18:20+0000\n"
+"Last-Translator: Claer <transiblu@claer.hammock.fr>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/foreman/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+msgid "Boot disk"
+msgstr "Disque de boot"
+
+msgid ""
+"Bootdisk is not supported with safemode rendering, please disable "
+"safemode_render under Adminster>Settings"
+msgstr "Bootdisk n'est pas supporté en simultané de safemode rendering. Merci de désactiver safemode_render dans Administrer > Paramètres."
+
+msgid "Command to generate ISO image, use genisoimage or mkisofs"
+msgstr "Commande servant à générer l'image ISO, utiliser genisoimage ou mkisofs"
+
+msgid "Failed to render boot disk template: %s"
+msgstr "Impossible d'appliquer le modèle de disque : %s"
+
+msgid "Generic image"
+msgstr "Image générique"
+
+msgid "Host '%s' image"
+msgstr "Image de l'hôte '%s'"
+
+msgid "Host has no IP address defined"
+msgstr "L'hôte n'a aucune adresse IP définie"
+
+msgid "Host has no domain defined"
+msgstr "L'hôte n'a aucun domaine défini"
+
+msgid "Host has no subnet defined"
+msgstr "L'hôte n'a aucun sous réseau défini"
+
+msgid "ISO build failed"
+msgstr "La création de l'image ISO a échoué"
+
+msgid "ISO hybrid conversion failed"
+msgstr "La conversion de l'image ISO hybride a échoué"
+
+msgid "Path to directory containing iPXE images"
+msgstr "Emplacement du répertoire contenant les images iPXE"
+
+msgid "Path to directory containing syslinux images"
+msgstr "Emplacement du répertoire contenant les images syslinux"
+
+msgid "Please ensure the ipxe-bootimgs and syslinux packages are installed."
+msgstr "Merci de vérifier que les paquets ipxe-bootimgs et syslinux soient installés."
+
+msgid "Subnet (%s) has no gateway defined"
+msgstr "Le sous réseau (%s) n'a pas de passerelle définie"
+
+msgid "Subnet (%s) has no primary DNS server defined"
+msgstr "Le sous réseau (%s) n'a pas de serveur DNS primaire défini"
+
+msgid ""
+"Template is read-only as it's supplied in foreman_bootdisk.  Please copy it "
+"to a new template to customize."
+msgstr "Le modèle est en lecture seule car il est fourni par foreman_bootdisk. Merci de le recopier vers un nouveau modèle pour avoir une version éditable."
+
+msgid "Unable to find template specified by %s setting"
+msgstr "Impossible de trouver un modèle spécifié par le paramètre %s"
+
+msgid "iPXE template to use for generic host boot disks"
+msgstr "Modèle iPXE à appliquer pour les disques de boot génériques"
+
+msgid "iPXE template to use for host-specific boot disks"
+msgstr "Le modèle iPXE à appliquer pour des disques de boot spécifiques à l'hôte"

data/locale/pt_BR/foreman_bootdisk.po

@@ -0,0 +1,82 @@
+# foreman_bootdisk
+# 
+# This file is distributed under the same license as foreman_bootdisk.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Foreman\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-02-13 12:18+0000\n"
+"PO-Revision-Date: 2014-03-30 04:00+0000\n"
+"Last-Translator: Flamarion Jorge Flamarion <jorge.flamarion@gmail.com>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/foreman/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+msgid "Boot disk"
+msgstr "Disco de boot"
+
+msgid ""
+"Bootdisk is not supported with safemode rendering, please disable "
+"safemode_render under Adminster>Settings"
+msgstr "Disco de boot não e suportado com o modo seguro de interpretação, por favor desabilite o safemode_render em Administrar>Configurações"
+
+msgid "Command to generate ISO image, use genisoimage or mkisofs"
+msgstr "Comando para gerar imagem ISO usar genisoimage ou mkisofs"
+
+msgid "Failed to render boot disk template: %s"
+msgstr "Falha ro interpretar o template de disco de boot: %s"
+
+msgid "Generic image"
+msgstr "Imagem genérica"
+
+msgid "Host '%s' image"
+msgstr "Imagem '%s' de host"
+
+msgid "Host has no IP address defined"
+msgstr "Host não tem um endereço IP definido"
+
+msgid "Host has no domain defined"
+msgstr "Host não tem um domínio definido"
+
+msgid "Host has no subnet defined"
+msgstr "Host não tem uma subrede definida"
+
+msgid "ISO build failed"
+msgstr "Construção da ISO falhou"
+
+msgid "ISO hybrid conversion failed"
+msgstr "Conversão da ISO híbrida falhou"
+
+msgid "Path to directory containing iPXE images"
+msgstr "Caminho do diretório contendo imagens iPXE"
+
+msgid "Path to directory containing syslinux images"
+msgstr "Caminho do diretório contendo imagens syslinux"
+
+msgid "Please ensure the ipxe-bootimgs and syslinux packages are installed."
+msgstr "Por favor garanta que os pacotes ipxe-bootimgs e syslinux estejam instalados"
+
+msgid "Subnet (%s) has no gateway defined"
+msgstr "Subrede (%s) não tem um gateway definido"
+
+msgid "Subnet (%s) has no primary DNS server defined"
+msgstr "Subrede (%s) não tem um servidor DNS primário definido"
+
+msgid ""
+"Template is read-only as it's supplied in foreman_bootdisk.  Please copy it "
+"to a new template to customize."
+msgstr "Template está somente leitura como é fornecido em foreman_bootdisk. Por favor copie para um novo modelo e personalize."
+
+msgid "Unable to find template specified by %s setting"
+msgstr "Impossível encontrar template especificado pela configuração %s"
+
+msgid "iPXE template to use for generic host boot disks"
+msgstr "Template iPXE para uso em discos de boot de hosts genéricos"
+
+msgid "iPXE template to use for host-specific boot disks"
+msgstr "Template iPXE para uso em discos de boot de hosts específicos"

data/locale/sv_SE/foreman_bootdisk.po

@@ -0,0 +1,83 @@
+# foreman_bootdisk
+# 
+# This file is distributed under the same license as foreman_bootdisk.
+# 
+# Translators:
+# johnny.westerlund <johnny.westerlund@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Foreman\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-02-13 12:18+0000\n"
+"PO-Revision-Date: 2014-02-18 11:20+0000\n"
+"Last-Translator: johnny.westerlund <johnny.westerlund@gmail.com>\n"
+"Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/foreman/language/sv_SE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv_SE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Boot disk"
+msgstr "Startdisk"
+
+msgid ""
+"Bootdisk is not supported with safemode rendering, please disable "
+"safemode_render under Adminster>Settings"
+msgstr "Startdisk är inte supportat med \"safemode\" rendering aktiverat, var vänlig och inaktivera \"safemode_render\" under Administration>Inställningar"
+
+msgid "Command to generate ISO image, use genisoimage or mkisofs"
+msgstr "Kommando för att generera ISO-avbildningar, använd genisoimage eller mkisofs"
+
+msgid "Failed to render boot disk template: %s"
+msgstr "Misslyckades att tolka startdiskmallen: %s"
+
+msgid "Generic image"
+msgstr "Generell avbildning"
+
+msgid "Host '%s' image"
+msgstr "Värden '%s' avbildning"
+
+msgid "Host has no IP address defined"
+msgstr "Värden har ingen IP-adress definierad"
+
+msgid "Host has no domain defined"
+msgstr "Värden har ingen domän definierad"
+
+msgid "Host has no subnet defined"
+msgstr "Värden har inget subnät definierat"
+
+msgid "ISO build failed"
+msgstr "ISO-bygget misslyckades"
+
+msgid "ISO hybrid conversion failed"
+msgstr "ISO hybridkonvertering misslyckades"
+
+msgid "Path to directory containing iPXE images"
+msgstr "Sökvägen till ett bibliotek med iPXE-avbildningar"
+
+msgid "Path to directory containing syslinux images"
+msgstr "Sökvägen till ett bibliotek med syslinux-avbildningar"
+
+msgid "Please ensure the ipxe-bootimgs and syslinux packages are installed."
+msgstr "Vär vänlig och säkerställ att ipxe-startavbildningarna och syslinux paketen är installerade."
+
+msgid "Subnet (%s) has no gateway defined"
+msgstr "Subnät (%s) har ingen nätsluss definierad"
+
+msgid "Subnet (%s) has no primary DNS server defined"
+msgstr "Subnät (%s) har ingen primär DNS-server definierad"
+
+msgid ""
+"Template is read-only as it's supplied in foreman_bootdisk.  Please copy it "
+"to a new template to customize."
+msgstr "Mallen är skrivskyddad eftersom den används i \"foreman_bootdisk\". Var vänligt och kopiera den till en ny mall för att ändra."
+
+msgid "Unable to find template specified by %s setting"
+msgstr "Går inte att hitta mallen specificerad med inställningen %s"
+
+msgid "iPXE template to use for generic host boot disks"
+msgstr "iPXE-mall att använda som generell startdisk fär värdar"
+
+msgid "iPXE template to use for host-specific boot disks"
+msgstr "iPXE-mall att använda för värdspecifik startdisk"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_bootdisk
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 3.0.0
 platform: ruby
 authors:
 - Dominic Cleal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2014-08-05 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.
@@ -25,17 +25,16 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- app/controllers/bootdisk/disks_controller.rb
-- app/controllers/concerns/bootdisk/hosts_controller_ext.rb
-- app/controllers/concerns/bootdisk/unattended_controller_ext.rb
-- app/helpers/concerns/bootdisk/hosts_helper_ext.rb
-- app/models/concerns/bootdisk/config_template_ext.rb
-- app/models/concerns/bootdisk/host_ext.rb
+- app/controllers/concerns/foreman_bootdisk/hosts_controller_ext.rb
+- app/controllers/concerns/foreman_bootdisk/unattended_controller_ext.rb
+- app/controllers/foreman_bootdisk/disks_controller.rb
+- app/helpers/concerns/foreman_bootdisk/hosts_helper_ext.rb
+- app/models/concerns/foreman_bootdisk/host_ext.rb
 - app/models/setting/bootdisk.rb
-- app/services/bootdisk/iso_generator.rb
-- app/services/bootdisk/renderer.rb
-- app/views/bootdisk/generic_host.erb
-- app/views/bootdisk/host.erb
+- app/services/foreman_bootdisk/iso_generator.rb
+- app/services/foreman_bootdisk/renderer.rb
+- app/views/foreman_bootdisk/generic_host.erb
+- app/views/foreman_bootdisk/host.erb
 - config/routes.rb
 - db/migrate/20130914211030_create_host_bootdisk_template.rb
 - db/migrate/20130915104500_edit_host_bootdisk_template_multinic.rb
@@ -43,14 +42,19 @@ files:
 - db/migrate/20130915201457_create_generic_host_bootdisk_template.rb
 - db/migrate/20131021095100_edit_host_bootdisk_template_dns_secondary.rb
 - db/migrate/20140522185700_change_templatekind_to_bootdisk.rb
-- db/seeds.rb
-- lib/bootdisk/engine.rb
-- lib/bootdisk/version.rb
+- db/seeds.d/50-bootdisk_templates.rb
 - lib/foreman_bootdisk.rb
+- lib/foreman_bootdisk/engine.rb
+- lib/foreman_bootdisk/version.rb
 - lib/tasks/bootdisk.rake
-- locale/Makefile
-- locale/bootdisk.pot
-- locale/en_GB/bootdisk.po
+- locale/de/foreman_bootdisk.po
+- locale/en/foreman_bootdisk.po
+- locale/en_GB/foreman_bootdisk.po
+- locale/es/foreman_bootdisk.po
+- locale/foreman_bootdisk.pot
+- locale/fr/foreman_bootdisk.po
+- locale/pt_BR/foreman_bootdisk.po
+- locale/sv_SE/foreman_bootdisk.po
 homepage: http://github.com/theforeman/foreman_bootdisk
 licenses:
 - GPL-3

data/app/models/concerns/bootdisk/config_template_ext.rb

@@ -1,42 +0,0 @@
-# Make templates supplied by the plugin read-only so they can be safely
-# replaced during DB migrations.
-module Bootdisk::ConfigTemplateExt
-  extend ActiveSupport::Concern
-
-  BOOTDISK_TMPLS = ['Boot disk iPXE - host', 'Boot disk iPXE - generic host']
-
-  included do
-    before_destroy :bootdisk_destroy?
-    validate :bootdisk_readonly
-  end
-
-  def bootdisk_destroy?
-    return true if ARGV.find { |a| a.start_with? "db:migrate" }
-    if BOOTDISK_TMPLS.include?(name)
-      bootdisk_add_error
-      false
-    else
-      true
-    end
-  end
-
-  def bootdisk_readonly
-    c = changes
-
-    # ignore CRLF changes
-    if c['template'] && (c['template'][0].nil? || c['template'][0].gsub("\n", "\r\n") == c['template'][1])
-      c.delete 'template'
-    end
-
-    # ignore nil to false changes
-    c.delete 'snippet' if c['snippet'] == [nil, false]
-
-    # allow the user to associate it, just not change the content
-    other_attrs = c.keys.find { |f| !['template_combinations', 'template_associations'].include? f }
-    bootdisk_add_error if BOOTDISK_TMPLS.include?(name_was) && other_attrs
-  end
-
-  def bootdisk_add_error
-    errors.add(:base, _("Template is read-only as it's supplied in foreman_bootdisk.  Please copy it to a new template to customize."))
-  end
-end

data/db/seeds.rb

@@ -1,24 +0,0 @@
-def format_errors(model = nil)
-  return '(nil found)' if model.nil?
-  model.errors.full_messages.join(';')
-end
-
-kind = TemplateKind.find_or_create_by_name('Bootdisk')
-
-ConfigTemplate.without_auditing do
-  content = File.read(File.join(Bootdisk::Engine.root, 'app', 'views', 'bootdisk', 'host.erb'))
-  ConfigTemplate.find_or_create_by_name(
-    :name => 'Boot disk iPXE - host',
-    :template_kind_id => kind.id,
-    :snippet => false,
-    :template => content
-  ).update_attribute(:template, content)
-
-  content = File.read(File.join(Bootdisk::Engine.root, 'app', 'views', 'bootdisk', 'generic_host.erb'))
-  ConfigTemplate.find_or_create_by_name(
-    :name => 'Boot disk iPXE - generic host',
-    :template_kind_id => kind.id,
-    :snippet => false,
-    :template => content
-  ).update_attribute(:template, content)
-end

data/lib/bootdisk/version.rb

@@ -1,3 +0,0 @@
-module Bootdisk
-  VERSION = '2.0.8'
-end

data/locale/Makefile

@@ -1,6 +0,0 @@
-#
-# Makefile for PO merging and MO generation. For more info see
-# locale/README in the Foreman Core.
-#
-include ../.foreman_app/locale/Makefile
-DOMAIN = bootdisk