If you’re trying to do this regularly, you should probably figure out packaging systems for real. If you want a one off, you can use wix’s dark.exe to decompile an MSI into the wix xml, then re-compile it with the changes you want.

If you’re trying to do this regularly, you should probably figure out packaging systems for real.

Are there any docs on that anywhere? I'm just finding lots of old blogs from 2009 to 2012 talking about "orca", "super orca", "insted" but nothing that looks... reasonable for packaging this on an ongoing basis. And for the one-off version... I've decompiled it, edited the

package/wix

files to add what I need and edited

osquery-<version>.wsx

to add those files, but I don't know what wix command to run to actually build them.

I have not tried this method with dark.exe... The way I've done this successfully is by taking the script generated by

make_windows_package.ps1

, modifying to suit my needs, and building with candle and light. Possibly you just need to add some

PropertyRef

elements or something to make that one work?

ah, okay, I'll try that, gotta get Buck builds working I guess 🤷

Shouldn't be any need to get any build working for that...

PS C:\osquery> .\tools\deployment\make_windows_package.ps1
[-] Did not find build directory at C:\osquery\tools\deployment\..\..\buck-out\release\gen\osquery. Check build script output.

@zwass that's what I'm getting when I try to run it

I find it convenient to use 7zip to extract the osqueryd.exe from the MSI package, then use that in the wix bundling.

The wix xml should work wherever you get it. The powershell sxript, dark, or hand writing it.

I ended up figuring it out by creating a

custom

directory with my flag file and enrollment secret, then adding this patch:

diff --git a/cmake/packaging.cmake b/cmake/packaging.cmake
index 73bc1b6a..9e83f888 100644
--- a/cmake/packaging.cmake
+++ b/cmake/packaging.cmake
@@ -209,9 +209,12 @@ function(generateInstallTargets)
     file(COPY "${CMAKE_SOURCE_DIR}/tools/provision/chocolatey/osquery_utils.ps1" DESTINATION "${CMAKE_BINARY_DIR}/package/wix")
     install(FILES "${CMAKE_BINARY_DIR}/package/wix/osquery_utils.ps1" DESTINATION .)
 
-    file(WRITE "${CMAKE_BINARY_DIR}/package/wix/osquery.flags")
+    file(COPY "${CMAKE_SOURCE_DIR}/custom/osquery.flags" DESTINATION "${CMAKE_BINARY_DIR}/package/wix")
     install(FILES "${CMAKE_BINARY_DIR}/package/wix/osquery.flags" DESTINATION .)
 
+    file(COPY "${CMAKE_SOURCE_DIR}/custom/kolide.enrollment_secret" DESTINATION "${CMAKE_BINARY_DIR}/package/wix")
+    install(FILES "${CMAKE_BINARY_DIR}/package/wix/kolide.enrollment_secret" DESTINATION .)
+
     # osqueryd
     install(TARGETS osqueryd DESTINATION osqueryd)
 
diff --git a/cmake/wix_patches/osquery_wix_patch.xml b/cmake/wix_patches/osquery_wix_patch.xml
index bfb25032..41613f89 100644
--- a/cmake/wix_patches/osquery_wix_patch.xml
+++ b/cmake/wix_patches/osquery_wix_patch.xml
@@ -11,7 +11,7 @@
         <ServiceInstall Id='osqueryd'
             Name='osqueryd'
             Account='NT AUTHORITY\SYSTEM'
-            Arguments='--flagfile="[INSTALL_ROOT]osquery.flags"'
+            Arguments='--flagfile="[INSTALL_ROOT]osquery.flags" --enroll_secret_path="[INSTALL_ROOT]kolide.enrollment_secret"'
             Start='auto'
             Type='ownProcess'
             Vital='yes'
@@ -28,4 +28,4 @@
         <PropertyRef Id="WIX_ACCOUNT_USERS" />
         <PropertyRef Id="WIX_ACCOUNT_ADMINISTRATORS" />
     </CPackWiXFragment>
-</CPackWiXPatch>
\ No newline at end of file
+</CPackWiXPatch>

I updated the docs on https://github.com/dactivllc/docker-wix and included an example of how you can build an MSI from any Docker host. It shouldn't be too difficult to move to building your MSI with that container if you have a working

.wxs

file.

wine is 32bit, right? Does that cause any weirdness in the resultant packages?

Wine can be 32 or 64 bit. WiX is 32 bit. I have not found any issue with the packages.

If you dig through the launcher repo, you can find the ossltool invocations