You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by mj...@apache.org on 2018/03/17 06:18:42 UTC
[1/4] guacamole-server git commit: GUACAMOLE-30: Implement systemd
script for guacd
Repository: guacamole-server
Updated Branches:
refs/heads/master 344ed4f42 -> e2feb4160
GUACAMOLE-30: Implement systemd script for guacd
Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/77cac3b3
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/77cac3b3
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/77cac3b3
Branch: refs/heads/master
Commit: 77cac3b30d25dc38e8e5da63f49834c8c567ee5e
Parents: 344ed4f
Author: Nick Couchman <vn...@apache.org>
Authored: Thu Mar 15 06:52:41 2018 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Thu Mar 15 06:52:41 2018 -0400
----------------------------------------------------------------------
configure.ac | 15 +++++++++++++++
src/guacd/.gitignore | 3 +++
src/guacd/Makefile.am | 16 +++++++++++++---
src/guacd/systemd/guacd.service.in | 11 +++++++++++
4 files changed, 42 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/77cac3b3/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 42e8197..6cba255 100644
--- a/configure.ac
+++ b/configure.ac
@@ -148,6 +148,14 @@ AC_ARG_WITH(init_dir,
AM_CONDITIONAL([ENABLE_INIT], [test "x${init_dir}" != "x"])
AC_SUBST(init_dir)
+# Systemd directory
+AC_ARG_WITH(systemd_dir,
+ [AS_HELP_STRING([--with-systemd-dir=<path>],
+ [install systemd units to the given directory])
+ ],systemd_dir=$withval)
+AM_CONDITIONAL([ENABLE_SYSTEMD], [test "x${systemd_dir}" != "x"])
+AC_SUBST(systemd_dir)
+
# guacd config file
AC_ARG_WITH(guacd_conf,
[AS_HELP_STRING([--with-guacd-conf=<path>],
@@ -1252,6 +1260,12 @@ AM_COND_IF([ENABLE_GUACLOG], [build_guaclog=yes], [build_guaclog=no])
AM_COND_IF([ENABLE_INIT], [build_init="${init_dir}"], [build_init=no])
#
+# Systemd units
+#
+
+AM_COND_IF([ENABLE_SYSTEMD], [build_systemd="${systemd_dir}"], [build_systemd=no])
+
+#
# Display summary
#
@@ -1290,6 +1304,7 @@ $PACKAGE_NAME version $PACKAGE_VERSION
guaclog .... ${build_guaclog}
Init scripts: ${build_init}
+ Systemd units: ${build_systemd}
Type \"make\" to compile $PACKAGE_NAME.
"
http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/77cac3b3/src/guacd/.gitignore
----------------------------------------------------------------------
diff --git a/src/guacd/.gitignore b/src/guacd/.gitignore
index 6db8c7e..558c319 100644
--- a/src/guacd/.gitignore
+++ b/src/guacd/.gitignore
@@ -2,6 +2,9 @@
# Compiled init script
init.d/guacd
+# Compiled systemd unit
+systemd/guacd.service
+
# Compiled proxy
guacd
guacd.exe
http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/77cac3b3/src/guacd/Makefile.am
----------------------------------------------------------------------
diff --git a/src/guacd/Makefile.am b/src/guacd/Makefile.am
index fb8e8eb..8d5e104 100644
--- a/src/guacd/Makefile.am
+++ b/src/guacd/Makefile.am
@@ -61,11 +61,12 @@ guacd_LDFLAGS = \
@SSL_LIBS@
EXTRA_DIST = \
- init.d/guacd.in \
- man/guacd.8.in \
+ init.d/guacd.in \
+ systemd/guacd.service.in \
+ man/guacd.8.in \
man/guacd.conf.5.in
-CLEANFILES = $(init_SCRIPTS)
+CLEANFILES = $(init_SCRIPTS) $(systemd_UNITS)
# Init script
if ENABLE_INIT
@@ -77,3 +78,12 @@ init.d/guacd: init.d/guacd.in
chmod +x init.d/guacd
endif
+# Systemd service
+if ENABLE_SYSTEMD
+systemddir = @systemd_dir@
+systemd_SCRIPTS = systemd/guacd.service
+
+systemd/guacd.service: systemd/guacd.service.in
+ sed -e 's,[@]sbindir[@],$(sbindir),g' < systemd/guacd.service.in > systemd/guacd.service
+endif
+
http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/77cac3b3/src/guacd/systemd/guacd.service.in
----------------------------------------------------------------------
diff --git a/src/guacd/systemd/guacd.service.in b/src/guacd/systemd/guacd.service.in
new file mode 100644
index 0000000..1d43053
--- /dev/null
+++ b/src/guacd/systemd/guacd.service.in
@@ -0,0 +1,11 @@
+[Unit]
+Description=Guacamole Server
+Documentation=man:guacd(8)
+
+[Service]
+User=daemon
+ExecStart=@sbindir@/guacd -f
+Restart=on-abnormal
+
+[Install]
+WantedBy=multi-user.target
[3/4] guacamole-server git commit: GUACAMOLE-30: Add license to file
and want network.target.
Posted by mj...@apache.org.
GUACAMOLE-30: Add license to file and want network.target.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/fef819fb
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/fef819fb
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/fef819fb
Branch: refs/heads/master
Commit: fef819fbb937f8ddb2207070b7b0051cb62acd49
Parents: f75579d
Author: Nick Couchman <vn...@apache.org>
Authored: Fri Mar 16 17:02:53 2018 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Fri Mar 16 17:02:53 2018 -0400
----------------------------------------------------------------------
src/guacd/systemd/guacd.service.in | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/fef819fb/src/guacd/systemd/guacd.service.in
----------------------------------------------------------------------
diff --git a/src/guacd/systemd/guacd.service.in b/src/guacd/systemd/guacd.service.in
index 1d43053..da3af21 100644
--- a/src/guacd/systemd/guacd.service.in
+++ b/src/guacd/systemd/guacd.service.in
@@ -1,6 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
[Unit]
Description=Guacamole Server
Documentation=man:guacd(8)
+After=network.target
[Service]
User=daemon
[2/4] guacamole-server git commit: GUACAMOLE-30: Change from script
to data.
Posted by mj...@apache.org.
GUACAMOLE-30: Change from script to data.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/f75579de
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/f75579de
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/f75579de
Branch: refs/heads/master
Commit: f75579de7eecd39b3f28e9eda20a4393b49ac1c9
Parents: 77cac3b
Author: Nick Couchman <vn...@apache.org>
Authored: Thu Mar 15 07:30:55 2018 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Thu Mar 15 07:30:55 2018 -0400
----------------------------------------------------------------------
src/guacd/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/f75579de/src/guacd/Makefile.am
----------------------------------------------------------------------
diff --git a/src/guacd/Makefile.am b/src/guacd/Makefile.am
index 8d5e104..4dcd3d2 100644
--- a/src/guacd/Makefile.am
+++ b/src/guacd/Makefile.am
@@ -81,7 +81,7 @@ endif
# Systemd service
if ENABLE_SYSTEMD
systemddir = @systemd_dir@
-systemd_SCRIPTS = systemd/guacd.service
+systemd_DATA = systemd/guacd.service
systemd/guacd.service: systemd/guacd.service.in
sed -e 's,[@]sbindir[@],$(sbindir),g' < systemd/guacd.service.in > systemd/guacd.service
[4/4] guacamole-server git commit: GUACAMOLE-30: Merge support for
systemd.
Posted by mj...@apache.org.
GUACAMOLE-30: Merge support for systemd.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/e2feb416
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/e2feb416
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/e2feb416
Branch: refs/heads/master
Commit: e2feb416052b1a1ab33db6e79c5ea6e4f6f6eacf
Parents: 344ed4f fef819f
Author: Michael Jumper <mj...@apache.org>
Authored: Fri Mar 16 23:18:18 2018 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Fri Mar 16 23:18:18 2018 -0700
----------------------------------------------------------------------
configure.ac | 15 +++++++++++++++
src/guacd/.gitignore | 3 +++
src/guacd/Makefile.am | 16 +++++++++++++---
src/guacd/systemd/guacd.service.in | 29 +++++++++++++++++++++++++++++
4 files changed, 60 insertions(+), 3 deletions(-)
----------------------------------------------------------------------