fix bug

5 files changed, 15 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6fccdea51c8a..0692e6d787a5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -25,8 +25,8 @@ pkgbase = apache-flink
 	source = apache-flink-jobmanager.service
 	source = apache-flink-taskmanager@.service
 	md5sums = 792225bf4256b8ae2b2d9582a505c41c
-	md5sums = ee79b5786f48bd30b6e2f717e42abe5a
-	md5sums = b5da15654a4bfaa1806cd9befb1cb0e4
+	md5sums = d44f0d5c4af36313b405115168bc48c3
+	md5sums = 76146d287e355b8fae843858e8233608
 
 pkgname = apache-flink
 
diff --git a/PKGBUILD b/PKGBUILD
index e40f98ee8270..2cc20f8d43f6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,8 +16,8 @@ source=("http://www-us.apache.org/dist/flink/flink-1.2.0/flink-${pkgver}-bin-had
         "apache-flink-jobmanager.service"
         "apache-flink-taskmanager@.service")
 md5sums=("792225bf4256b8ae2b2d9582a505c41c"
-         "ee79b5786f48bd30b6e2f717e42abe5a"
-         "b5da15654a4bfaa1806cd9befb1cb0e4")
+         "d44f0d5c4af36313b405115168bc48c3"
+         "76146d287e355b8fae843858e8233608")
 backup=(
     "etc/${pkgname}/flink-conf.yaml"
     "etc/${pkgname}/log4j-cli.properties"
@@ -39,7 +39,7 @@ prepare() {
 package() {
         cd "$srcdir/flink-${pkgver}"
 
-        install -d "$pkgdir/usr/bin" "$pkgdir/opt" "$pkgdir/var/log/apache-flink"
+        install -d "$pkgdir/usr/bin" "$pkgdir/opt" "$pkgdir/var/log/apache-flink" "$pkgdir/run/apache-flink"
 
         cp -r "$srcdir/flink-${pkgver}" "$pkgdir/opt/apache-flink/"
 
diff --git a/apache-flink-jobmanager.service b/apache-flink-jobmanager.service
index f59cf039d92a..c14811ca056c 100644
--- a/apache-flink-jobmanager.service
+++ b/apache-flink-jobmanager.service
@@ -5,8 +5,11 @@ After=network.target
 [Service]
 User=apache-flink
 Group=apache-flink
-Environment=FLINK_LOG_DIR=/var/log/apache-flink
-ExecStart=/opt/apache-flink/bin/jobmanager.sh start
+Environment=FLINK_LOG_DIR=/var/log/apache-flink FLINK_PID_DIR=/run/apache-flink JAVA_HOME=/usr/lib/jvm/default-runtime FLINK_IDENT_STRING=systemd
+PIDFile=/run/apache-flink/flink-systemd-jobmanager.pid
+ExecStart=/opt/apache-flink/bin/jobmanager.sh start cluster
+Type=forking
 
 [Install]
 WantedBy=multi-user.target
+
diff --git a/apache-flink-taskmanager@.service b/apache-flink-taskmanager@.service
index 22273b65d329..4d5804d994db 100644
--- a/apache-flink-taskmanager@.service
+++ b/apache-flink-taskmanager@.service
@@ -5,8 +5,11 @@ After=network.target
 [Service]
 User=apache-flink
 Group=apache-flink
-Environment=FLINK_LOG_DIR=/var/log/apache-flink
+Environment=FLINK_LOG_DIR=/var/log/apache-flink FLINK_PID_DIR=/run/apache-flink JAVA_HOME=/usr/lib/jvm/default-runtime FLINK_IDENT_STRING=systemd-%I
+PIDFile=/run/apache-flink/flink-systemd-%I-taskmanager.pid
 ExecStart=/opt/apache-flink/bin/taskmanager.sh start
+Type=forking
 
 [Install]
 WantedBy=multi-user.target
+
diff --git a/apache-flink.install b/apache-flink.install
index ef93c69e9792..1f4483133d50 100644
--- a/apache-flink.install
+++ b/apache-flink.install
@@ -4,6 +4,7 @@ post_install() {
 
     chown -R apache-flink:apache-flink /var/log/apache-flink
     chown -R apache-flink:apache-flink /etc/apache-flink
+    chown -R apache-flink:apache-flink /run/apache-flink
 
     if [ ! -e '/etc/apache-flink/.ssh/id_rsa' ] ; then
         su -s '/usr/bin/bash' -c "ssh-keygen -t rsa -N '' -f ~/.ssh/id_rsa" - 'apache-flink'