foreman_salt 17.0.0 → 17.0.2

data/app/assets/javascripts/foreman_salt/locale/zh_CN/foreman_salt.js

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_salt": {
       "": {
-        "Project-Id-Version": "foreman_salt 1.0.0",
+        "Project-Id-Version": "foreman_salt 17.0.1",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2019-04-29 07:31+0000",
         "Last-Translator": "Bryan Kearney <bryan.kearney@gmail.com>, 2022",

data/app/models/foreman_salt/concerns/host_managed_extensions.rb

@@ -42,8 +42,8 @@ module ForemanSalt
 
         validate :salt_modules_in_host_environment
 
-        after_build :ensure_salt_autosign, if: ->(host) { host.salt_proxy }
-        before_destroy :remove_salt_minion, if: ->(host) { host.salt_proxy }
+        after_validation :queue_ensure_salt_autosign, if: ->(host) { host.salt_proxy }
+        before_destroy :queue_remove_salt_minion, if: ->(host) { host.salt_proxy }
       end
 
       def salt_params
@@ -107,10 +107,32 @@ module ForemanSalt
 
       private
 
+      def queue_ensure_salt_autosign
+        return unless new_record? || build_changed?
+
+        generate_salt_autosign_key
+        queue.create(id: "ensure_salt_autosign_#{id}", name: _('Configure Salt Autosign key for %s') % self,
+                     priority: 101, action: [self, :ensure_salt_autosign])
+      end
+
+      def queue_remove_salt_minion
+        queue.create(id: "queue_remove_salt_minion_#{id}", name: _('Remove Salt Minion for %s') % self,
+                     priority: 101, action: [self, :remove_salt_minion])
+      end
+
+      def generate_salt_autosign_key
+        if salt_autosign_key.nil?
+          Rails.logger.info("Generate salt autosign key for #{fqdn}")
+          self.salt_autosign_key = generate_provisioning_key
+        else
+          Rails.logger.info("Use existing salt autosign key for #{fqdn}")
+        end
+        self.salt_status = ForemanSalt::SaltStatus.minion_auth_waiting
+      end
+
       def ensure_salt_autosign
         remove_salt_key
-        remove_salt_autosign
-        create_salt_autosign
+        configure_salt_autosign
       end
 
       def remove_salt_minion
@@ -140,13 +162,11 @@ module ForemanSalt
         SecureRandom.hex(10)
       end
 
-      def create_salt_autosign
-        Rails.logger.info("Create salt autosign key for host #{fqdn}")
+      def configure_salt_autosign
+        Rails.logger.info("Configure salt autosign key for host #{fqdn} on #{salt_proxy.url}")
         api = ProxyAPI::Salt.new(url: salt_proxy.url)
-        key = generate_provisioning_key
+        key = salt_autosign_key
         api.autosign_create_key(key)
-        update(salt_autosign_key: key)
-        update(salt_status: ForemanSalt::SaltStatus.minion_auth_waiting)
       rescue Foreman::Exception => e
         Rails.logger.warn("Unable to create salt autosign for #{fqdn}: #{e}")
       end

data/lib/foreman_salt/version.rb

@@ -1,3 +1,3 @@
 module ForemanSalt
-  VERSION = '17.0.0'.freeze
+  VERSION = '17.0.2'.freeze
 end

data/locale/Makefile

@@ -31,9 +31,16 @@ all-mo: $(MOFILES)
 	cat $@
 	! grep -q msgid $@
 
-%.edit.po:
+%.edit.po: %.po.time_stamp
 	touch $@
 
+# gettext will trash the .edit.po file if the time stamp doesn't exist or is older than the po file
+%.po.time_stamp: %.po
+	touch --reference $< $@
+
+# Prevent make from treating this as an intermediate file to be cleaned up
+.PRECIOUS: %.po.time_stamp
+
 check: $(POXFILES)
 
 # Unify duplicate translations
@@ -43,7 +50,10 @@ uniq-po:
 	done
 
 tx-pull: $(EDITFILES)
-	cd .. && tx pull -f --all
+	# Initialize new languages
+	cd .. && tx pull -f --all --minimum-perc 50
+	# Force update all existing languages
+	cd .. && tx pull -f --minimum-perc 0
 	for f in $(EDITFILES) ; do \
 		sed -i 's/^\("Project-Id-Version: \).*$$/\1$(DOMAIN) $(VERSION)\\n"/' $$f; \
 	done

data/locale/de/foreman_salt.po

@@ -6,27 +6,27 @@
 # Translators:
 # Lukáš Zapletal, 2019
 # abf90805572190d649c59f7a021d76cb, 2019
-# Michael Moll, 2019
 # Hannes Schaller <admin@cyberkov.at>, 2019
-# Ulrich Habel <rhaen@pkgbox.de>, 2019
+# 47388d0d0847859fcc07f8955b27d2a7_d1cb104 <93875580def0fcc1a566b016c3948752_122921>, 2019
 # Arnold Bechtoldt <mail@arnoldbechtoldt.com>, 2019
-# Ettore Atalan <atalanttore@googlemail.com>, 2019
 # 0868a4d1af5275b3f70b0a6dac4c99a4, 2019
 # Wiederoder <stefanwiederoder@googlemail.com>, 2019
 # Bryan Kearney <bryan.kearney@gmail.com>, 2019
-# simon11 <simon.stieger.98@live.de>, 2019
-# Christina Gurski <Gurski_christina@yahoo.de>, 2019
-# Martin Zimmermann <martin.zimmermann@gmx.com>, 2019
+# simon11 <transifex@stieger.co>, 2019
 # Crited <Alexander.Stoll@netways.de>, 2019
 # Bernhard Suttner <bernhard.suttner@atix.de>, 2019
+# Martin Zimmermann <martin.zimmermann@gmx.com>, 2022
+# Christina Gurski <Gurski_christina@yahoo.de>, 2022
+# Ettore Atalan <atalanttore@googlemail.com>, 2023
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_salt 13.2.0\n"
+"Project-Id-Version: foreman_salt 17.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2019-04-29 07:31+0000\n"
-"Last-Translator: Bernhard Suttner <bernhard.suttner@atix.de>, 2019\n"
-"Language-Team: German (https://www.transifex.com/foreman/teams/114/de/)\n"
+"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>, 2023\n"
+"Language-Team: German (https://app.transifex.com/foreman/teams/114/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -91,7 +91,7 @@ msgid "Check/Uncheck Removed"
 msgstr "Gelöschte auswählen/abwählen"
 
 msgid "Config Management"
-msgstr ""
+msgstr "Konfigurationsmanagement"
 
 msgid "Continue to look for matches after first find (only array/hash type)? Note: merging overrides ignores all matchers that are omitted."
 msgstr "Nach dem ersten Treffer nach weiterhin nach Treffern suchen (nur Array-/Hash-Typ)? Hinweis: Das Zusammenlegen von Überschreibungen ignoriert alle Prüfwerte, die weggelassen werden."
@@ -196,7 +196,7 @@ msgid "ID of Salt Proxy"
 msgstr "ID des Salt Proxy"
 
 msgid "ID of host group"
-msgstr ""
+msgstr "Kennung der Hostgruppe"
 
 msgid "If checked, will raise an error if there is no default value and no matcher provide a value."
 msgstr "Falls aktiviert, wird dies einen Fehler erzeugen, wenn kein Standardwert vorhanden ist und kein Treffer einen Wert vorschlägt."
@@ -508,7 +508,7 @@ msgid "Unable to fetch autosign list"
 msgstr "Autosign Liste konnten nicht abgerufen werden"
 
 msgid "Unable to generate output, Check log files"
-msgstr "Kann keine Ausgabe erzeugen, Bitte Logdateien prüfen"
+msgstr "Kann keine Ausgabe erzeugen. Bitte Logdateien prüfen"
 
 msgid "Unable to reject Salt key for %s"
 msgstr "Salt Schlüssel für %s konnte nicht zurückgewiesen werden"
@@ -541,7 +541,7 @@ msgid "Updates Salt variable"
 msgstr "Salt Variable aktualisieren"
 
 msgid "Upload a Job"
-msgstr "Hochladen eines Jobs"
+msgstr "Hochladen eines Auftrags"
 
 msgid "Used to enforce certain values for the parameter values"
 msgstr "Verwendet, um bestimmte Werte für die Parameterwerte umzusetzen"