foreman_theme_satellite 13.3.0 → 14.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/README.md +1 -1
- data/app/views/foreman_theme_satellite/_theme_client_side_branding.js.erb +1 -1
- data/db/migrate/20181108171732_change_blog_url.rb +1 -1
- data/lib/foreman_theme_satellite/documentation.rb +8 -8
- data/lib/foreman_theme_satellite/engine.rb +5 -22
- data/lib/foreman_theme_satellite/{branded_words.rb → foreman_brand.rb} +14 -29
- data/lib/foreman_theme_satellite/replacer_repository.rb +0 -1
- data/lib/foreman_theme_satellite/version.rb +1 -1
- data/package.json +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 1ad1e23c6062e9751dfde7648814703fc6656e0604763d7f8f228e3a6f3e7cb8
|
|
4
|
+
data.tar.gz: 7a1b7d7a9119e28ff201abed28caecb39034dae5b1efe41a0dad098c45e192ff
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f1faf4f3c03596f4975f169baefdacab1417e7a2e9ea81ce41d48d6cc86889a4571b9da65df98c53d4e1bd8693929e63fb08642dfa15c4c0cad94905d98b10fd
|
|
7
|
+
data.tar.gz: c9e43a7fb53b21d2147a27ccc9f7b3407400a3367d35027b6957e30ee1ab05e76fdf3c55eb18dbb0adebb5e08d585aa233c2f30046c20fc08ec0c004b1153a32
|
data/README.md
CHANGED
|
@@ -36,7 +36,7 @@ const SettingName = ({ setting }) => (
|
|
|
36
36
|
|
|
37
37
|
In case there is a need to add more terms to be branded **or bypass branding**,
|
|
38
38
|
it can be done in
|
|
39
|
-
[`
|
|
39
|
+
[`foreman_brand.rb`](https://github.com/RedHatSatellite/foreman_theme_satellite/blob/develop/lib/foreman_theme_satellite/foreman_brand.rb).
|
|
40
40
|
This is a dictionary where the key is a
|
|
41
41
|
[Regular Expression](https://regex101.com/) and the value is a replacement
|
|
42
42
|
string.
|
|
@@ -30,12 +30,12 @@ module ForemanThemeSatellite
|
|
|
30
30
|
'Networking' => "#{ForemanThemeSatellite.documentation_root}/provisioning_hosts/configuring_networking_provisioning#Adding_a_Subnet_to_Server_provisioning",
|
|
31
31
|
|
|
32
32
|
# Puppet Guide
|
|
33
|
-
'FactsandtheENC' => "#{ForemanThemeSatellite.documentation_root}/
|
|
34
|
-
'using-config-groups' => "#{ForemanThemeSatellite.documentation_root}/
|
|
35
|
-
'SmartMatchers' => "#{ForemanThemeSatellite.documentation_root}/
|
|
36
|
-
'Parameters' => "#{ForemanThemeSatellite.documentation_root}/
|
|
37
|
-
'Classes' => "#{ForemanThemeSatellite.documentation_root}/
|
|
38
|
-
'Environments' => "#{ForemanThemeSatellite.documentation_root}/
|
|
33
|
+
'FactsandtheENC' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_by_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_by_using_puppet_integration/creating-a-puppet-config-group_managing-configurations-puppet",
|
|
35
|
+
'SmartMatchers' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_by_using_puppet_integration/configuring_puppet_smart_class_parameters_managing-configurations-puppet",
|
|
36
|
+
'Parameters' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_by_using_puppet_integration/configuring_puppet_smart_class_parameters_managing-configurations-puppet",
|
|
37
|
+
'Classes' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_by_using_puppet_integration/importing_puppet_classes_and_environments_managing-configurations-puppet",
|
|
38
|
+
'Environments' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_by_using_puppet_integration/creating_a_custom_puppet_environment_managing-configurations-puppet",
|
|
39
39
|
|
|
40
40
|
# Administering
|
|
41
41
|
'ConfigurationOptions' => "#{ForemanThemeSatellite.documentation_root}/administering_red_hat_satellite/",
|
|
@@ -81,8 +81,8 @@ module ForemanThemeSatellite
|
|
|
81
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
82
|
},
|
|
83
83
|
'Managing_Configurations_Ansible' => {
|
|
84
|
-
'Importing_Ansible_Roles_and_Variables_ansible' => "#{ForemanThemeSatellite.documentation_root}/
|
|
85
|
-
'Overriding_Ansible_Variables_in_foreman_ansible' => "#{ForemanThemeSatellite.documentation_root}/
|
|
84
|
+
'Importing_Ansible_Roles_and_Variables_ansible' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_by_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_by_using_ansible_integration/getting_started_with_ansible_in_satellite_ansible#Overriding_Ansible_Variables_in_satellite_ansible",
|
|
86
86
|
}
|
|
87
87
|
}.freeze
|
|
88
88
|
|
|
@@ -6,21 +6,11 @@ require 'deface'
|
|
|
6
6
|
module ForemanThemeSatellite
|
|
7
7
|
class Engine < ::Rails::Engine
|
|
8
8
|
engine_name 'foreman_theme_satellite'
|
|
9
|
-
|
|
10
|
-
config.eager_load_paths += Dir["#{config.root}/app/overrides"]
|
|
11
|
-
config.eager_load_paths += Dir["#{config.root}/app/controllers/concerns"]
|
|
12
|
-
config.eager_load_paths += Dir["#{config.root}/app/helpers"]
|
|
13
|
-
config.eager_load_paths += Dir["#{config.root}/app/models/concerns"]
|
|
14
|
-
config.eager_load_paths += Dir["#{config.root}/app/services/concerns"]
|
|
15
|
-
config.eager_load_paths += Dir["#{config.root}/lib/foreman_theme_satellite"]
|
|
16
|
-
|
|
17
|
-
initializer 'foreman_theme_satellite.load_default_settings', :before => :load_config_initializers do |app|
|
|
18
|
-
SettingRegistry.prepend SettingRegistryBranding
|
|
19
|
-
end
|
|
9
|
+
config.eager_load_paths += Dir["#{config.root}/lib"]
|
|
20
10
|
|
|
21
11
|
initializer 'foreman_theme_satellite.register_plugin', :before=> :finisher_hook do |app|
|
|
22
12
|
Foreman::Plugin.register :foreman_theme_satellite do
|
|
23
|
-
requires_foreman '>= 3.
|
|
13
|
+
requires_foreman '>= 3.13.0'
|
|
24
14
|
register_gettext
|
|
25
15
|
|
|
26
16
|
settings do
|
|
@@ -36,7 +26,7 @@ module ForemanThemeSatellite
|
|
|
36
26
|
end
|
|
37
27
|
end
|
|
38
28
|
|
|
39
|
-
|
|
29
|
+
tests_to_skip ({
|
|
40
30
|
"ComputeResourceTest" => ["friendly provider name"],
|
|
41
31
|
"RealmIntegrationTest" => ["create new page"],
|
|
42
32
|
"SmartProxyIntegrationTest" => ["create new page", "index page"],
|
|
@@ -49,7 +39,7 @@ module ForemanThemeSatellite
|
|
|
49
39
|
"OrganizationTest" => ["should clone organization with all associations"],
|
|
50
40
|
"RealmTest" => ["realm can be assigned to locations"],
|
|
51
41
|
"LocationTest" => ["should clone location with all associations"]
|
|
52
|
-
|
|
42
|
+
})
|
|
53
43
|
|
|
54
44
|
extend_rabl_template 'api/v2/home/status', 'api/v2/home/status_extensions'
|
|
55
45
|
extend_template_helpers ForemanThemeSatellite::RendererMethods
|
|
@@ -69,19 +59,12 @@ module ForemanThemeSatellite
|
|
|
69
59
|
end
|
|
70
60
|
end
|
|
71
61
|
|
|
72
|
-
initializer 'foreman_theme_satellite.rails_loading_workaround' do
|
|
73
|
-
# Without this, in production environment the module gets prepended too
|
|
74
|
-
# late and the extensions do not get applied
|
|
75
|
-
# the idea is stolen from https://github.com/theforeman/foreman_remote_execution/commit/2efd0a6eccfc19e282f453d5629cf46e729963eb
|
|
76
|
-
ProvisioningTemplatesHelper.prepend ProvisioningTemplatesHelperBranding
|
|
77
|
-
end
|
|
78
|
-
|
|
79
62
|
# Include concerns in this config.to_prepare block
|
|
80
63
|
config.to_prepare do
|
|
81
64
|
begin
|
|
65
|
+
SettingRegistry.prepend SettingRegistryBranding
|
|
82
66
|
# Include your monkey-patches over here
|
|
83
67
|
::ForemanGoogle::GCE.send(:prepend, GCE::ClassMethods) if Foreman::Plugin.installed?("foreman_google")
|
|
84
|
-
require 'rss_checker_branding'
|
|
85
68
|
UINotifications::RssNotificationsChecker.send :prepend, RssCheckerBranding
|
|
86
69
|
Foreman::Model::Openstack.send :include, Openstack
|
|
87
70
|
Foreman::Model::Ovirt.send :include, Ovirt
|
|
@@ -7,13 +7,15 @@ module ForemanThemeSatellite
|
|
|
7
7
|
# For now, modifiers are not supported by the generator.
|
|
8
8
|
# Make sure the regexp works both with Ruby and JavaScript.
|
|
9
9
|
# Entries are processed in order and first wins.
|
|
10
|
+
# Occurrences of "proxy" should be treated as a bug as it is unclear whether the author refers to a HTTP(S) proxy or a Capsule
|
|
10
11
|
FOREMAN_BRAND = {
|
|
11
12
|
/%{proxy}/ => '%{proxy}',
|
|
12
13
|
/%{foreman}/ => '%{foreman}',
|
|
13
14
|
/\b[Pp]roxy [Hh][Tt][Tt][Pp]\b(?!-)/ => 'Proxy HTTP', # Workaround for French translation
|
|
14
15
|
/\b[Pp]roxies [Hh][Tt][Tt][Pp]\b(?!-)/ => 'Proxies HTTP', # Workaround for French translation
|
|
15
|
-
|
|
16
|
-
/\b[Hh][Tt][Tt][Pp] [Pp]
|
|
16
|
+
## BEGIN Remove after imprecise strings have been fixed in core
|
|
17
|
+
/\b[Hh][Tt][Tt][Pp](?:\([sS]\))? [Pp]roxy\b(?!-)/ => 'HTTP proxy',
|
|
18
|
+
/\b[Hh][Tt][Tt][Pp](?:\([sS]\))? [Pp]roxies\b(?!-)/ => 'HTTP proxies',
|
|
17
19
|
/\bHTTP\(S\) proxy\b(?!-)/ => 'HTTP(S) proxy',
|
|
18
20
|
/\bIgnore Proxy\b(?!-)/ => 'Ignore Proxy',
|
|
19
21
|
/\bIgnore proxy\b(?!-)/ => 'Ignore Proxy',
|
|
@@ -24,33 +26,16 @@ module ForemanThemeSatellite
|
|
|
24
26
|
%r{\bhttps://proxy.example.com:8080\b(?!-)} => 'https://proxy.example.com:8080',
|
|
25
27
|
/\bproxy for all outgoing HTTP connections\b(?!-)/ => 'proxy for all outgoing HTTP connections',
|
|
26
28
|
/\bperform various actions through those proxies\b(?!-)/ => 'perform various actions through those proxies',
|
|
27
|
-
|
|
28
|
-
/\
|
|
29
|
-
/\
|
|
30
|
-
/\
|
|
31
|
-
/\
|
|
32
|
-
/\
|
|
33
|
-
/\
|
|
34
|
-
/\
|
|
35
|
-
/\
|
|
36
|
-
/\
|
|
37
|
-
/\bSmart Proxy\b(?!-)/ => 'Capsule',
|
|
38
|
-
/\bsmart proxy\b(?!-)/ => 'capsule',
|
|
39
|
-
/\bSmart-Proxies\b(?!-)/ => 'Capsules',
|
|
40
|
-
/\bSmart proxy\b(?!-)/ => 'Capsule',
|
|
41
|
-
/\bSmart-Proxy\b(?!-)/ => 'Capsule',
|
|
42
|
-
/\boVirt\b(?!-)/ => 'RHEV',
|
|
43
|
-
/\bovirt\b(?!-)/ => 'RHEV',
|
|
44
|
-
/\bOvirt\b(?!-)/ => 'RHEV',
|
|
45
|
-
/\bFreeIPA\b(?!-)/ => 'Red Hat Identity Management',
|
|
46
|
-
/\bOpenStack\b(?!-)/ => 'RHEL OpenStack Platform',
|
|
47
|
-
/\bopenstack\b(?!-)/ => 'RHEL OpenStack Platform',
|
|
48
|
-
/\bOpenstack\b(?!-)/ => 'RHEL OpenStack Platform',
|
|
49
|
-
/\bProxy\b(?!-)/ => 'Capsule',
|
|
50
|
-
/\bproxy\b(?!-)/ => 'Capsule',
|
|
51
|
-
/\bProxies\b(?!-)/ => 'Capsules',
|
|
52
|
-
/\bproxies\b(?!-)/ => 'Capsules',
|
|
53
|
-
/\b[Kk]atello 4.0\b(?!-)/ => 'Satellite 6.11',
|
|
29
|
+
## END
|
|
30
|
+
/\b[Ff]oreman\b(?!-)/ => 'Satellite',
|
|
31
|
+
/\b[Ss]mart[- ]?[pP]roxy\b(?!-)/ => 'Capsule',
|
|
32
|
+
/\b[Ss]mart[- ]?[pP]roxies\b(?!-)/ => 'Capsules',
|
|
33
|
+
/\b[Pp]roxy\b(?!-)/ => 'Capsule',
|
|
34
|
+
/\b[Pp]roxies\b(?!-)/ => 'Capsules',
|
|
35
|
+
/\b[Oo][Vv]irt\b(?!-)/ => 'RHV',
|
|
36
|
+
/\bFreeIPA\b(?!-)/ => 'Red Hat Identity Management',
|
|
37
|
+
/\b[Oo]pen[Ss]tack\b(?!-)/ => 'Red Hat OpenStack Platform',
|
|
38
|
+
/\b[Kk]atello 4.0\b(?!-)/ => 'Satellite 6.11',
|
|
54
39
|
/\b[Kk]atello 4.10\b(?!-)/ => 'Satellite 6.15',
|
|
55
40
|
/\b[Kk]atello 4.11\b(?!-)/ => 'Satellite 6.15',
|
|
56
41
|
/\b[Kk]atello 4.12\b(?!-)/ => 'Satellite 6.16',
|
data/package.json
CHANGED
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:
|
|
4
|
+
version: 14.0.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-
|
|
12
|
+
date: 2024-09-11 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: activesupport
|
|
@@ -140,10 +140,10 @@ files:
|
|
|
140
140
|
- db/seeds.d/069-provisioning_templates_defaults.rb
|
|
141
141
|
- db/seeds.d/850-global_parameters.rb
|
|
142
142
|
- lib/foreman_theme_satellite.rb
|
|
143
|
-
- lib/foreman_theme_satellite/branded_words.rb
|
|
144
143
|
- lib/foreman_theme_satellite/deprecated_templates.rb
|
|
145
144
|
- lib/foreman_theme_satellite/documentation.rb
|
|
146
145
|
- lib/foreman_theme_satellite/engine.rb
|
|
146
|
+
- lib/foreman_theme_satellite/foreman_brand.rb
|
|
147
147
|
- lib/foreman_theme_satellite/pry_rack.rb
|
|
148
148
|
- lib/foreman_theme_satellite/replacer_repository.rb
|
|
149
149
|
- lib/foreman_theme_satellite/rss_checker_branding.rb
|