Changeset: f0567e49cb5e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f0567e49cb5e
Added Files:
tools/merovingian/daemon/monetdbd.service.in
Modified Files:
MonetDB.spec
buildtools/ChangeLog
configure.ag
tools/merovingian/daemon/Makefile.ag
Branch: default
Log Message:
Implemented a systemd configuration file for a monetdbd.service on Fedora.
diffs (84 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -754,6 +754,7 @@ systemd-tmpfiles --create %{_sysconfdir}
%exclude %{_sysconfdir}/tmpfiles.d/monetdbd.conf
%endif
%config(noreplace) %{_localstatedir}/monetdb5/dbfarm/.merovingian_properties
+%{_unitdir}/monetdbd.service
%{_libdir}/monetdb5/autoload/??_sql.mal
%{_libdir}/monetdb5/lib_sql.so
%{_libdir}/monetdb5/*.sql
@@ -891,9 +892,6 @@ developer, but if you do want to test, t
%files testing-python
%defattr(-,root,root)
-# at least F12 doesn't produce these
-# %exclude %{_bindir}/*.pyc
-# %exclude %{_bindir}/*.pyo
%{_bindir}/Mapprove.py
%{_bindir}/Mtest.py
%dir %{python_sitelib}/MonetDBtesting
diff --git a/buildtools/ChangeLog b/buildtools/ChangeLog
--- a/buildtools/ChangeLog
+++ b/buildtools/ChangeLog
@@ -1,3 +1,7 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
+* Sat Jan 23 2016 Sjoerd Mullender <[email protected]>
+- Implemented a systemd configuration file for a monetdbd.service
+ on Fedora.
+
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -3145,6 +3145,7 @@ eval "Ebindir=${Ebindir}"
QEbindir="`echo "$Ebindir" | sed 's/\\\\/\\\\\\\\/g'`"
AC_SUBST(Qbindir)
AC_SUBST(Xbindir)
+AC_SUBST(Ebindir)
AC_SUBST(QXbindir)
Qlibexecdir="$libexecdir"
Xlibexecdir="`$translatepath "$libexecdir"`"
diff --git a/tools/merovingian/daemon/Makefile.ag
b/tools/merovingian/daemon/Makefile.ag
--- a/tools/merovingian/daemon/Makefile.ag
+++ b/tools/merovingian/daemon/Makefile.ag
@@ -12,6 +12,8 @@ monetdb_var_rundir = $(rundir)
monetdb_var_run_DATA =
monetdb_var_dbfarmdir = $(localstatedir)/monetdb5/dbfarm
monetdb_var_dbfarm_DATA = .merovingian_properties
+monetdb_etc_systemddir = $(prefix)/lib/systemd/system
+monetdb_etc_systemd_DATA = monetdbd.service
INCLUDES = .. \
../../../common/stream \
@@ -22,7 +24,7 @@ INCLUDES = .. \
../../../monetdb5/mal \
$(MSGCONTROL_FLAGS)
-EXTRA_DIST = monetdbd.1.in .merovingian_properties.in
+EXTRA_DIST = monetdbd.1.in .merovingian_properties.in monetdbd.service.in
bin_monetdbd = {
SOURCES = \
diff --git a/tools/merovingian/daemon/monetdbd.service.in
b/tools/merovingian/daemon/monetdbd.service.in
new file mode 100644
--- /dev/null
+++ b/tools/merovingian/daemon/monetdbd.service.in
@@ -0,0 +1,15 @@
+[Unit]
+Description=MonetDB: the column store
+After=network.target
+
+[Service]
+Type=forking
+User=monetdb
+Group=monetdb
+ExecStart=@Ebindir@/monetdbd start @Elocalstatedir@/monetdb5/dbfarm
+ExecStop=@Ebindir@/monetdbd stop @Elocalstatedir@/monetdb5/dbfarm
+Restart=always
+PIDFILE=@Erundir@/merovingian.pid
+
+[Install]
+WantedBy=multi-user.target
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
