diff --git a/shared/applicability/package.yml b/shared/applicability/package.yml index 501e0b855e5..de1d67f5256 100644 --- a/shared/applicability/package.yml +++ b/shared/applicability/package.yml @@ -2,9 +2,9 @@ name: "cpe:/a:{arg}" title: "Package {pkgname} is installed" bash_conditional: {{{ bash_pkg_conditional("{pkgname}") }}} ansible_conditional: {{{ ansible_pkg_conditional("{pkgname}") }}} -check_id: cond_package_{arg} +check_id: platform_package_{arg} template: - name: cond_package + name: platform_package args: ntp: pkgname: ntp diff --git a/shared/templates/cond_package/oval.template b/shared/templates/cond_package/oval.template deleted file mode 100644 index 7f071d79392..00000000000 --- a/shared/templates/cond_package/oval.template +++ /dev/null @@ -1,11 +0,0 @@ - - - {{{ oval_metadata("The " + pkg_system|upper + " package " + PKGNAME + " should be installed.", affected_platforms=["multi_platform_all"]) }}} - - - - -{{{ oval_test_package_installed(package=PKGNAME, test_id="cond_test_" + _RULE_ID + "_installed") }}} - diff --git a/shared/templates/platform_package/oval.template b/shared/templates/platform_package/oval.template new file mode 100644 index 00000000000..5d15cbad39e --- /dev/null +++ b/shared/templates/platform_package/oval.template @@ -0,0 +1,11 @@ + + + {{{ oval_metadata("The " + pkg_system|upper + " package " + PKGNAME + " should be installed.", affected_platforms=["multi_platform_all"]) }}} + + + + +{{{ oval_test_package_installed(package=PKGNAME, test_id="platform_test_" + _RULE_ID + "_installed") }}} + diff --git a/shared/templates/cond_package/template.yml b/shared/templates/platform_package/template.yml similarity index 100% rename from shared/templates/cond_package/template.yml rename to shared/templates/platform_package/template.yml