From 8767f1732538d4062ddd60919df24eca81ff8a62 Mon Sep 17 00:00:00 2001 From: Jason Ertel Date: Tue, 31 Mar 2020 17:43:03 -0400 Subject: [PATCH] Removed obsolete osquery-packages.html since it's now in soc --- salt/fleet/files/osquery-packages.html | 133 --------------------- salt/fleet/files/scripts/so-fleet-packages | 2 +- salt/fleet/init.sls | 4 - 3 files changed, 1 insertion(+), 138 deletions(-) delete mode 100644 salt/fleet/files/osquery-packages.html diff --git a/salt/fleet/files/osquery-packages.html b/salt/fleet/files/osquery-packages.html deleted file mode 100644 index a64e6a2df..000000000 --- a/salt/fleet/files/osquery-packages.html +++ /dev/null @@ -1,133 +0,0 @@ -{%- set PACKAGESTS = salt['pillar.get']('static:fleet_packages-timestamp:', 'N/A') -%} - - - -Security Onion - Hybrid Hunter - - - - - - - -
- - -
-

-

-

Osquery Packages

-
-
-

Notes

-
    -
  • These packages are customized for this specific Fleet install and will only be generated after the Fleet setup script has been run. If you want vanilla osquery packages, you can get them directly from osquery.io
  • -
  • Packages are not signed.
  • -
-
-

Downloads

-
- Generated: {{ PACKAGESTS }} -
-
- Packages: - -
-
- Config Files: - -
-
-

Known Issues

-
    -
  • None
  • -
-

-
-
- - diff --git a/salt/fleet/files/scripts/so-fleet-packages b/salt/fleet/files/scripts/so-fleet-packages index eed4bfb71..49f3eebcd 100644 --- a/salt/fleet/files/scripts/so-fleet-packages +++ b/salt/fleet/files/scripts/so-fleet-packages @@ -30,4 +30,4 @@ cp /opt/so/conf/fleet/packages/launcher.* /opt/so/saltstack/salt/launcher/packag #Update timestamp on packages webpage sed -i "s@.*Generated.*@Generated: $(date '+%m%d%Y')@g" /opt/so/conf/fleet/packages/index.html -sed -i "s@.*Generated.*@Generated: $(date '+%m%d%Y')@g" /opt/so/saltstack/salt/fleet/osquery-packages.html \ No newline at end of file +sed -i "s@.*Generated.*@Generated: $(date '+%m%d%Y')@g" /opt/so/saltstack/salt/fleet/files/dedicated-index.html \ No newline at end of file diff --git a/salt/fleet/init.sls b/salt/fleet/init.sls index 9d89afca2..9a6ba0330 100644 --- a/salt/fleet/init.sls +++ b/salt/fleet/init.sls @@ -76,11 +76,7 @@ fleetsetupscripts: osquerypackageswebpage: file.managed: - name: /opt/so/conf/fleet/packages/index.html -{% if FLEETARCH == "so-fleet" %} - source: salt://fleet/files/dedicated-index.html -{% else %} - - source: salt://fleet/files/osquery-packages.html -{% endif %} - template: jinja fleetdb: