From e895d8509b58bd3df3164e19f36e0ed3a732d409 Mon Sep 17 00:00:00 2001 From: Josh Brower Date: Tue, 19 Nov 2019 14:06:12 -0500 Subject: [PATCH 1/4] append /fleet to osquery client config --- salt/fleet/so-fleet-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/fleet/so-fleet-setup.sh b/salt/fleet/so-fleet-setup.sh index 5f6dcb949..c20e5a0fc 100644 --- a/salt/fleet/so-fleet-setup.sh +++ b/salt/fleet/so-fleet-setup.sh @@ -29,7 +29,7 @@ docker run \ --rm \ --mount type=bind,source=/opt/so/conf/fleet/packages,target=/output \ --mount type=bind,source=/etc/pki/launcher.crt,target=/var/launcher/launcher.crt \ - docker.io/soshybridhunter/so-fleet-launcher:HH1.1.0 "$esecret" "$1":8080 + docker.io/soshybridhunter/so-fleet-launcher:HH1.1.0 "$esecret" "$1":8080/fleet cp /opt/so/conf/fleet/packages/launcher.* /opt/so/saltstack/salt/launcher/packages/ #Update timestamp on packages webpage From 118f4e34f20230bd0cdb24db4a1a2282941b5d01 Mon Sep 17 00:00:00 2001 From: Josh Brower Date: Tue, 19 Nov 2019 14:33:51 -0500 Subject: [PATCH 2/4] Update nginx.conf.so-eval --- salt/common/nginx/nginx.conf.so-eval | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/salt/common/nginx/nginx.conf.so-eval b/salt/common/nginx/nginx.conf.so-eval index fe55dc274..41f455216 100644 --- a/salt/common/nginx/nginx.conf.so-eval +++ b/salt/common/nginx/nginx.conf.so-eval @@ -152,10 +152,7 @@ http { } location /fleet/ { - auth_basic "Security Onion"; - auth_basic_user_file /opt/so/conf/nginx/.htpasswd; - rewrite /fleet/(.*) /$1 break; - proxy_pass https://{{ masterip }}:8080/; + proxy_pass https://{{ masterip }}:8080/fleet/; proxy_read_timeout 90; proxy_connect_timeout 90; proxy_set_header Host $host; From 185dd7983c525d85dec833c26434b72849d01187 Mon Sep 17 00:00:00 2001 From: Josh Brower Date: Tue, 26 Nov 2019 08:28:06 -0500 Subject: [PATCH 3/4] Update so-fleet-setup.sh --- salt/fleet/so-fleet-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/fleet/so-fleet-setup.sh b/salt/fleet/so-fleet-setup.sh index c20e5a0fc..7054d859d 100644 --- a/salt/fleet/so-fleet-setup.sh +++ b/salt/fleet/so-fleet-setup.sh @@ -7,7 +7,7 @@ fi initpw=$(date +%s | sha256sum | base64 | head -c 16 ; echo) -docker exec so-fleet fleetctl config set --address https://$1:443 --tls-skip-verify +docker exec so-fleet fleetctl config set --address https://$1:443 --tls-skip-verify --url-prefix /fleet docker exec so-fleet fleetctl setup --email $2 --password $initpw docker exec so-fleet fleetctl apply -f /packs/palantir/Fleet/Endpoints/options.yaml From f36d7b692670a4087bb2b0561357587e755c1a97 Mon Sep 17 00:00:00 2001 From: Josh Brower Date: Tue, 26 Nov 2019 10:28:48 -0500 Subject: [PATCH 4/4] Update so-fleet-setup.sh --- salt/fleet/so-fleet-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/fleet/so-fleet-setup.sh b/salt/fleet/so-fleet-setup.sh index 7054d859d..32bbddbe7 100644 --- a/salt/fleet/so-fleet-setup.sh +++ b/salt/fleet/so-fleet-setup.sh @@ -29,7 +29,7 @@ docker run \ --rm \ --mount type=bind,source=/opt/so/conf/fleet/packages,target=/output \ --mount type=bind,source=/etc/pki/launcher.crt,target=/var/launcher/launcher.crt \ - docker.io/soshybridhunter/so-fleet-launcher:HH1.1.0 "$esecret" "$1":8080/fleet + docker.io/soshybridhunter/so-fleet-launcher:HH1.1.0 "$esecret" "$1":8080 cp /opt/so/conf/fleet/packages/launcher.* /opt/so/saltstack/salt/launcher/packages/ #Update timestamp on packages webpage