From ff4c34b5fafc6fcaaef26c75afc6fbb133e1c91d Mon Sep 17 00:00:00 2001 From: Josh Brower Date: Sat, 27 Apr 2019 08:17:54 -0400 Subject: [PATCH 1/3] Update `Generated` timestamp on both confg & src files Otherwise /opt/so/conf/fleet/packages/index.html gets overwritten. --- salt/fleet/so-fleet-setup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/salt/fleet/so-fleet-setup.sh b/salt/fleet/so-fleet-setup.sh index 2d438a973..548e1d2ec 100644 --- a/salt/fleet/so-fleet-setup.sh +++ b/salt/fleet/so-fleet-setup.sh @@ -30,6 +30,7 @@ docker run \ #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 echo "Fleet Setup Complete - Login here: https://$1" echo "Your username is $2 and your password is $initpw" From e5ac4cb7113a391670d3dbfc988bb5ba5fe82968 Mon Sep 17 00:00:00 2001 From: Josh Brower Date: Sat, 27 Apr 2019 08:36:26 -0400 Subject: [PATCH 2/3] Added missing packs --- salt/fleet/so-fleet-setup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/salt/fleet/so-fleet-setup.sh b/salt/fleet/so-fleet-setup.sh index 548e1d2ec..bc1f208bd 100644 --- a/salt/fleet/so-fleet-setup.sh +++ b/salt/fleet/so-fleet-setup.sh @@ -14,6 +14,7 @@ docker exec so-fleet fleetctl apply -f /packs/palantir/Fleet/Endpoints/options.y docker exec so-fleet fleetctl apply -f /packs/palantir/Fleet/Endpoints/MacOS/osquery.yaml docker exec so-fleet fleetctl apply -f /packs/palantir/Fleet/Endpoints/Windows/osquery.yaml docker exec so-fleet fleetctl apply -f /packs/hh/hhdefault.yml +docker exec so-fleet /bin/sh -c 'for pack in /packs/palantir/Fleet/Endpoints/packs/*.yaml; do fleetctl apply -f "$pack"; done' esecret=$(sudo docker exec so-fleet fleetctl get enroll-secret) From c23153b91e8a7e492a16bd4605dc859ab547949c Mon Sep 17 00:00:00 2001 From: Josh Brower Date: Sun, 28 Apr 2019 14:50:30 -0400 Subject: [PATCH 3/3] Install osquery locally --- salt/fleet/so-fleet-setup.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/salt/fleet/so-fleet-setup.sh b/salt/fleet/so-fleet-setup.sh index bc1f208bd..eb2ad0d96 100644 --- a/salt/fleet/so-fleet-setup.sh +++ b/salt/fleet/so-fleet-setup.sh @@ -33,5 +33,12 @@ docker run \ 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 +#Install osquery locally +if cat /etc/os-release | grep -q 'debian'; then + dpkg -i /opt/so/conf/fleet/packages/launcher.deb +else + rpm -i /opt/so/conf/fleet/packages/launcher.rpm +fi + echo "Fleet Setup Complete - Login here: https://$1" echo "Your username is $2 and your password is $initpw"