CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-08 02:02:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

changes for desktop referencing Rocky/CentOS to OEL

Browse Source
This commit is contained in:
m0duspwnens
2023-08-09 08:06:51 -04:00
parent 00efc2f88f
commit 1440c72559
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
salt/common/tools/sbin_jinja/so-desktop-install
View File

@@ -6,8 +6,8 @@
# Elastic License 2.0. # Elastic License 2.0.
{# we only want the script to install the desktop if it is Rocky -#} {# we only want the script to install the desktop if it is OEL -#}
{% if grains.os == 'Rocky' -%} {% if grains.os == 'OEL' -%}
{# if this is a manager -#} {# if this is a manager -#}
{% if grains.master == grains.id.split('_')|first -%} {% if grains.master == grains.id.split('_')|first -%}
@@ -80,12 +80,12 @@ echo "Since this is not a manager, the pillar values to enable Security Onion De
{#- endif if this is a manager #} {#- endif if this is a manager #}
{% endif -%} {% endif -%}
{#- if not Rocky #} {#- if not OEL #}
{%- else %} {%- else %}
echo "The Security Onion Desktop can only be installed on Rocky Linux. Please view the documentation at $doc_desktop_url." echo "The Security Onion Desktop can only be installed on Oracle Linux. Please view the documentation at $doc_desktop_url."
{#- endif grains.os == Rocky #} {#- endif grains.os == OEL #}
{% endif -%} {% endif -%}
exit 0 exit 0

2
salt/desktop/trusted-ca.sls
View File

@@ -31,6 +31,6 @@ update_ca_certs:
desktop_trusted-ca_os_fail: desktop_trusted-ca_os_fail:
test.fail_without_changes: test.fail_without_changes:
- comment: 'SO Desktop can only be installed on CentOS' - comment: 'SO Desktop can only be installed on Oracle Linux'
{% endif %} {% endif %}

4
salt/top.sls
View File

@@ -277,10 +277,10 @@ base:
- schedule - schedule
- docker_clean - docker_clean
'J@desktop:gui:enabled:^[Tt][Rr][Uu][Ee]$ and ( G@saltversion:{{saltversion}} and G@os:Rocky )': 'J@desktop:gui:enabled:^[Tt][Rr][Uu][Ee]$ and ( G@saltversion:{{saltversion}} and G@os:OEL )':
- match: compound - match: compound
- desktop - desktop
'J@desktop:gui:enabled:^[Ff][Aa][Ll][Ss][Ee]$ and ( G@saltversion:{{saltversion}} and G@os:Rocky )': 'J@desktop:gui:enabled:^[Ff][Aa][Ll][Ss][Ee]$ and ( G@saltversion:{{saltversion}} and G@os:OEL )':
- match: compound - match: compound
- desktop.remove_gui - desktop.remove_gui