foreman_theme_satellite 13.2.4 → 13.3.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: f66bba8ab1dd2fb6b4921e0eab54ad2af6bda58e7124cbf90be061219687a386
4
- data.tar.gz: 8acdbc5bda40bf9c06749787907a6a774fb518f233a8056f3efa61eb63b1e58b
3
+ metadata.gz: 4fc8386e72cfe1a8766ca9304a0449cfd93c76d5d8bdd0082014a07991a8d3bf
4
+ data.tar.gz: 10f45792b87bd24f807f3f6f6b1623f099bf9754110ecd4968d8173b8c9ffd46
5
5
  SHA512:
6
- metadata.gz: 6dd054bcb047b7d26c4eba0b4af7fa67b23a14874e5be52d11f65a854f45e5ea41201db5a53ab0f73e6a4860fced38651efeba8138900047fc7005d37f5fdb7e
7
- data.tar.gz: b55b32da9b7cce4acd8b4cc25016d1c67f72faaff0487a8c91c824f3942b40fbe961498097299ce48818eba5a44fcfa04fcd4d053eabf1f635ea4f69a769a8ee
6
+ metadata.gz: aa87b9bbef7680664f1c215ac516c619e82ddf928536fa1a6270d1032e5182ef7b114f67ff29404679c45acc23571c40b2cad19a9ac3fc4f6abe71c93acf8b86
7
+ data.tar.gz: b25163c80960e12eaa33e008f0ba06ae9632c10ba0d050c36c60b524b5d38776b2dd74476cf41c9ff19b166a3887127fbed2d78523019139bf3526895ecaf8f8
data/README.md CHANGED
@@ -303,7 +303,7 @@ Deface::Override.new(:virtual_path => "about/index",
303
303
  :text => " <div class=\"stats-well\"><h4><%= _(\"Support\") %></h4> <p>Visit the <%= link_to _('Customer Portal'), \"https://access.redhat.com/\",
304
304
  :rel => \"external\" %> to get support, find solutions to common questions, and more.</p><h6><%= _(\"Documentation\") %></h6>
305
305
  <ul>
306
- <li><%= link_to _('Complete Product Documentation for Red Hat Satellite'),\"https://access.redhat.com/documentation/en/red_hat_satellite/#{ForemanThemeSatellite::SATELLITE_SHORT_VERSION}\", :rel => \"external\" %></li>
306
+ <li><%= link_to _('Complete Product Documentation for Red Hat Satellite'),\"#{ForemanThemeSatellite.documentation_server}/documentation/en/red_hat_satellite/#{ForemanThemeSatellite::SATELLITE_SHORT_VERSION}\", :rel => \"external\" %></li>
307
307
  <li><%= link_to _('API Resources'), apipie_apipie_path, :title => _('Automate Satellite via a simple and powerful API') %></li>
308
308
  </ul>
309
309
  <h6><%= _(\"Blog\") %></h6>
@@ -17,29 +17,23 @@
17
17
  "domain": "foreman_theme_satellite",
18
18
  "plural_forms": "nplurals=2; plural=(n!=1);"
19
19
  },
20
- "(build: %{version})": [
21
- "(აგება: %{version})"
22
- ],
23
- "API Guide": [
24
- "API-ის გიდი"
25
- ],
26
- "Administering Red Hat Satellite": [
27
- "Red Hat Satellite-ის ადმინისტრირება"
20
+ "Supported by Red Hat": [
21
+ "მხარდაჭერილია Red Hat-ის მიერ"
28
22
  ],
29
- "Blog": [
30
- "ბლოგი"
23
+ "RHEV integration is deprecated.": [
24
+ "RHEV-ის ჩაშენება მოძველებულია."
31
25
  ],
32
- "Customer portal": [
33
- "მომხმარებლის პორტალი"
26
+ "On August 31, 2022, Red Hat Virtualization entered the Maintenance Support Phase. The Maintenance Support Phase runs until August 31, 2024, followed by the Extended Life Phase, which runs until August 31, 2026.": [
27
+ "2022 წლის 31 აგვისტოს RHEV რემონტის მხარდაჭერის ფაზაზე გადავიდა. ის 2024 წლის 31 აგვისტომდე გაგრძელდება, რომელიც გაფართოებული სიცოცხლის ფაზით გაგრძელდება, 2026 წლის 31 აგვისტომდე."
34
28
  ],
35
- "Documentation": [
36
- "დოკუმენტაცია"
29
+ "More information": [
30
+ "მეტი ინფორმაცია"
37
31
  ],
38
- "Environment only": [
39
- "მხოლოდ გარემო"
32
+ "When editing a Template, you must assign a list of Operating Systems with which this Template can be used. Optionally, you can restrict a template to a list of Hostgroups or Environments.": [
33
+ "შაბლონის რედაქტირებისას თქვენ უნდა მიანიჭოთ სია ოპერაციული სისტემებისა, რომლებთანაც შესაძლებელია ამ შაბლონის გამოყენება. სურვილისამებრ, შეგიძლიათ, შაბლონი ჰოსტების ჯგუფების სიით ან/და გარემოებით შეზღუდოთ."
40
34
  ],
41
- "Full trace": [
42
- "სრული ტრეისი"
35
+ "When a Host requests a template (e.g. during provisioning), Foreman selects the optimal match from the available templates of that type, in the following order:": [
36
+ "როდესაც ჰოსტი მოითხოვს შაბლონს (მაგ. სამუშაოდ მომზადების დროს), Foreman საუკეთესო შესატყვისს ამ ტიპის არსებული შაბლონებიდან შემდეგი თანამიმდევრობით შეარჩევს:"
43
37
  ],
44
38
  "Host group and Environment": [
45
39
  "ჰოსტების ჯგუფი და გარემო"
@@ -47,77 +41,83 @@
47
41
  "Host group only": [
48
42
  "მხოლოდ ჰოსტების ჯგუფი"
49
43
  ],
50
- "IRC": [
51
- "IRC"
52
- ],
53
- "If you feel this is an error with Satellite 6 itself, please open a new issue with": [
54
- "თუ გგონიათ, რომ ეს შეცდომა Satellite 6-ის შეცდომაა, გახსენით ახალი ბილეთი"
55
- ],
56
- "Includes %{system} © 2009-%{year} Paul Kelly and Ohad Levy": [
57
- "შეიცავს %{system} © 2009-%{year} პოლ კელი და ოჰედ ლევი"
58
- ],
59
- "More information": [
60
- "მეტი ინფორმაცია"
61
- ],
62
- "On August 31, 2022, Red Hat Virtualization entered the Maintenance Support Phase. The Maintenance Support Phase runs until August 31, 2024, followed by the Extended Life Phase, which runs until August 31, 2026.": [
63
- "2022 წლის 31 აგვისტოს RHEV რემონტის მხარდაჭერის ფაზაზე გადავიდა. ის 2024 წლის 31 აგვისტომდე გაგრძელდება, რომელიც გაფართოებული სიცოცხლის ფაზით გაგრძელდება, 2026 წლის 31 აგვისტომდე."
64
- ],
65
- "Operating System": [
66
- "ოპერაციული სისტემა"
44
+ "Environment only": [
45
+ "მხოლოდ გარემო"
67
46
  ],
68
47
  "Operating system default": [
69
48
  "ოპერაციული სისტემის ნაგულისხმები მნიშვნელობა"
70
49
  ],
71
- "RHEV integration is deprecated.": [
72
- "RHEV-ის ჩაშენება მოძველებულია."
73
- ],
74
- "Red Hat Satellite Blog": [
75
- "Red Hat Satellite-ის ბლოგი"
76
- ],
77
- "Satellite ticketing system": [
78
- "Satellite-ის ბილეთებს სისტემა"
50
+ "The final entry, Operating System default, can be set by editing the %s page.": [
51
+ "საბოლოო ჩანაწერი, ოპერაციული სისტემის ნაგულისხმები, შეიძლება დაყენდეს %s გვერდის რედაქტირებით."
79
52
  ],
80
- "Show unsupported provisioning templates": [
81
- "მხარდაუჭერელი გაშლის ნიმუშების ჩვენება"
53
+ "Operating System": [
54
+ "ოპერაციული სისტემა"
82
55
  ],
83
- "Show unsupported provisioning templates. When enabled, all the avaiable templates will be shown. When disabled, Red Hat supported templates will be shown only": [
84
- "მხარდაუჭერელი გაშლის ნიმუშების ჩვენება. როცა ჩართულია, ნაჩვენები იქნება ყველა ხელმისაწვდომი ნიმუში. როცა გამორთულია, ნაჩვენები იქნება, მხოლოდ, Red Hat-ის მიერ მხარდაჭერილი ნმუშები"
56
+ "Version %{version}": [
57
+ "ვერსია %{version}"
85
58
  ],
86
59
  "Support": [
87
60
  "მხარდაჭერა"
88
61
  ],
89
- "Supported by Red Hat": [
90
- "მხარდაჭერილია Red Hat-ის მიერ"
62
+ "Customer portal": [
63
+ "მომხმარებლის პორტალი"
91
64
  ],
92
- "The final entry, Operating System default, can be set by editing the %s page.": [
93
- "საბოლოო ჩანაწერი, ოპერაციული სისტემის ნაგულისხმები, შეიძლება დაყენდეს %s გვერდის რედაქტირებით."
65
+ "Documentation": [
66
+ "დოკუმენტაცია"
94
67
  ],
95
- "Theme changes for Satellite 6.": [
96
- "თემის ცვლილებები Satellite 6-სთვის."
68
+ "Administering Red Hat Satellite": [
69
+ "Red Hat Satellite-ის ადმინისტრირება"
97
70
  ],
98
71
  "Transitioning from Red Hat Satellite 5 to Red Hat Satellite 6": [
99
72
  "გადასვლა Red Hat Satellite 5-დან to Red Hat Satellite 6-ზე"
100
73
  ],
101
- "Version %{version}": [
102
- "ვერსია %{version}"
74
+ "API Guide": [
75
+ "API-ის გიდი"
103
76
  ],
104
- "Version %{version} © %{year} Red Hat Inc.": [
105
- "ვერსია %{version} © %{year} Red Hat Inc."
77
+ "Blog": [
78
+ "ბლოგი"
106
79
  ],
107
- "When a Host requests a template (e.g. during provisioning), Foreman selects the optimal match from the available templates of that type, in the following order:": [
108
- "როდესაც ჰოსტი მოითხოვს შაბლონს (მაგ. სამუშაოდ მომზადების დროს), Foreman საუკეთესო შესატყვისს ამ ტიპის არსებული შაბლონებიდან შემდეგი თანამიმდევრობით შეარჩევს:"
80
+ "Red Hat Satellite Blog": [
81
+ "Red Hat Satellite-ის ბლოგი"
109
82
  ],
110
- "When editing a Template, you must assign a list of Operating Systems with which this Template can be used. Optionally, you can restrict a template to a list of Hostgroups or Environments.": [
111
- "შაბლონის რედაქტირებისას თქვენ უნდა მიანიჭოთ სია ოპერაციული სისტემებისა, რომლებთანაც შესაძლებელია ამ შაბლონის გამოყენება. სურვილისამებრ, შეგიძლიათ, შაბლონი ჰოსტების ჯგუფების სიით ან/და გარემოებით შეზღუდოთ."
83
+ "IRC": [
84
+ "IRC"
112
85
  ],
113
86
  "You can find us on %{liberachat} (irc.libera.chat) in #redhat-satellite.": [
114
87
  "%{liberachat}-ზე (irc.libera.chat) ჩვენი პოვნა #redhat-satellite არხზე შეგიძლიათ."
115
88
  ],
89
+ "Version %{version} © %{year} Red Hat Inc.": [
90
+ "ვერსია %{version} © %{year} Red Hat Inc."
91
+ ],
92
+ "Includes %{system} © 2009-%{year} Paul Kelly and Ohad Levy": [
93
+ "შეიცავს %{system} © 2009-%{year} პოლ კელი და ოჰედ ლევი"
94
+ ],
95
+ "If you feel this is an error with Satellite 6 itself, please open a new issue with": [
96
+ "თუ გგონიათ, რომ ეს შეცდომა Satellite 6-ის შეცდომაა, გახსენით ახალი ბილეთი"
97
+ ],
98
+ "Satellite ticketing system": [
99
+ "Satellite-ის ბილეთებს სისტემა"
100
+ ],
116
101
  "You would probably need to attach the": [
117
102
  "ალბათ, დაგჭირდებათ მიამაგროთ"
118
103
  ],
104
+ "Full trace": [
105
+ "სრული ტრეისი"
106
+ ],
119
107
  "and relevant log entries.": [
120
108
  "და შესაბამისი ჟურნალის ჩანაწერები."
109
+ ],
110
+ "(build: %{version})": [
111
+ "(აგება: %{version})"
112
+ ],
113
+ "Show unsupported provisioning templates. When enabled, all the avaiable templates will be shown. When disabled, Red Hat supported templates will be shown only": [
114
+ "მხარდაუჭერელი გაშლის ნიმუშების ჩვენება. როცა ჩართულია, ნაჩვენები იქნება ყველა ხელმისაწვდომი ნიმუში. როცა გამორთულია, ნაჩვენები იქნება, მხოლოდ, Red Hat-ის მიერ მხარდაჭერილი ნმუშები"
115
+ ],
116
+ "Show unsupported provisioning templates": [
117
+ "მხარდაუჭერელი გაშლის ნიმუშების ჩვენება"
118
+ ],
119
+ "Theme changes for Satellite 6.": [
120
+ "თემის ცვლილებები Satellite 6-სთვის."
121
121
  ]
122
122
  }
123
123
  }
@@ -12,13 +12,11 @@ module DocumentationControllerBranding
12
12
  end
13
13
  if url.empty?
14
14
  upstream_url = super(section, options)
15
- if (upstream_url =~ /redhat.com/)
16
- url = upstream_url
17
- else
18
- special_links_pair = ForemanThemeSatellite::Documentation::SPECIAL_LINKS.find { |regex, _val| regex.match(upstream_url) }
19
- url = special_links_pair[1] if special_links_pair
20
- url = "#{ForemanThemeSatellite.documentation_root}/administering_red_hat_satellite" if url.empty?
21
- end
15
+ url = if (upstream_url =~ /redhat.com/)
16
+ upstream_url
17
+ else
18
+ "#{ForemanThemeSatellite.documentation_root}/administering_red_hat_satellite"
19
+ end
22
20
  end
23
21
  url
24
22
  end
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- # rubocop:disable Metrics/LineLength
3
+ # rubocop:disable Layout/LineLength
4
4
  # Overrides for functions used in helpers.
5
5
  module ThemeApplicationHelper
6
6
  def association_text()
@@ -37,7 +37,7 @@ Deface::Override.new(:virtual_path => "about/index",
37
37
  :text => " <div class=\"stats-well\"><h4><%= _(\"Support\") %></h4> <p>Visit the <%= link_to _('Customer Portal'), \"https://access.redhat.com/\",
38
38
  :rel => \"external\" %> to get support, find solutions to common questions, and more.</p><h6><%= _(\"Documentation\") %></h6>
39
39
  <ul>
40
- <li><%= link_to _('Complete Product Documentation for Red Hat Satellite'),\"https://access.redhat.com/documentation/en/red_hat_satellite/#{ForemanThemeSatellite::SATELLITE_SHORT_VERSION}\", :rel => \"external\" %></li>
40
+ <li><%= link_to _('Complete Product Documentation for Red Hat Satellite'),\"#{ForemanThemeSatellite.documentation_server}/documentation/en/red_hat_satellite/#{ForemanThemeSatellite::SATELLITE_SHORT_VERSION}\", :rel => \"external\" %></li>
41
41
  <li><%= link_to _('API Resources'), apipie_apipie_path, :title => _('Automate Satellite via a simple and powerful API') %></li>
42
42
  <li><%= link_to _('Templates DSL'), apipie_dsl_apipie_dsl_path, :title => _('Get DSL reference for templates writing') %></li>
43
43
  </ul>
@@ -1,3 +1,5 @@
1
+ # rubocop:disable Rails/SkipsModelValidations
2
+
1
3
  require_relative '../../lib/foreman_theme_satellite/deprecated_templates'
2
4
 
3
5
  class DeprecateSatelliteTemplates < ActiveRecord::Migration[5.1]
@@ -50,3 +52,5 @@ class DeprecateSatelliteTemplates < ActiveRecord::Migration[5.1]
50
52
  destination.operatingsystem_ids = (destination.operatingsystem_ids + source.operatingsystem_ids).uniq
51
53
  end
52
54
  end
55
+
56
+ # rubocop:enable Rails/SkipsModelValidations
@@ -10,6 +10,8 @@ module ForemanThemeSatellite
10
10
  FOREMAN_BRAND = {
11
11
  /%{proxy}/ => '%{proxy}',
12
12
  /%{foreman}/ => '%{foreman}',
13
+ /\b[Pp]roxy [Hh][Tt][Tt][Pp]\b(?!-)/ => 'Proxy HTTP', # Workaround for French translation
14
+ /\b[Pp]roxies [Hh][Tt][Tt][Pp]\b(?!-)/ => 'Proxies HTTP', # Workaround for French translation
13
15
  /\b[Hh][Tt][Tt][Pp] [Pp]roxy\b(?!-)/ => 'HTTP Proxy',
14
16
  /\b[Hh][Tt][Tt][Pp] [Pp]roxies\b(?!-)/ => 'HTTP Proxies',
15
17
  /\bHTTP\(S\) proxy\b(?!-)/ => 'HTTP(S) proxy',
@@ -53,6 +55,5 @@ module ForemanThemeSatellite
53
55
  /\b[Kk]atello 4.11\b(?!-)/ => 'Satellite 6.15',
54
56
  /\b[Kk]atello 4.12\b(?!-)/ => 'Satellite 6.16',
55
57
  /\b[Kk]atello 4.13\b(?!-)/ => 'Satellite 6.16',
56
- %r{https://theforeman.org/plugins/katello/(?!-)} => "https://access.redhat.com/documentation/en-us/red_hat_satellite/#{ForemanThemeSatellite::SATELLITE_SHORT_VERSION}/html/managing_hosts/registering_hosts#registering-a-host-to-satellite-using-the-bootstrap-script"
57
58
  }.freeze
58
59
  end
@@ -1,16 +1,12 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- # rubocop:disable Metrics/LineLength
3
+ # rubocop:disable Layout/LineLength
4
4
  module ForemanThemeSatellite
5
5
  module Documentation
6
6
  USER_GUIDE_DICTIONARY = {
7
- # Ansible
8
- 'ImportingRoles' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_using_ansible_integration_in_red_hat_satellite/getting_started_with_ansible_in_satellite_ansible#Importing_Ansible_Roles_and_Variables_ansible",
9
- 'Variables' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_using_ansible_integration_in_red_hat_satellite/getting_started_with_ansible_in_satellite_ansible#Overriding_Ansible_Variables_in_satellite_ansible",
10
-
11
7
  # Managing Hosts
12
8
  'ForemanRemoteExecution' => "#{ForemanThemeSatellite.documentation_root}/managing_hosts/configuring_and_setting_up_remote_jobs_managing-hosts",
13
- 'ExecutingaJob' => "#{ForemanThemeSatellite.documentation_root}/managing_hosts/configuring_and_setting_up_remote_jobs_managing-hosts#configuring-the-global-smartproxy-remote-execution-setting_managing-hosts",
9
+ 'ExecutingaJob' => "#{ForemanThemeSatellite.documentation_root}/managing_hosts/configuring_and_setting_up_remote_jobs_managing-hosts#Configuring_the_Global_capsule_Remote_Execution_Setting_in_satellite_managing-hosts",
14
10
  'JobTemplates' => "#{ForemanThemeSatellite.documentation_root}/managing_hosts/configuring_and_setting_up_remote_jobs_managing-hosts#setting-up-job-templates_managing-hosts",
15
11
  'ReportTemplates' => "#{ForemanThemeSatellite.documentation_root}/managing_hosts/using_report_templates_to_monitor_hosts_managing-hosts",
16
12
  'Reports' => "#{ForemanThemeSatellite.documentation_root}/managing_hosts/using_report_templates_to_monitor_hosts_managing-hosts",
@@ -34,18 +30,18 @@ module ForemanThemeSatellite
34
30
  'Networking' => "#{ForemanThemeSatellite.documentation_root}/provisioning_hosts/configuring_networking_provisioning#Adding_a_Subnet_to_Server_provisioning",
35
31
 
36
32
  # Puppet Guide
37
- 'FactsandtheENC' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_using_puppet_integration_in_red_hat_satellite/introducing-configuration-management-using-puppet_managing-configurations-puppet#performing-configuration-management_managing-configurations-puppet",
38
- 'using-config-groups' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_using_puppet_integration_in_red_hat_satellite/creating-a-puppet-config-group_managing-configurations-puppet",
39
- 'SmartMatchers' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_using_puppet_integration_in_red_hat_satellite/configuring_puppet_smart_class_parameters_managing-configurations-puppet",
40
- 'Parameters' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_using_puppet_integration_in_red_hat_satellite/configuring_puppet_smart_class_parameters_managing-configurations-puppet",
41
- 'Classes' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_using_puppet_integration_in_red_hat_satellite/importing_puppet_classes_and_environments_managing-configurations-puppet",
42
- 'Environments' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_using_puppet_integration_in_red_hat_satellite/creating_a_custom_puppet_environment_managing-configurations-puppet",
33
+ 'FactsandtheENC' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_using_puppet_integration/introducing-configuration-management-using-puppet_managing-configurations-puppet#performing-configuration-management_managing-configurations-puppet",
34
+ 'using-config-groups' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_using_puppet_integration/creating-a-puppet-config-group_managing-configurations-puppet",
35
+ 'SmartMatchers' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_using_puppet_integration/configuring_puppet_smart_class_parameters_managing-configurations-puppet",
36
+ 'Parameters' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_using_puppet_integration/configuring_puppet_smart_class_parameters_managing-configurations-puppet",
37
+ 'Classes' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_using_puppet_integration/importing_puppet_classes_and_environments_managing-configurations-puppet",
38
+ 'Environments' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_using_puppet_integration/creating_a_custom_puppet_environment_managing-configurations-puppet",
43
39
 
44
40
  # Administering
45
41
  'ConfigurationOptions' => "#{ForemanThemeSatellite.documentation_root}/administering_red_hat_satellite/",
46
42
  'PuppetReports' => "#{ForemanThemeSatellite.documentation_root}/administering_red_hat_satellite/monitoring_resources_admin#Using_the_Project_Content_Dashboard_admin",
47
43
  'Mail_Notifications' => "#{ForemanThemeSatellite.documentation_root}/administering_red_hat_satellite/configuring_email_notifications_admin",
48
- 'Realm' => "#{ForemanThemeSatellite.documentation_root}/installing_satellite_server_in_a_connected_network_environment/configuring_external_authentication_satellite#External_Authentication_for_Provisioned_Hosts_satellite",
44
+ 'Realm' => "#{ForemanThemeSatellite.documentation_root}/installing_satellite_server_in_a_connected_network_environment/configuring_external_authentication_satellite#configuring-project-to-manage-the-lifecycle-of-a-host-registered-to-a-freeipa-realm_satellite",
49
45
  'Searching' => "#{ForemanThemeSatellite.documentation_root}/administering_red_hat_satellite/searching_and_bookmarking_admin",
50
46
  'RolesandPermissions' => "#{ForemanThemeSatellite.documentation_root}/administering_red_hat_satellite/managing_users_and_roles_admin",
51
47
  'LDAPAuthentication' => "#{ForemanThemeSatellite.documentation_root}/installing_satellite_server_in_a_connected_network_environment/configuring_external_authentication_satellite#Using_LDAP_satellite",
@@ -55,36 +51,56 @@ module ForemanThemeSatellite
55
51
  'CreatingSCAPcontent' => "#{ForemanThemeSatellite.documentation_root}/managing_security_compliance/configuring_scap_contents_security-compliance",
56
52
 
57
53
  # Planning
58
- 'SmartProxies' => "#{ForemanThemeSatellite.documentation_root}/satellite_overview_concepts_and_deployment_considerations/chap-documentation-architecture_guide-capsule_server_overview",
59
- 'Auditing' => "#{ForemanThemeSatellite.documentation_root}/satellite_overview_concepts_and_deployment_considerations/appe-architecture_guide-glossary_of_terms#varl-Glossary_of_Terms-Audits",
54
+ 'SmartProxies' => "#{ForemanThemeSatellite.documentation_root}/overview_concepts_and_deployment_considerations/major-satellite-components_planning#Capsule-Overview_planning",
55
+ 'Auditing' => "#{ForemanThemeSatellite.documentation_root}/overview_concepts_and_deployment_considerations/glossary-of-terms-used-in-satellite_planning#Audits",
60
56
 
61
57
  # Install
62
- 'HTTP(S)Proxy' => "#{ForemanThemeSatellite.documentation_root}//installing_satellite_server_in_a_connected_network_environment/performing-additional-configuration#Configuring_Server_with_an_HTTP_Proxy_satellite",
58
+ 'HTTP(S)Proxy' => "#{ForemanThemeSatellite.documentation_root}/installing_satellite_server_in_a_connected_network_environment/performing-additional-configuration-on-server_satellite#Configuring_Server_with_an_HTTP_Proxy_satellite",
63
59
 
64
60
  # Misc
65
61
  'GettingHelp' => "https://access.redhat.com/products/red-hat-satellite/#support",
66
62
 
67
63
  # Managing Security Compliance
68
- 'Monitoring_Compliance_security-compliance' => "#{ForemanThemeSatellite.documentation_root}/managing_security_compliance/Monitoring_Compliance_security-compliance",
69
- 'Managing_Compliance_Policies_security-compliance' => "#{ForemanThemeSatellite.documentation_root}/managing_security_compliance/Managing_Compliance_Policies_security-compliance",
70
- 'Configuring_SCAP_Contents_security-compliance' => "#{ForemanThemeSatellite.documentation_root}/managing_security_compliance/Configuring_SCAP_Contents_security-compliance",
71
- 'tailoring-xccdf-profiles_security-compliance' => "#{ForemanThemeSatellite.documentation_root}/managing_security_compliance/Configuring_SCAP_Contents_security-compliance#tailoring-xccdf-profiles_security-compliance",
72
- 'deploying-compliance-policies_security-compliance' => "#{ForemanThemeSatellite.documentation_root}/managing_security_compliance/compliance-policy-deployment-options_security-compliance",
64
+ 'Monitoring_Compliance_security-compliance' => "#{ForemanThemeSatellite.documentation_root}/managing_security_compliance/monitoring_compliance_security-compliance",
65
+ 'Managing_Compliance_Policies_security-compliance' => "#{ForemanThemeSatellite.documentation_root}/managing_security_compliance/managing_compliance_policies_security-compliance",
66
+ 'Configuring_SCAP_Contents_security-compliance' => "#{ForemanThemeSatellite.documentation_root}/managing_security_compliance/configuring_scap_contents_security-compliance",
67
+ 'tailoring-xccdf-profiles_security-compliance' => "#{ForemanThemeSatellite.documentation_root}/managing_security_compliance/configuring_scap_contents_security-compliance#tailoring-xccdf-profiles_security-compliance",
68
+ 'deploying-compliance-policies_security-compliance' => "#{ForemanThemeSatellite.documentation_root}/managing_security_compliance/deploying-compliance-policies_security-compliance",
73
69
  }.freeze
74
70
 
75
71
  PLUGINS_DOCUMENTATION = {
76
72
  'foreman_azure' => "#{ForemanThemeSatellite.documentation_root}/provisioning_hosts/provisioning_cloud_instances_on_microsoft_azure_resource_manager_azure-provisioning",
77
- 'foreman_discovery' => "#{ForemanThemeSatellite.documentation_root}/provisioning_hosts/configuring_the_discovery_service_provisioning",
73
+ 'foreman_discovery' => "#{ForemanThemeSatellite.documentation_root}/provisioning_hosts/discovering-hosts-on-a-network_provisioning",
78
74
  }.freeze
79
75
 
80
- SPECIAL_LINKS = [
81
- [/docs\.theforeman\.org\/.*?\/Managing_Hosts\/.*?registering-a-host.*?managing-hosts/i, "#{ForemanThemeSatellite.documentation_root}/managing_hosts/registering_hosts_to_server_managing-hosts#Registering_Hosts_managing-hosts"],
82
- ]
83
-
84
76
  DOCS_GUIDES_LINKS = {
77
+ 'Managing_Content' => {
78
+ 'Products_and_Repositories_content-management' => "#{ForemanThemeSatellite.documentation_root}/managing_content/importing_content_content-management#Products_and_Repositories_content-management",
79
+ },
85
80
  'Managing_Hosts' => {
86
- 'registering-a-host_managing-hosts' => "#{ForemanThemeSatellite.documentation_root}/managing_hosts/registering_hosts_to_server_managing-hosts#Registering_Hosts_managing-hosts",
81
+ 'registering-a-host_managing-hosts' => "#{ForemanThemeSatellite.documentation_root}/managing_hosts/registering_hosts_to_server_managing-hosts#Registering_Hosts_by_Using_Global_Registration_managing-hosts",
82
+ },
83
+ 'Managing_Configurations_Ansible' => {
84
+ 'Importing_Ansible_Roles_and_Variables_ansible' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_using_ansible_integration/getting_started_with_ansible_in_satellite_ansible#Importing_Ansible_Roles_and_Variables_ansible",
85
+ 'Overriding_Ansible_Variables_in_foreman_ansible' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_using_ansible_integration/getting_started_with_ansible_in_satellite_ansible#Overriding_Ansible_Variables_in_satellite_ansible",
87
86
  }
88
87
  }.freeze
88
+
89
+ def self.flat_docs_guides_links
90
+ nested_to_flat_k_v(nil, DOCS_GUIDES_LINKS).to_h
91
+ end
92
+
93
+ private_class_method def self.nested_to_flat_k_v(prefix, source)
94
+ key_values = []
95
+ source.map do |k, v|
96
+ key = "#{prefix}/#{k}"
97
+ if v.is_a?(Hash)
98
+ key_values.concat(nested_to_flat_k_v(key, v))
99
+ else
100
+ key_values.concat([[key, v]])
101
+ end
102
+ end
103
+ key_values
104
+ end
89
105
  end
90
106
  end
@@ -131,7 +131,7 @@ module ForemanThemeSatellite
131
131
  end
132
132
 
133
133
  def self.get_satellite_version
134
- metadata_field('version', '6.14.0-development')
134
+ metadata_field('version', '6.15.0-development')
135
135
  end
136
136
 
137
137
  def self.get_satellite_short_version
@@ -139,7 +139,7 @@ module ForemanThemeSatellite
139
139
  end
140
140
 
141
141
  def self.documentation_server
142
- @documentation_server ||= metadata_field('documentation_server', 'https://access.redhat.com')
142
+ @documentation_server ||= metadata_field('documentation_server', 'https://docs.redhat.com')
143
143
  end
144
144
 
145
145
  def self.documentation_version
@@ -1,3 +1,3 @@
1
1
  module ForemanThemeSatellite
2
- VERSION = '13.2.4'.freeze
2
+ VERSION = '13.3.0'.freeze
3
3
  end
@@ -1,15 +1,5 @@
1
1
  require 'rake/testtask'
2
2
 
3
- # Tasks
4
- namespace :foreman_theme_satellite do
5
- namespace :example do
6
- desc 'Example Task'
7
- task task: :environment do
8
- # Task goes here
9
- end
10
- end
11
- end
12
-
13
3
  # Tests
14
4
  namespace :test do
15
5
  desc 'Test ForemanThemeSatellite'
@@ -24,25 +14,30 @@ namespace :test do
24
14
  end
25
15
 
26
16
  namespace :foreman_theme_satellite do
27
- task :rubocop do
28
- begin
29
- require 'rubocop/rake_task'
30
- RuboCop::RakeTask.new(:rubocop_foreman_theme_satellite) do |task|
31
- task.patterns = ["#{ForemanThemeSatellite::Engine.root}/app/**/*.rb",
32
- "#{ForemanThemeSatellite::Engine.root}/lib/**/*.rb",
33
- "#{ForemanThemeSatellite::Engine.root}/test/**/*.rb"]
34
- end
35
- rescue
36
- puts 'Rubocop not loaded.'
17
+ desc 'Validate documentation links against given TOC file'
18
+ task :validate_docs do
19
+ toc_file = ENV['TOC']
20
+ unless toc_file
21
+ toc_file = File.expand_path('../../test/fixtures/toc.json', __dir__)
22
+ puts "Using default TOC: #{toc_file}, to override please specify TOC=<toc_file>"
37
23
  end
38
24
 
39
- Rake::Task['rubocop_foreman_theme_satellite'].invoke
25
+ require_relative '../../test/link_checker'
26
+ checker = LinksChecker.new(toc: toc_file)
27
+
28
+ require_relative '../foreman_theme_satellite/documentation'
29
+
30
+ all_links = ForemanThemeSatellite::Documentation::USER_GUIDE_DICTIONARY
31
+ .merge(ForemanThemeSatellite::Documentation::PLUGINS_DOCUMENTATION)
32
+ .merge(ForemanThemeSatellite::Documentation.flat_docs_guides_links)
33
+
34
+ failed = all_links.filter { |_key, doc_address| doc_address.include?('/html/') && !checker.test_link(doc_address) }
35
+
36
+ abort((failed.map { |key, doc_address| "FAILED: Cannot find #{doc_address} in TOC for entry: #{key}" } + ["Total failed: #{failed.count} entries"]).join("\n")) unless failed.empty?
37
+
38
+ puts "Successfully tested #{all_links.count} links"
40
39
  end
41
40
  end
42
41
 
43
42
  Rake::Task[:test].enhance ['test:foreman_theme_satellite']
44
-
45
- load 'tasks/jenkins.rake'
46
- if Rake::Task.task_defined?(:'jenkins:unit')
47
- Rake::Task['jenkins:unit'].enhance ['test:foreman_theme_satellite', 'foreman_theme_satellite:rubocop']
48
- end
43
+ Rake::Task['test:foreman_theme_satellite'].enhance ['foreman_theme_satellite:validate_docs']
data/locale/Makefile CHANGED
@@ -55,9 +55,7 @@ tx-update: tx-pull
55
55
  @echo then run make -C locale mo-files to finish
56
56
  @echo
57
57
 
58
- build-mo-files: $(MOFILES)
59
-
60
- mo-files: build-mo-files
58
+ mo-files: $(MOFILES)
61
59
  git add $(POFILES) $(POTFILE) $(JSFILES) ../locale/*/LC_MESSAGES
62
60
  git commit -m "i18n - pulling from tx"
63
61
  @echo
data/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "foreman_theme_satellite",
3
- "version": "13.2.4",
3
+ "version": "13.3.0",
4
4
  "description": "Satellite theme =============",
5
5
  "main": "index.js",
6
6
  "scripts": {
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: foreman_theme_satellite
3
3
  version: !ruby/object:Gem::Version
4
- version: 13.2.4
4
+ version: 13.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Shimon Stein
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2024-02-14 00:00:00.000000000 Z
12
+ date: 2024-08-13 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: activesupport
@@ -54,61 +54,19 @@ dependencies:
54
54
  - !ruby/object:Gem::Version
55
55
  version: '0'
56
56
  - !ruby/object:Gem::Dependency
57
- name: rubocop
57
+ name: theforeman-rubocop
58
58
  requirement: !ruby/object:Gem::Requirement
59
59
  requirements:
60
- - - ">="
61
- - !ruby/object:Gem::Version
62
- version: '0'
63
- type: :development
64
- prerelease: false
65
- version_requirements: !ruby/object:Gem::Requirement
66
- requirements:
67
- - - ">="
68
- - !ruby/object:Gem::Version
69
- version: '0'
70
- - !ruby/object:Gem::Dependency
71
- name: rubocop-minitest
72
- requirement: !ruby/object:Gem::Requirement
73
- requirements:
74
- - - ">="
60
+ - - "~>"
75
61
  - !ruby/object:Gem::Version
76
- version: '0'
62
+ version: 0.1.0
77
63
  type: :development
78
64
  prerelease: false
79
65
  version_requirements: !ruby/object:Gem::Requirement
80
66
  requirements:
81
- - - ">="
82
- - !ruby/object:Gem::Version
83
- version: '0'
84
- - !ruby/object:Gem::Dependency
85
- name: rubocop-performance
86
- requirement: !ruby/object:Gem::Requirement
87
- requirements:
88
- - - ">="
67
+ - - "~>"
89
68
  - !ruby/object:Gem::Version
90
- version: '0'
91
- type: :development
92
- prerelease: false
93
- version_requirements: !ruby/object:Gem::Requirement
94
- requirements:
95
- - - ">="
96
- - !ruby/object:Gem::Version
97
- version: '0'
98
- - !ruby/object:Gem::Dependency
99
- name: rubocop-rails
100
- requirement: !ruby/object:Gem::Requirement
101
- requirements:
102
- - - ">="
103
- - !ruby/object:Gem::Version
104
- version: '0'
105
- type: :development
106
- prerelease: false
107
- version_requirements: !ruby/object:Gem::Requirement
108
- requirements:
109
- - - ">="
110
- - !ruby/object:Gem::Version
111
- version: '0'
69
+ version: 0.1.0
112
70
  description: Theme changes for Satellite 6.
113
71
  email:
114
72
  - sshtein@redhat.com
@@ -221,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
221
179
  - !ruby/object:Gem::Version
222
180
  version: '0'
223
181
  requirements: []
224
- rubygems_version: 3.4.10
182
+ rubygems_version: 3.5.11
225
183
  signing_key:
226
184
  specification_version: 4
227
185
  summary: This is a plugin that enables building a theme for Foreman.