add comments to launcher.conf

4 files changed, 31 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ac25d578b69b..38cb86e3d04d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = kolide-launcher-git
 	pkgdesc = osquery command and control
-	pkgver = v0.11.6.r2.g0cdd690
+	pkgver = v0.11.22.r4.g554bd92
 	pkgrel = 1
 	url = https://www.kolide.co/
 	arch = x86_64
@@ -13,8 +13,7 @@ pkgbase = kolide-launcher-git
 	source = launcher.conf
 	source = kolide-launcher.service
 	sha256sums = SKIP
-	sha256sums = 84e6c43518ae8e0fb8a94a954fcb7bb56df8f14d4adb7916913d2635f1bdac9c
-	sha256sums = 6b0f9ec82302b7cf52e1710668f2b84ccce84d917cefa2ed32557eb1673972dc
+	sha256sums = 424544443f3165e37622b8e1f3ca4280c39d85bf46c061477891ec75a38bc5e1
+	sha256sums = f8f6e60c417aff696c531ef000035feb982f76a5a0767aed5501819aa44255fb
 
 pkgname = kolide-launcher-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 9a9ba25ea027..12415df3c12c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Matt Geskey <matt@celtra.com>
 pkgname=kolide-launcher-git
-pkgver=v0.11.6.r2.g0cdd690
+pkgver=v0.11.22.r4.g554bd92
 pkgrel=1
 pkgdesc="osquery command and control"
 url="https://www.kolide.co/"
@@ -15,8 +15,8 @@ source=("${pkgname}::git+https://github.com/kolide/launcher.git"
 )
 backup=("etc/kolide/launcher.conf")
 sha256sums=("SKIP"
-            "84e6c43518ae8e0fb8a94a954fcb7bb56df8f14d4adb7916913d2635f1bdac9c"
-            "6b0f9ec82302b7cf52e1710668f2b84ccce84d917cefa2ed32557eb1673972dc"
+            "424544443f3165e37622b8e1f3ca4280c39d85bf46c061477891ec75a38bc5e1"
+            "f8f6e60c417aff696c531ef000035feb982f76a5a0767aed5501819aa44255fb"
 )
 
 pkgver() {
diff --git a/kolide-launcher.service b/kolide-launcher.service
index 434cb92ab2eb..15a6b764b72e 100644
--- a/kolide-launcher.service
+++ b/kolide-launcher.service
@@ -4,7 +4,7 @@ After=network.service syslog.service
 
 [Service]
 ExecStart=/usr/bin/kolide-launcher \
-	-config /etc/kolide/launcher.conf
+          -config /etc/kolide/launcher.conf
 Restart=on-failure
 RestartSec=3
 
diff --git a/launcher.conf b/launcher.conf
index e908a35ae157..0792dd978a05 100644
--- a/launcher.conf
+++ b/launcher.conf
@@ -1,5 +1,27 @@
-# A list of flags and arguments to be passed to kolide-launcher
+# A list of command-line flags and arguments to be passed to kolide-launcher
+# These should be provided by your fleet manager
 
-with_initial_runner
+
+# The transport protocol that should be used to communicate with remote (default: grpc)
+#transport grpc
+# The hostname of the gRPC server
+#hostname k2device.kolide.com
+
+# The location of the local database, pidfiles, etc.
 root_directory /var/lib/kolide
+
+# Whether or not the osquery autoupdater is enabled
+# This will download and replace the binary at `osqueryd_path`
+#autoupdate
+# Path to the osqueryd binary to use (Default: find osqueryd in $PATH)
 osqueryd_path /usr/bin/osqueryd
+
+# Whether or not the control server is enabled (default: false)
+#control
+# The hostname of the control server
+#control_hostname k2control.kolide.com
+
+# The enroll secret that is used in your environment
+#enroll_secret 32IeN3QLgckHUmMD3iW40kyLdNJcGzP5
+# Optionally, the path to your enrollment secret
+#enroll_secret_path /etc/kolide/secret