Update to reflect new fleet repo

6 files changed, 86 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6364e481a715..82d7642c9a3d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,27 @@
 pkgbase = kolide-git
 	pkgdesc = osquery command and control
-	pkgver = r63.90fd51a
+	pkgver = r891.c08ba5ed
 	pkgrel = 1
 	url = https://www.kolide.co/
 	install = kolide.install
 	arch = x86_64
 	arch = i686
-	license = Apache
+	license = MIT
 	makedepends = go
 	makedepends = go-bindata
-	optdepends = osquery-git
-	optdepends = postgresql
-	optdepends = sqlite
-	source = kolide::git+https://github.com/kolide/kolide-archive.git
+	makedepends = nodejs-webpack
+	makedepends = yarn
+	depends = osquery-git
+	depends = mysql
+	depends = redis
+	source = kolide::git+https://github.com/kolide/fleet.git
 	source = kolide.sysusers
-	md5sums = SKIP
-	md5sums = 4934e838c831a12242550ae5e762a77a
+	source = kolide.conf.d
+	source = kolide.service
+	sha256sums = SKIP
+	sha256sums = 3a76a40ee8b7e3b35f9bed7427874627d90574266994c740e8472b9010a5d410
+	sha256sums = 5def2c2a76ec625ce77859597fbdb9d1b3271fdef76e93988220c7e63e84aa51
+	sha256sums = 3e336962a204f979110a4273a4277ca5117441029a32cf2a5dd042d6c734a522
 
 pkgname = kolide-git
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..6505fa29e1c7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+src
+pkg
+kolide
+*pkg.tar.xz
diff --git a/PKGBUILD b/PKGBUILD
index d0ce0829aa6d..3174c74c5bd7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,49 +1,57 @@
 # Maintainer: Tony Lambiris <tony@criticalstack.com>
 pkgname=kolide-git
-pkgver=r63.90fd51a
 _pkgname=kolide
+pkgver=r891.c08ba5ed
 pkgrel=1
 pkgdesc="osquery command and control"
 url="https://www.kolide.co/"
 arch=('x86_64' 'i686')
-license=('Apache')
-optdepends=('osquery-git' 'postgresql' 'sqlite')
-makedepends=('go' 'go-bindata')
+license=('MIT')
+depends=('osquery-git' 'mysql' 'redis')
+makedepends=('go' 'go-bindata' 'nodejs-webpack' 'yarn')
 install="kolide.install"
-source=("${_pkgname}::git+https://github.com/kolide/kolide-archive.git" "kolide.sysusers")
-
-md5sums=('SKIP'
-         '4934e838c831a12242550ae5e762a77a')
+source=("${_pkgname}::git+https://github.com/kolide/fleet.git"
+        "kolide.sysusers" "kolide.conf.d" "kolide.service")
+sha256sums=('SKIP'
+            '3a76a40ee8b7e3b35f9bed7427874627d90574266994c740e8472b9010a5d410'
+            '5def2c2a76ec625ce77859597fbdb9d1b3271fdef76e93988220c7e63e84aa51'
+            '3e336962a204f979110a4273a4277ca5117441029a32cf2a5dd042d6c734a522')
 
 pkgver() {
 	cd "${srcdir}/${_pkgname}"
+
 	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 prepare() {
-	cd "${srcdir}"
+	cd "${srcdir}/${_pkgname}"
+
+	install -m755 -d "${srcdir}/go/src/github.com/kolide"
 
-	mkdir -p "go/src/github.com/kolide"
-	ln -sf "${srcdir}/${_pkgname}" "go/src/github.com/kolide/kolide"
+	cp -a "${srcdir}/${_pkgname}" "${srcdir}/go/src/github.com/kolide/fleet"
 }
 
 build() {
-	cd "${srcdir}/go/src/github.com/kolide/kolide"
+	cd "${srcdir}/go/src/github.com/kolide/fleet"
 
-	sed -i -re 's/^build: .*$/build: banner generate/g' Makefile
-	GOROOT="/usr/lib/go" GOPATH="${srcdir}/go" PATH="$PATH:$GOPATH/bin" make deps build
+	GOPATH="${srcdir}/go" make deps
+	GOPATH="${srcdir}/go" make generate
+	GOPATH="${srcdir}/go" make
+
+	./build/fleet version --full
 }
 
 package() {
-	cd "${srcdir}/go/src/github.com/kolide/kolide"
+	cd "${srcdir}/go/src/github.com/kolide/fleet"
+
+	install -Dm644 "${srcdir}/kolide.sysusers" \
+		"${pkgdir}/usr/lib/sysusers.d/kolide.conf"
 
-	install -Dm644 "${srcdir}/${_pkgname}.sysusers" \
-		"${pkgdir}/usr/lib/sysusers.d/${_pkgname}.conf"
-	install -Dm644 "shared/kolide.service" \
+	install -Dm644 "${srcdir}/kolide.service" \
 		"${pkgdir}/usr/lib/systemd/system/kolide.service"
-	install -Dm644 "shared/kolide.toml" \
-		"${pkgdir}/etc/${_pkgname}/kolide.toml"
-	install -Dm644 "LICENSE" \
-		"${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
-	install -Dm755 "bin/kolide" "${pkgdir}/usr/bin/kolide"
+
+	install -Dm644 "${srcdir}/kolide.conf.d" "${pkgdir}/etc/conf.d/kolide"
+	install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/kolide/LICENSE"
+
+	install -Dm755 "build/fleet" "${pkgdir}/usr/bin/fleet"
 }
diff --git a/kolide.conf.d b/kolide.conf.d
new file mode 100644
index 000000000000..e9cce7ae88d6
--- /dev/null
+++ b/kolide.conf.d
@@ -0,0 +1,8 @@
+KOLIDE_MYSQL_ADDRESS=127.0.0.1:3306
+KOLIDE_MYSQL_DATABASE=kolide
+KOLIDE_MYSQL_USERNAME=root
+KOLIDE_MYSQL_PASSWORD=toor
+KOLIDE_REDIS_ADDRESS=127.0.0.1:6379
+KOLIDE_SERVER_CERT=/tmp/server.cert
+KOLIDE_SERVER_KEY=/tmp/server.key
+KOLIDE_LOGGING_JSON=true
diff --git a/kolide.install b/kolide.install
index 758500bd5723..dbc98cb4b5bd 100644
--- a/kolide.install
+++ b/kolide.install
@@ -1,7 +1,21 @@
+display_requirements () {
+cat <<-EOF
+
+	Configuration parameters can be found in:
+	/etc/conf.d/kolide
+
+	After everything is setup, as root run:
+	systemctl enable --now kolide.service
+
+EOF
+}
+
 post_install() {
 	systemd-sysusers kolide.conf
+
+	display_requirements
 }
 
 post_upgrade() {
-  post_install
+	post_install
 }
diff --git a/kolide.service b/kolide.service
new file mode 100644
index 000000000000..0e30a7dd70b8
--- /dev/null
+++ b/kolide.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=The kolide fleet daemon
+After=network.service
+
+[Service]
+User=kolide
+EnvironmentFile=/etc/conf.d/kolide
+ExecStart=/usr/bin/fleet serve
+Restart=on-failure
+KillMode=process
+KillSignal=SIGTERM
+
+[Install]
+WantedBy=multi-user.target