foreman_openscap 7.0.0 → 7.1.1
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/app/assets/javascripts/foreman_openscap/locale/cs_CZ/foreman_openscap.js +4 -4
- data/app/assets/javascripts/foreman_openscap/locale/de/foreman_openscap.js +8 -5
- data/app/assets/javascripts/foreman_openscap/locale/en/foreman_openscap.js +4 -4
- data/app/assets/javascripts/foreman_openscap/locale/en_GB/foreman_openscap.js +4 -4
- data/app/assets/javascripts/foreman_openscap/locale/es/foreman_openscap.js +8 -5
- data/app/assets/javascripts/foreman_openscap/locale/fr/foreman_openscap.js +8 -5
- data/app/assets/javascripts/foreman_openscap/locale/gl/foreman_openscap.js +4 -4
- data/app/assets/javascripts/foreman_openscap/locale/it/foreman_openscap.js +4 -4
- data/app/assets/javascripts/foreman_openscap/locale/ja/foreman_openscap.js +8 -5
- data/app/assets/javascripts/foreman_openscap/locale/ka/foreman_openscap.js +1302 -0
- data/app/assets/javascripts/foreman_openscap/locale/ko/foreman_openscap.js +8 -5
- data/app/assets/javascripts/foreman_openscap/locale/pt_BR/foreman_openscap.js +8 -5
- data/app/assets/javascripts/foreman_openscap/locale/ru/foreman_openscap.js +8 -5
- data/app/assets/javascripts/foreman_openscap/locale/sv_SE/foreman_openscap.js +4 -4
- data/app/assets/javascripts/foreman_openscap/locale/zh_CN/foreman_openscap.js +8 -5
- data/app/assets/javascripts/foreman_openscap/locale/zh_TW/foreman_openscap.js +8 -5
- data/app/controllers/api/v2/compliance/arf_reports_controller.rb +2 -1
- data/app/controllers/policies_controller.rb +10 -5
- data/app/controllers/tailoring_files_controller.rb +3 -0
- data/app/helpers/foreman_openscap_helper.rb +11 -8
- data/app/helpers/policies_helper.rb +2 -0
- data/app/models/concerns/foreman_openscap/host_extensions.rb +2 -0
- data/app/views/arf_reports/show.html.erb +0 -1
- data/app/views/arf_reports/welcome.html.erb +1 -1
- data/app/views/compliance_hosts/show.html.erb +1 -1
- data/app/views/policies/index.html.erb +1 -1
- data/app/views/policies/steps/_deployment_options_form.html.erb +1 -1
- data/app/views/policies/steps/_policy_attributes_form.html.erb +1 -1
- data/app/views/policies/steps/_schedule_form.html.erb +8 -4
- data/app/views/policy_dashboard/index.html.erb +1 -1
- data/app/views/scap_contents/index.html.erb +1 -1
- data/app/views/tailoring_files/index.html.erb +1 -1
- data/lib/foreman_openscap/version.rb +1 -1
- data/locale/Makefile +3 -3
- data/locale/cs_CZ/foreman_openscap.edit.po +28 -28
- data/locale/cs_CZ/foreman_openscap.po +1 -1
- data/locale/de/LC_MESSAGES/foreman_openscap.mo +0 -0
- data/locale/de/foreman_openscap.edit.po +295 -133
- data/locale/de/foreman_openscap.po +2 -2
- data/locale/en/foreman_openscap.edit.po +28 -28
- data/locale/en/foreman_openscap.po +1 -1
- data/locale/en_GB/foreman_openscap.edit.po +28 -28
- data/locale/en_GB/foreman_openscap.po +1 -1
- data/locale/es/LC_MESSAGES/foreman_openscap.mo +0 -0
- data/locale/es/foreman_openscap.edit.po +292 -126
- data/locale/es/foreman_openscap.po +2 -2
- data/locale/foreman_openscap.pot +33 -33
- data/locale/fr/LC_MESSAGES/foreman_openscap.mo +0 -0
- data/locale/fr/foreman_openscap.edit.po +376 -215
- data/locale/fr/foreman_openscap.po +2 -2
- data/locale/gl/foreman_openscap.edit.po +28 -28
- data/locale/gl/foreman_openscap.po +1 -1
- data/locale/it/foreman_openscap.edit.po +28 -28
- data/locale/it/foreman_openscap.po +1 -1
- data/locale/ja/LC_MESSAGES/foreman_openscap.mo +0 -0
- data/locale/ja/foreman_openscap.edit.po +360 -199
- data/locale/ja/foreman_openscap.po +2 -2
- data/locale/ka/LC_MESSAGES/foreman_openscap.mo +0 -0
- data/locale/ka/foreman_openscap.edit.po +1902 -0
- data/locale/ka/foreman_openscap.po +1309 -0
- data/locale/ko/LC_MESSAGES/foreman_openscap.mo +0 -0
- data/locale/ko/foreman_openscap.edit.po +28 -28
- data/locale/ko/foreman_openscap.po +2 -2
- data/locale/pt_BR/LC_MESSAGES/foreman_openscap.mo +0 -0
- data/locale/pt_BR/foreman_openscap.edit.po +292 -132
- data/locale/pt_BR/foreman_openscap.po +2 -2
- data/locale/ru/LC_MESSAGES/foreman_openscap.mo +0 -0
- data/locale/ru/foreman_openscap.edit.po +28 -28
- data/locale/ru/foreman_openscap.po +2 -2
- data/locale/sv_SE/foreman_openscap.edit.po +28 -28
- data/locale/sv_SE/foreman_openscap.po +1 -1
- data/locale/zh_CN/LC_MESSAGES/foreman_openscap.mo +0 -0
- data/locale/zh_CN/foreman_openscap.edit.po +360 -199
- data/locale/zh_CN/foreman_openscap.po +2 -2
- data/locale/zh_TW/LC_MESSAGES/foreman_openscap.mo +0 -0
- data/locale/zh_TW/foreman_openscap.edit.po +28 -28
- data/locale/zh_TW/foreman_openscap.po +2 -2
- data/package.json +0 -3
- metadata +10 -6
|
@@ -326,8 +326,8 @@
|
|
|
326
326
|
"No valid policy ID provided": [
|
|
327
327
|
""
|
|
328
328
|
],
|
|
329
|
-
"No hosts were found
|
|
330
|
-
"
|
|
329
|
+
"No hosts were found with that id, name or query filter": [
|
|
330
|
+
""
|
|
331
331
|
],
|
|
332
332
|
"No hosts selected": [
|
|
333
333
|
"선택된 호스트가 없음 "
|
|
@@ -431,9 +431,6 @@
|
|
|
431
431
|
"Host is deleted": [
|
|
432
432
|
"호스트가 삭제되었습니다."
|
|
433
433
|
],
|
|
434
|
-
"documentation": [
|
|
435
|
-
""
|
|
436
|
-
],
|
|
437
434
|
"Choose existing SCAP Content": [
|
|
438
435
|
"기존 SCAP 컨텐츠 선택"
|
|
439
436
|
],
|
|
@@ -919,6 +916,9 @@
|
|
|
919
916
|
"Please make sure you understand them by reading our": [
|
|
920
917
|
""
|
|
921
918
|
],
|
|
919
|
+
"documentation": [
|
|
920
|
+
""
|
|
921
|
+
],
|
|
922
922
|
"Choose day in month": [
|
|
923
923
|
""
|
|
924
924
|
],
|
|
@@ -1296,6 +1296,9 @@
|
|
|
1296
1296
|
],
|
|
1297
1297
|
"Remote action:": [
|
|
1298
1298
|
"원격 작업:"
|
|
1299
|
+
],
|
|
1300
|
+
"No hosts were found.": [
|
|
1301
|
+
"호스트를 찾을 수 없습니다."
|
|
1299
1302
|
]
|
|
1300
1303
|
}
|
|
1301
1304
|
}
|
|
@@ -326,8 +326,8 @@
|
|
|
326
326
|
"No valid policy ID provided": [
|
|
327
327
|
"Não foi fornecida uma ID de política válida"
|
|
328
328
|
],
|
|
329
|
-
"No hosts were found
|
|
330
|
-
"
|
|
329
|
+
"No hosts were found with that id, name or query filter": [
|
|
330
|
+
""
|
|
331
331
|
],
|
|
332
332
|
"No hosts selected": [
|
|
333
333
|
"Não foi selecionado nenhum host"
|
|
@@ -431,9 +431,6 @@
|
|
|
431
431
|
"Host is deleted": [
|
|
432
432
|
"Host removido"
|
|
433
433
|
],
|
|
434
|
-
"documentation": [
|
|
435
|
-
"documentação"
|
|
436
|
-
],
|
|
437
434
|
"Choose existing SCAP Content": [
|
|
438
435
|
"Escolha um conteúdo SCAP existente"
|
|
439
436
|
],
|
|
@@ -921,6 +918,9 @@
|
|
|
921
918
|
"Please make sure you understand them by reading our": [
|
|
922
919
|
"Por favor, certifique-se de compreendê-los lendo nosso"
|
|
923
920
|
],
|
|
921
|
+
"documentation": [
|
|
922
|
+
"documentação"
|
|
923
|
+
],
|
|
924
924
|
"Choose day in month": [
|
|
925
925
|
"Escolher dia no mês"
|
|
926
926
|
],
|
|
@@ -1298,6 +1298,9 @@
|
|
|
1298
1298
|
],
|
|
1299
1299
|
"Remote action:": [
|
|
1300
1300
|
"Ação remota:"
|
|
1301
|
+
],
|
|
1302
|
+
"No hosts were found.": [
|
|
1303
|
+
"Nenhum host localizado."
|
|
1301
1304
|
]
|
|
1302
1305
|
}
|
|
1303
1306
|
}
|
|
@@ -326,8 +326,8 @@
|
|
|
326
326
|
"No valid policy ID provided": [
|
|
327
327
|
""
|
|
328
328
|
],
|
|
329
|
-
"No hosts were found
|
|
330
|
-
"
|
|
329
|
+
"No hosts were found with that id, name or query filter": [
|
|
330
|
+
""
|
|
331
331
|
],
|
|
332
332
|
"No hosts selected": [
|
|
333
333
|
"Не выбран узел"
|
|
@@ -431,9 +431,6 @@
|
|
|
431
431
|
"Host is deleted": [
|
|
432
432
|
"Узел удален"
|
|
433
433
|
],
|
|
434
|
-
"documentation": [
|
|
435
|
-
"документация"
|
|
436
|
-
],
|
|
437
434
|
"Choose existing SCAP Content": [
|
|
438
435
|
"Выберите существующее описание SCAP"
|
|
439
436
|
],
|
|
@@ -919,6 +916,9 @@
|
|
|
919
916
|
"Please make sure you understand them by reading our": [
|
|
920
917
|
""
|
|
921
918
|
],
|
|
919
|
+
"documentation": [
|
|
920
|
+
"документация"
|
|
921
|
+
],
|
|
922
922
|
"Choose day in month": [
|
|
923
923
|
""
|
|
924
924
|
],
|
|
@@ -1296,6 +1296,9 @@
|
|
|
1296
1296
|
],
|
|
1297
1297
|
"Remote action:": [
|
|
1298
1298
|
"Удаленное действие:"
|
|
1299
|
+
],
|
|
1300
|
+
"No hosts were found.": [
|
|
1301
|
+
"Узлов не найдено."
|
|
1299
1302
|
]
|
|
1300
1303
|
}
|
|
1301
1304
|
}
|
|
@@ -326,7 +326,7 @@
|
|
|
326
326
|
"No valid policy ID provided": [
|
|
327
327
|
""
|
|
328
328
|
],
|
|
329
|
-
"No hosts were found
|
|
329
|
+
"No hosts were found with that id, name or query filter": [
|
|
330
330
|
""
|
|
331
331
|
],
|
|
332
332
|
"No hosts selected": [
|
|
@@ -431,9 +431,6 @@
|
|
|
431
431
|
"Host is deleted": [
|
|
432
432
|
""
|
|
433
433
|
],
|
|
434
|
-
"documentation": [
|
|
435
|
-
""
|
|
436
|
-
],
|
|
437
434
|
"Choose existing SCAP Content": [
|
|
438
435
|
""
|
|
439
436
|
],
|
|
@@ -919,6 +916,9 @@
|
|
|
919
916
|
"Please make sure you understand them by reading our": [
|
|
920
917
|
""
|
|
921
918
|
],
|
|
919
|
+
"documentation": [
|
|
920
|
+
""
|
|
921
|
+
],
|
|
922
922
|
"Choose day in month": [
|
|
923
923
|
""
|
|
924
924
|
],
|
|
@@ -326,8 +326,8 @@
|
|
|
326
326
|
"No valid policy ID provided": [
|
|
327
327
|
"未提供有效的策略 ID"
|
|
328
328
|
],
|
|
329
|
-
"No hosts were found
|
|
330
|
-
"
|
|
329
|
+
"No hosts were found with that id, name or query filter": [
|
|
330
|
+
""
|
|
331
331
|
],
|
|
332
332
|
"No hosts selected": [
|
|
333
333
|
"未选择主机"
|
|
@@ -431,9 +431,6 @@
|
|
|
431
431
|
"Host is deleted": [
|
|
432
432
|
"主机被删除"
|
|
433
433
|
],
|
|
434
|
-
"documentation": [
|
|
435
|
-
"文档"
|
|
436
|
-
],
|
|
437
434
|
"Choose existing SCAP Content": [
|
|
438
435
|
"选择现有的SCAP内容"
|
|
439
436
|
],
|
|
@@ -917,6 +914,9 @@
|
|
|
917
914
|
"Please make sure you understand them by reading our": [
|
|
918
915
|
"请通过阅读我们的手册确保您了解它们"
|
|
919
916
|
],
|
|
917
|
+
"documentation": [
|
|
918
|
+
"文档"
|
|
919
|
+
],
|
|
920
920
|
"Choose day in month": [
|
|
921
921
|
"选择月中的一天"
|
|
922
922
|
],
|
|
@@ -1294,6 +1294,9 @@
|
|
|
1294
1294
|
],
|
|
1295
1295
|
"Remote action:": [
|
|
1296
1296
|
"远程操作:"
|
|
1297
|
+
],
|
|
1298
|
+
"No hosts were found.": [
|
|
1299
|
+
"找不到主机。"
|
|
1297
1300
|
]
|
|
1298
1301
|
}
|
|
1299
1302
|
}
|
|
@@ -326,8 +326,8 @@
|
|
|
326
326
|
"No valid policy ID provided": [
|
|
327
327
|
""
|
|
328
328
|
],
|
|
329
|
-
"No hosts were found
|
|
330
|
-
"
|
|
329
|
+
"No hosts were found with that id, name or query filter": [
|
|
330
|
+
""
|
|
331
331
|
],
|
|
332
332
|
"No hosts selected": [
|
|
333
333
|
"未選擇主機"
|
|
@@ -431,9 +431,6 @@
|
|
|
431
431
|
"Host is deleted": [
|
|
432
432
|
"已刪除主機"
|
|
433
433
|
],
|
|
434
|
-
"documentation": [
|
|
435
|
-
""
|
|
436
|
-
],
|
|
437
434
|
"Choose existing SCAP Content": [
|
|
438
435
|
"選擇現有的 SCAP 內容"
|
|
439
436
|
],
|
|
@@ -919,6 +916,9 @@
|
|
|
919
916
|
"Please make sure you understand them by reading our": [
|
|
920
917
|
""
|
|
921
918
|
],
|
|
919
|
+
"documentation": [
|
|
920
|
+
""
|
|
921
|
+
],
|
|
922
922
|
"Choose day in month": [
|
|
923
923
|
""
|
|
924
924
|
],
|
|
@@ -1296,6 +1296,9 @@
|
|
|
1296
1296
|
],
|
|
1297
1297
|
"Remote action:": [
|
|
1298
1298
|
"遠端動作:"
|
|
1299
|
+
],
|
|
1300
|
+
"No hosts were found.": [
|
|
1301
|
+
"找不到主機。"
|
|
1299
1302
|
]
|
|
1300
1303
|
}
|
|
1301
1304
|
}
|
|
@@ -124,7 +124,8 @@ module Api
|
|
|
124
124
|
end
|
|
125
125
|
|
|
126
126
|
def handle_download_error(error)
|
|
127
|
-
render_error
|
|
127
|
+
render_error :custom_error, :status => :unprocessable_entity,
|
|
128
|
+
:locals => { :message => _("Downloading the report failed: #{error.message}") }
|
|
128
129
|
end
|
|
129
130
|
|
|
130
131
|
def upload_fail(msg)
|
|
@@ -117,13 +117,18 @@ class PoliciesController < ApplicationController
|
|
|
117
117
|
@tailoring_file = ForemanOpenscap::TailoringFile.find(params[:tailoring_file_id]) if params[:tailoring_file_id].present?
|
|
118
118
|
end
|
|
119
119
|
|
|
120
|
+
def multiple_with_filter?
|
|
121
|
+
params.key?(:search)
|
|
122
|
+
end
|
|
123
|
+
|
|
120
124
|
def find_multiple
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
@hosts
|
|
125
|
+
if params.key?(:host_names) || params.key?(:host_ids) || multiple_with_filter?
|
|
126
|
+
@hosts = Host.search_for(params[:search]) if multiple_with_filter?
|
|
127
|
+
@hosts ||= Host.merge(Host.where(id: params[:host_ids]).or(Host.where(name: params[:host_names])))
|
|
124
128
|
if @hosts.empty?
|
|
125
|
-
error _('No hosts were found
|
|
126
|
-
redirect_to(hosts_path)
|
|
129
|
+
error _('No hosts were found with that id, name or query filter')
|
|
130
|
+
redirect_to(hosts_path)
|
|
131
|
+
return false
|
|
127
132
|
end
|
|
128
133
|
else
|
|
129
134
|
error _('No hosts selected')
|
|
@@ -1,12 +1,8 @@
|
|
|
1
1
|
require 'foreman_openscap/version'
|
|
2
2
|
|
|
3
3
|
module ForemanOpenscapHelper
|
|
4
|
-
def
|
|
5
|
-
|
|
6
|
-
text,
|
|
7
|
-
scap_doc_url(section),
|
|
8
|
-
:rel => 'external noopener noreferrer', :target => '_blank'
|
|
9
|
-
)
|
|
4
|
+
def scap_doc_button(section)
|
|
5
|
+
documentation_button(section, root_url: scap_doc_url)
|
|
10
6
|
end
|
|
11
7
|
|
|
12
8
|
def scap_doc_url(section = '')
|
|
@@ -15,10 +11,17 @@ module ForemanOpenscapHelper
|
|
|
15
11
|
documentation_url(section, root_url: scap_root_url)
|
|
16
12
|
end
|
|
17
13
|
|
|
14
|
+
private
|
|
15
|
+
|
|
16
|
+
def doc_flavor
|
|
17
|
+
ForemanOpenscap.with_katello? ? 'katello' : 'foreman-el'
|
|
18
|
+
end
|
|
19
|
+
|
|
18
20
|
def scap_root_url
|
|
19
21
|
@scap_root_url ||= begin
|
|
20
|
-
version =
|
|
21
|
-
|
|
22
|
+
version = SETTINGS[:version]
|
|
23
|
+
version = version.tag == 'develop' ? 'nightly' : version.short
|
|
24
|
+
"https://docs.theforeman.org/#{version}/Managing_Security_Compliance/index-#{doc_flavor}.html#"
|
|
22
25
|
end
|
|
23
26
|
end
|
|
24
27
|
end
|
|
@@ -55,11 +55,13 @@ module PoliciesHelper
|
|
|
55
55
|
select_f form, :scap_content_id, scap_contents, :id, :title,
|
|
56
56
|
{ :include_blank => _("Choose existing SCAP Content") },
|
|
57
57
|
{ :label => _("SCAP Content"),
|
|
58
|
+
:required => true,
|
|
58
59
|
:onchange => 'scap_content_selected(this);',
|
|
59
60
|
:'data-url' => method_path('scap_content_selected') }
|
|
60
61
|
else
|
|
61
62
|
select_f form, :scap_content_id, scap_contents, :id, :title,
|
|
62
63
|
{ :label => _("SCAP Content"),
|
|
64
|
+
:required => true,
|
|
63
65
|
:onchange => 'scap_content_selected(this);',
|
|
64
66
|
:'data-url' => method_path('scap_content_selected') }
|
|
65
67
|
end
|
|
@@ -80,6 +80,8 @@ module ForemanOpenscap
|
|
|
80
80
|
property :policies_enc, String, desc: 'Returns JSON string containing policies for the host'
|
|
81
81
|
property :policies_enc_raw, array_of: Hash, desc: 'Returns a list with key:value objects containing policies for the host'
|
|
82
82
|
end
|
|
83
|
+
|
|
84
|
+
base.smart_proxy_reference :self => [:openscap_proxy_id]
|
|
83
85
|
end
|
|
84
86
|
|
|
85
87
|
def inherited_attributes
|
|
@@ -9,6 +9,6 @@
|
|
|
9
9
|
<%= _("You don't seem to have any ARF report. ARF report is a summary of a single scan occurrence on a particular host for a given Compliance Policy.") %></br>
|
|
10
10
|
</p>
|
|
11
11
|
<div class="blank-slate-pf-main-action">
|
|
12
|
-
<%= link_to _('Documentation'),
|
|
12
|
+
<%= link_to _('Documentation'), scap_doc_url("Monitoring_Compliance_security-compliance"), :rel => 'external', :class => 'btn btn-primary btn-lg' %>
|
|
13
13
|
</div>
|
|
14
14
|
</div>
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
|
|
4
4
|
<% title_actions(
|
|
5
5
|
display_link_if_authorized(_("New Compliance Policy"), hash_for_new_policy_path, :class => "btn btn-primary"),
|
|
6
|
-
|
|
6
|
+
scap_doc_button('Managing_Compliance_Policies_security-compliance')
|
|
7
7
|
) %>
|
|
8
8
|
|
|
9
9
|
<%= render :partial => 'list' %>
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
<div class="alert alert-info" id="scap-deployment-options-info-banner">
|
|
5
5
|
<span class="pficon pficon-info"></span>
|
|
6
6
|
<strong><%= _('There are significant differences in deployment options.') %></strong>
|
|
7
|
-
<%= _('Please make sure you understand them by reading our') %> <%=
|
|
7
|
+
<%= _('Please make sure you understand them by reading our') %> <%= link_to(_('documentation'), scap_doc_url('deploying-compliance-policies_security-compliance'), :rel => 'external noopener noreferrer', :target => '_blank') %>.
|
|
8
8
|
</div>
|
|
9
9
|
|
|
10
10
|
<%= deploy_by_radios f, @policy %>
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
<div class="tab-pane <%= show_partial_wizard(step) %>" id="create-policy">
|
|
2
2
|
<%= wizard_header @policy.step_index, *translate_steps(@policy) %>
|
|
3
|
-
<%= text_f(f, :name) %>
|
|
3
|
+
<%= text_f(f, :name, :required => true) %>
|
|
4
4
|
<%= text_f(f, :description, :size => "col-md-8" ) %>
|
|
5
5
|
</div>
|
|
@@ -4,8 +4,12 @@
|
|
|
4
4
|
<%= wizard_header @policy.step_index, *@policy.steps %>
|
|
5
5
|
<%= select_f(f, :period, %w[Weekly Monthly Custom], :downcase, :to_s,
|
|
6
6
|
{ :include_blank => _('Choose period') },
|
|
7
|
-
{ :onchange => 'period_selected(this)' }) %>
|
|
8
|
-
<%= select_f(f, :weekday, days_of_week_hash, :first, :last,
|
|
9
|
-
|
|
10
|
-
|
|
7
|
+
{ :onchange => 'period_selected(this)', :required => true }) %>
|
|
8
|
+
<%= select_f(f, :weekday, days_of_week_hash, :first, :last,
|
|
9
|
+
{ :include_blank => _('Choose weekday') },
|
|
10
|
+
{ :required => true }) %>
|
|
11
|
+
<%= select_f(f, :day_of_month, (1..31).to_a, :to_i, :to_s,
|
|
12
|
+
{ :include_blank => _('Choose day in month') },
|
|
13
|
+
{ :help_inline => _('Number of a day in month, note that not all months have same count of days'), :required => true }) %>
|
|
14
|
+
<%= text_f(f, :cron_line, :help_inline => _('You can specify custom cron line, e.g. "0 3 * * *", separate each of 5 values by space'), :required => true) %>
|
|
11
15
|
</div>
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
<% title _("SCAP Contents") %>
|
|
2
2
|
|
|
3
3
|
<% title_actions(display_link_if_authorized(_("Upload New SCAP Content"), hash_for_new_scap_content_path, :class => 'btn btn-primary'),
|
|
4
|
-
|
|
4
|
+
scap_doc_button('Configuring_SCAP_Contents_security-compliance')) %>
|
|
5
5
|
|
|
6
6
|
<%= render :partial => 'list' %>
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
<% title _("Tailoring Files") %>
|
|
2
2
|
<% title_actions(display_link_if_authorized(_("Upload New Tailoring file"), hash_for_new_tailoring_file_path, :class => 'btn btn-primary'),
|
|
3
|
-
|
|
3
|
+
scap_doc_button('tailoring-xccdf-profiles_security-compliance')) %>
|
|
4
4
|
<%= render :partial => 'list' %>
|
data/locale/Makefile
CHANGED
|
@@ -6,8 +6,8 @@
|
|
|
6
6
|
# make tx-update - download and merge translations from Transifex
|
|
7
7
|
# make clean - clean everything
|
|
8
8
|
#
|
|
9
|
-
DOMAIN =
|
|
10
|
-
VERSION = $(shell ruby -e '
|
|
9
|
+
DOMAIN = $(shell ruby -rrubygems -e 'puts Gem::Specification::load(Dir.glob("../*.gemspec")[0]).name')
|
|
10
|
+
VERSION = $(shell ruby -rrubygems -e 'puts Gem::Specification::load(Dir.glob("../*.gemspec")[0]).version')
|
|
11
11
|
POTFILE = $(DOMAIN).pot
|
|
12
12
|
MOFILE = $(DOMAIN).mo
|
|
13
13
|
POFILES = $(shell find . -name '$(DOMAIN).po')
|
|
@@ -43,7 +43,7 @@ uniq-po:
|
|
|
43
43
|
done
|
|
44
44
|
|
|
45
45
|
tx-pull: $(EDITFILES)
|
|
46
|
-
cd .. && tx pull -f
|
|
46
|
+
cd .. && tx pull -f --all
|
|
47
47
|
for f in $(EDITFILES) ; do \
|
|
48
48
|
sed -i 's/^\("Project-Id-Version: \).*$$/\1$(DOMAIN) $(VERSION)\\n"/' $$f; \
|
|
49
49
|
done
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
#
|
|
6
6
|
msgid ""
|
|
7
7
|
msgstr ""
|
|
8
|
-
"Project-Id-Version: foreman_openscap 1.0
|
|
8
|
+
"Project-Id-Version: foreman_openscap 7.1.0\n"
|
|
9
9
|
"Report-Msgid-Bugs-To: \n"
|
|
10
10
|
"PO-Revision-Date: 2023-05-16 14:11+0200\n"
|
|
11
11
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
|
@@ -548,23 +548,23 @@ msgstr ""
|
|
|
548
548
|
msgid "Othered"
|
|
549
549
|
msgstr ""
|
|
550
550
|
|
|
551
|
-
#: ../app/helpers/compliance_hosts_helper.rb:
|
|
551
|
+
#: ../app/helpers/compliance_hosts_helper.rb:26
|
|
552
552
|
msgid "Assign Compliance Policy"
|
|
553
553
|
msgstr ""
|
|
554
554
|
|
|
555
|
-
#: ../app/helpers/compliance_hosts_helper.rb:
|
|
555
|
+
#: ../app/helpers/compliance_hosts_helper.rb:27
|
|
556
556
|
msgid "Unassign Compliance Policy"
|
|
557
557
|
msgstr ""
|
|
558
558
|
|
|
559
|
-
#: ../app/helpers/compliance_hosts_helper.rb:
|
|
559
|
+
#: ../app/helpers/compliance_hosts_helper.rb:28
|
|
560
560
|
msgid "Change OpenSCAP Proxy"
|
|
561
561
|
msgstr ""
|
|
562
562
|
|
|
563
|
-
#: ../app/helpers/compliance_hosts_helper.rb:
|
|
563
|
+
#: ../app/helpers/compliance_hosts_helper.rb:37 ../app/models/foreman_openscap/compliance_status.rb:8 ../lib/foreman_openscap/engine.rb:159 ../webpack/components/HostExtentions/HostKebabItems.js:39
|
|
564
564
|
msgid "Compliance"
|
|
565
565
|
msgstr ""
|
|
566
566
|
|
|
567
|
-
#: ../app/helpers/compliance_hosts_helper.rb:
|
|
567
|
+
#: ../app/helpers/compliance_hosts_helper.rb:39
|
|
568
568
|
msgid "Host compliance details"
|
|
569
569
|
msgstr ""
|
|
570
570
|
|
|
@@ -572,47 +572,43 @@ msgstr ""
|
|
|
572
572
|
msgid "Host is deleted"
|
|
573
573
|
msgstr ""
|
|
574
574
|
|
|
575
|
-
#: ../app/helpers/foreman_openscap_helper.rb:4
|
|
576
|
-
msgid "documentation"
|
|
577
|
-
msgstr ""
|
|
578
|
-
|
|
579
575
|
#: ../app/helpers/policies_helper.rb:56
|
|
580
576
|
msgid "Choose existing SCAP Content"
|
|
581
577
|
msgstr ""
|
|
582
578
|
|
|
583
|
-
#: ../app/helpers/policies_helper.rb:57 ../app/helpers/policies_helper.rb:
|
|
579
|
+
#: ../app/helpers/policies_helper.rb:57 ../app/helpers/policies_helper.rb:63 ../app/models/foreman_openscap/policy.rb:11 ../app/views/policies/_form.html.erb:10 ../app/views/scap_contents/welcome.html.erb:1 ../app/views/scap_contents/welcome.html.erb:6
|
|
584
580
|
msgid "SCAP Content"
|
|
585
581
|
msgstr ""
|
|
586
582
|
|
|
587
|
-
#: ../app/helpers/policies_helper.rb:
|
|
583
|
+
#: ../app/helpers/policies_helper.rb:74 ../app/helpers/policies_helper.rb:81
|
|
588
584
|
msgid "XCCDF Profile"
|
|
589
585
|
msgstr ""
|
|
590
586
|
|
|
591
|
-
#: ../app/helpers/policies_helper.rb:
|
|
587
|
+
#: ../app/helpers/policies_helper.rb:80
|
|
592
588
|
msgid "Default XCCDF profile"
|
|
593
589
|
msgstr ""
|
|
594
590
|
|
|
595
|
-
#: ../app/helpers/policies_helper.rb:
|
|
591
|
+
#: ../app/helpers/policies_helper.rb:89
|
|
596
592
|
msgid "Choose Tailoring File"
|
|
597
593
|
msgstr ""
|
|
598
594
|
|
|
599
|
-
#: ../app/helpers/policies_helper.rb:
|
|
595
|
+
#: ../app/helpers/policies_helper.rb:90 ../app/views/policies/_list.html.erb:6
|
|
600
596
|
msgid "Tailoring File"
|
|
601
597
|
msgstr ""
|
|
602
598
|
|
|
603
|
-
#: ../app/helpers/policies_helper.rb:
|
|
599
|
+
#: ../app/helpers/policies_helper.rb:99
|
|
604
600
|
msgid "XCCDF Profile in Tailoring File"
|
|
605
601
|
msgstr ""
|
|
606
602
|
|
|
607
|
-
#: ../app/helpers/policies_helper.rb:
|
|
603
|
+
#: ../app/helpers/policies_helper.rb:100
|
|
608
604
|
msgid "This profile will be used to override the one from scap content"
|
|
609
605
|
msgstr ""
|
|
610
606
|
|
|
611
|
-
#: ../app/helpers/policies_helper.rb:
|
|
607
|
+
#: ../app/helpers/policies_helper.rb:111 ../app/views/arf_reports/_list.html.erb:54 ../webpack/routes/OvalContents/OvalContentsNew/OvalContentsNew.js:116 ../webpack/routes/OvalPolicies/OvalPoliciesNew/NewOvalPolicyForm.js:97
|
|
612
608
|
msgid "Submit"
|
|
613
609
|
msgstr ""
|
|
614
610
|
|
|
615
|
-
#: ../app/helpers/policies_helper.rb:
|
|
611
|
+
#: ../app/helpers/policies_helper.rb:115 ../app/views/arf_reports/_list.html.erb:53 ../webpack/components/ConfirmModal.js:27 ../webpack/routes/OvalContents/OvalContentsNew/OvalContentsNew.js:121 ../webpack/routes/OvalPolicies/OvalPoliciesNew/NewOvalPolicyForm.js:102
|
|
616
612
|
msgid "Cancel"
|
|
617
613
|
msgstr ""
|
|
618
614
|
|
|
@@ -1008,23 +1004,23 @@ msgstr ""
|
|
|
1008
1004
|
msgid "these Compliance reports"
|
|
1009
1005
|
msgstr ""
|
|
1010
1006
|
|
|
1011
|
-
#: ../app/views/arf_reports/show.html.erb:
|
|
1007
|
+
#: ../app/views/arf_reports/show.html.erb:14
|
|
1012
1008
|
msgid "Back"
|
|
1013
1009
|
msgstr ""
|
|
1014
1010
|
|
|
1015
|
-
#: ../app/views/arf_reports/show.html.erb:
|
|
1011
|
+
#: ../app/views/arf_reports/show.html.erb:16
|
|
1016
1012
|
msgid "Host details"
|
|
1017
1013
|
msgstr ""
|
|
1018
1014
|
|
|
1019
|
-
#: ../app/views/arf_reports/show.html.erb:
|
|
1015
|
+
#: ../app/views/arf_reports/show.html.erb:17
|
|
1020
1016
|
msgid "View full report"
|
|
1021
1017
|
msgstr ""
|
|
1022
1018
|
|
|
1023
|
-
#: ../app/views/arf_reports/show.html.erb:
|
|
1019
|
+
#: ../app/views/arf_reports/show.html.erb:18
|
|
1024
1020
|
msgid "Download XML in bzip"
|
|
1025
1021
|
msgstr ""
|
|
1026
1022
|
|
|
1027
|
-
#: ../app/views/arf_reports/show.html.erb:
|
|
1023
|
+
#: ../app/views/arf_reports/show.html.erb:19
|
|
1028
1024
|
msgid "Download HTML"
|
|
1029
1025
|
msgstr ""
|
|
1030
1026
|
|
|
@@ -1152,15 +1148,15 @@ msgstr ""
|
|
|
1152
1148
|
msgid "Choose period"
|
|
1153
1149
|
msgstr ""
|
|
1154
1150
|
|
|
1155
|
-
#: ../app/views/policies/_form.html.erb:47 ../app/views/policies/steps/_schedule_form.html.erb:
|
|
1151
|
+
#: ../app/views/policies/_form.html.erb:47 ../app/views/policies/steps/_schedule_form.html.erb:9
|
|
1156
1152
|
msgid "Choose weekday"
|
|
1157
1153
|
msgstr ""
|
|
1158
1154
|
|
|
1159
|
-
#: ../app/views/policies/_form.html.erb:48 ../app/views/policies/steps/_schedule_form.html.erb:
|
|
1155
|
+
#: ../app/views/policies/_form.html.erb:48 ../app/views/policies/steps/_schedule_form.html.erb:13
|
|
1160
1156
|
msgid "Number of a day in month, note that not all months have same count of days"
|
|
1161
1157
|
msgstr ""
|
|
1162
1158
|
|
|
1163
|
-
#: ../app/views/policies/_form.html.erb:49 ../app/views/policies/steps/_schedule_form.html.erb:
|
|
1159
|
+
#: ../app/views/policies/_form.html.erb:49 ../app/views/policies/steps/_schedule_form.html.erb:14
|
|
1164
1160
|
msgid "You can specify custom cron line, e.g. \"0 3 * * *\", separate each of 5 values by space"
|
|
1165
1161
|
msgstr ""
|
|
1166
1162
|
|
|
@@ -1224,7 +1220,11 @@ msgstr ""
|
|
|
1224
1220
|
msgid "Please make sure you understand them by reading our"
|
|
1225
1221
|
msgstr ""
|
|
1226
1222
|
|
|
1227
|
-
#: ../app/views/policies/steps/
|
|
1223
|
+
#: ../app/views/policies/steps/_deployment_options_form.html.erb:7
|
|
1224
|
+
msgid "documentation"
|
|
1225
|
+
msgstr ""
|
|
1226
|
+
|
|
1227
|
+
#: ../app/views/policies/steps/_schedule_form.html.erb:12
|
|
1228
1228
|
msgid "Choose day in month"
|
|
1229
1229
|
msgstr ""
|
|
1230
1230
|
|
|
Binary file
|