Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

allow optional string and map types #25

Merged
merged 3 commits into from
May 7, 2020
Merged

allow optional string and map types #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e3e2996
allow optional string and map types
jreidinger May 6, 2020
367ea1d
changes
jreidinger May 7, 2020
8a7ae7d
fix travis
jreidinger May 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ before_install:
script:
# the "yast-travis-ruby" script is included in the base yastdevel/ruby image
# see https://github.com/yast/docker-yast-ruby/blob/master/yast-travis-ruby
- docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-audit-laf-image yast-travis-ruby
- docker run -it --privileged -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-audit-laf-image yast-travis-ruby
7 changes: 7 additions & 0 deletions package/yast2-audit-laf.changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu May 7 13:02:36 UTC 2020 - Josef Reidinger <jreidinger@suse.com>

- Autoyast schema: Allow optional types for string and map objects
(bsc#1170886)
- 4.3.0

-------------------------------------------------------------------
Fri May 31 12:25:30 UTC 2019 - Stasiek Michalski <hellcp@mailbox.org>

Expand Down
2 changes: 1 addition & 1 deletion package/yast2-audit-laf.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

Name: yast2-audit-laf
Summary: YaST2 - Configuration of Linux Auditing (LAF)
Version: 4.2.0
Version: 4.3.0
Release: 0
Url: https://github.com/yast/yast-audit-laf
Group: System/YaST
Expand Down
61 changes: 34 additions & 27 deletions src/autoyast-rnc/audit-laf.rnc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,42 @@ default namespace = "http://www.suse.com/1.0/yast2ns"
namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
namespace config = "http://www.suse.com/1.0/configns"

include "common.rnc"

audit-laf = element audit-laf {
element auditd {
element action_mail_acct { text }? &
element admin_space_left { text }? &
element admin_space_left_action { text }? &
element disk_error_action { text }? &
element disk_full_action { text }? &
element disp_qos { text }? &
element dispatcher { text }? &
element flush { text }? &
element freq { text }? &
element log_file { text }? &
element log_format { text }? &
element log_group { text }? &
element max_log_file { text }? &
element max_log_file_action { text }? &
element name_format { text }? &
element num_logs { text }? &
element priority_boost { text }? &
element space_left { text }? &
element space_left_action { text }? &
element tcp_client_max_idle { text }? &
element tcp_client_ports { text }? &
element tcp_listen_port { text }? &
element tcp_listen_queue { text }? &
element tcp_max_per_addr { text }?
}? &
element rules { text }?
MAP,
(
element auditd {
MAP,
(
element action_mail_acct { STRING }? &
element admin_space_left { STRING }? &
element admin_space_left_action { STRING }? &
element disk_error_action { STRING }? &
element disk_full_action { STRING }? &
element disp_qos { STRING }? &
element dispatcher { STRING }? &
element flush { STRING }? &
element freq { STRING }? &
element log_file { STRING }? &
element log_format { STRING }? &
element log_group { STRING }? &
element max_log_file { STRING }? &
element max_log_file_action { STRING }? &
element name_format { STRING }? &
element num_logs { STRING }? &
element priority_boost { STRING }? &
element space_left { STRING }? &
element space_left_action { STRING }? &
element tcp_client_max_idle { STRING }? &
element tcp_client_ports { STRING }? &
element tcp_listen_port { STRING }? &
element tcp_listen_queue { STRING }? &
element tcp_max_per_addr { STRING }?
)
}? &
element rules { STRING }?
)
}