Add service and install

5 files changed, 62 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5f8795ff87d0..18f76393bfb1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,11 @@
 # Generated by mksrcinfo v8
-# Sun Dec 27 08:45:07 UTC 2015
+# Tue Feb  2 14:26:54 UTC 2016
 pkgbase = heka-git
 	pkgdesc = Data collection and processing made easy
 	pkgver = r1
 	pkgrel = 1
 	url = https://github.com/mozilla-services/heka
+	install = heka.install
 	arch = i686
 	arch = x86_64
 	license = MPL2
@@ -19,10 +20,12 @@ pkgbase = heka-git
 	optdepends = geoip-citydata: GeoIpDecoder
 	provides = heka
 	conflicts = heka
-	source = heka::git+https://github.com/mozilla-services/heka.git
+	source = heka::git+https://github.com/mozilla-services/heka.git#tag=vr1
+	source = heka.service
 	source = cmake.patch
 	sha512sums = SKIP
 	sha512sums = SKIP
+	sha512sums = SKIP
 
 pkgname = heka-git
 
diff --git a/PKGBUILD b/PKGBUILD
index aab3d7146266..c09d7cb2d3a4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,14 +22,18 @@ provides=("${pkgname[0]%-git}")
 conflicts=("${pkgname[0]%-git}")
 
 source=(
-    "${srcname}::git+https://github.com/mozilla-services/${srcname}.git"
-    "cmake.patch"
+    "${srcname}::git+https://github.com/mozilla-services/${srcname}.git#tag=v${pkgver}"
+    'heka.service'
+    'cmake.patch'
 )
 sha512sums=(
     'SKIP'
     'SKIP'
+    'SKIP'
 )
 
+install='heka.install'
+
 pkgver() {
     cd "${srcdir}/${srcname}"
 
@@ -45,36 +49,36 @@ prepare() {
 }
 
 build() {
-    cd "${srcdir}/${srcname}"
+    path_build="${srcdir}/build"
+    mkdir --parents "${path_build}"
+    cd "${path_build}"
 
-    BUILD_DIR="${PWD}/build"
-    export GOPATH="${BUILD_DIR}/heka"
+    export GOPATH="${path_build}/heka"
+    export LD_LIBRARY_PATH="${GOPATH}/lib"
+    export DYLD_LIBRARY_PATH="${GOPATH}/lib"
     export GOBIN="${GOPATH}/bin"
     export PATH="${GOBIN}:${PATH}"
-    export LD_LIBRARY_PATH="${BUILD_DIR}/heka/lib"
     export CTEST_OUTPUT_ON_FAILURE=1
 
-    mkdir --parents "${BUILD_DIR}"
-    cd "${BUILD_DIR}"
     cmake \
         -DCMAKE_INSTALL_PREFIX='/usr' \
         -DCMAKE_BUILD_TYPE='release' \
         -DHEKA_PATH='/usr/share/heka' \
-        ..
+        "${srcdir}/${srcname}"
     make
 }
 
 package() {
-    cd "${srcdir}/${srcname}"
+    path_build="${srcdir}/build"
+    cd "${path_build}"
 
-    BUILD_DIR="${PWD}/build"
-    export GOPATH="${BUILD_DIR}/heka"
+    export GOPATH="${path_build}/heka"
     export GOBIN="${GOPATH}/bin"
     export PATH="${GOBIN}:${PATH}"
 
-    cd "${BUILD_DIR}"
     make DESTDIR="${pkgdir}" install
 
-    install -D --directory "${pkgdir}/var/cache/hekad"
-    install -D --directory "${pkgdir}/etc/heka/conf.d"
+    install --owner='533' --group='533' --mode='750' --directory "${pkgdir}/var/cache/hekad"
+    install --directory "${pkgdir}/etc/heka/conf.d"
+    install -D --mode='644' "${srcdir}/heka.service" "${pkgdir}/usr/lib/systemd/system/heka.service"
 }
diff --git a/cmake.patch b/cmake.patch
index efb74661513e..d82b5870650b 100644
--- a/cmake.patch
+++ b/cmake.patch
@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index dfabba7..c1a0ffc 100644
+index 7f42228..0324223 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -19,7 +19,6 @@ find_package(Go 1.4 REQUIRED)
@@ -10,3 +10,15 @@ index dfabba7..c1a0ffc 100644
  set(PROJECT_PATH "${CMAKE_BINARY_DIR}/heka")
  set(HEKA_PATH "${PROJECT_PATH}/src/github.com/mozilla-services/heka")
  set(LUA_INCLUDE_PATH "${PROJECT_PATH}/include")
+@@ -289,9 +288,9 @@ endif()
+ if (INCLUDE_MOZSVC)
+     add_test(mozsvc ${GO_EXECUTABLE} test ${BENCHMARK_FLAG} ${COVERAGE_FLAG} github.com/mozilla-services/heka-mozsvc-plugins)
+ endif()
+-install(FILES "${HEKA_PATH}/cmd/heka-sbmgr/sbmgr.toml" "${HEKA_PATH}/cmd/heka-sbmgr/hekad.toml.sbmgr" DESTINATION bin)
++install(FILES "${HEKA_PATH}/cmd/heka-sbmgr/sbmgr.toml" "${HEKA_PATH}/cmd/heka-sbmgr/hekad.toml.sbmgr" DESTINATION "share/${CMAKE_PROJECT_NAME}/examples")
+ if(INCLUDE_SANDBOX)
+-install(FILES "${HEKA_PATH}/sandbox/lua/testsupport/hekabench_cbuf_counter.lua" DESTINATION bin)
++install(FILES "${HEKA_PATH}/sandbox/lua/testsupport/hekabench_cbuf_counter.lua" DESTINATION "share/${CMAKE_PROJECT_NAME}/examples")
+ endif()
+ install(FILES "${CMAKE_SOURCE_DIR}/LICENSE.txt" DESTINATION "share/${CMAKE_PROJECT_NAME}")
+ install(DIRECTORY "${CMAKE_SOURCE_DIR}/dasher" DESTINATION "share/${CMAKE_PROJECT_NAME}")
diff --git a/heka.install b/heka.install
new file mode 100644
index 000000000000..8f3a4baad4f5
--- /dev/null
+++ b/heka.install
@@ -0,0 +1,9 @@
+post_install() {
+    groupadd --gid 533 heka &>/dev/null
+    useradd --uid 533 --gid 533 --home-dir / --shell /bin/false heka &>/dev/null
+}
+
+post_remove() {
+    getent passwd heka &>/dev/null && userdel heka >/dev/null
+    getent group heka &>/dev/null && groupdel heka >/dev/null
+}
diff --git a/heka.service b/heka.service
new file mode 100644
index 000000000000..101922f2face
--- /dev/null
+++ b/heka.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=heka - data collector and processor daemon
+After=network.target auditd.service
+
+[Service]
+User=heka
+Group=heka
+
+Restart=on-failure
+
+ExecStart=/usr/bin/hekad -config=/etc/heka/conf.d/
+
+ExecReload=/usr/bin/kill --signal HUP ${MAINPID}
+
+[Install]
+WantedBy=multi-user.target