Changeset: f04a19f9aeee for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f04a19f9aeee
Added Files:
tools/merovingian/daemon/config/.merovingian_properties.in
tools/merovingian/daemon/config/Makefile.ag
tools/merovingian/daemon/config/monetdbd.in
tools/merovingian/daemon/config/monetdbd.service.in
Removed Files:
tools/merovingian/daemon/.merovingian_properties.in
tools/merovingian/daemon/monetdbd.service.in
Modified Files:
MonetDB.spec
debian/monetdb5-sql.install
tools/merovingian/ChangeLog.Aug2018
tools/merovingian/daemon/Makefile.ag
Branch: Aug2018
Log Message:
Added a logrotate configuration file for the merovingian.log file.
Moved the configuration files into a subdirectory to avoid a file name
clash.
diffs (94 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -752,6 +752,7 @@ systemd-tmpfiles --create %{_sysconfdir}
# RHEL >= 7, and all current Fedora
%{_sysconfdir}/tmpfiles.d/monetdbd.conf
%{_unitdir}/monetdbd.service
+%config(noreplace) %attr(644,root,root) %{_sysconfdir}/logrotate.d/monetdbd
%else
# RedHat Enterprise Linux < 7
%dir %attr(775,monetdb,monetdb) %{_localstatedir}/run/monetdb
diff --git a/debian/monetdb5-sql.install b/debian/monetdb5-sql.install
--- a/debian/monetdb5-sql.install
+++ b/debian/monetdb5-sql.install
@@ -3,6 +3,7 @@ debian/tmp/usr/bin/monetdb usr/bin
debian/tmp/usr/lib/monetdb5/*.sql usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/autoload/??_sql.mal usr/lib/monetdb5/autoload
debian/tmp/usr/lib/systemd/system/monetdbd.service lib/systemd/system
+debian/tmp/etc/logrotate.d/monetdbd etc/logrotate.d
debian/tmp/etc/tmpfiles.d/monetdbd.conf etc/tmpfiles.d
# usr/lib/monetdb5/sql*.mal EXCEPT: sql*_hge.mal
debian/tmp/usr/lib/monetdb5/sql.mal usr/lib/monetdb5
diff --git a/tools/merovingian/ChangeLog.Aug2018
b/tools/merovingian/ChangeLog.Aug2018
--- a/tools/merovingian/ChangeLog.Aug2018
+++ b/tools/merovingian/ChangeLog.Aug2018
@@ -1,3 +1,6 @@
# ChangeLog file for sql/src/backends/monet5/merovingian
# This file is updated with mchangelog
+* Mon Aug 27 2018 Sjoerd Mullender <[email protected]>
+- Added a "logrotate" configuration file. See /etc/logrotate.d/monetdbd.
+
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
@@ -10,10 +10,6 @@ monetdb_var_logdir = $(logdir)
monetdb_var_log_DATA =
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 \
@@ -24,7 +20,8 @@ INCLUDES = .. \
../../../monetdb5/mal \
$(MSGCONTROL_FLAGS)
-EXTRA_DIST = monetdbd.1.in .merovingian_properties.in monetdbd.service.in
+SUBDIRS = config
+EXTRA_DIST = monetdbd.1.in
bin_monetdbd = {
SOURCES = \
diff --git a/tools/merovingian/daemon/.merovingian_properties.in
b/tools/merovingian/daemon/config/.merovingian_properties.in
rename from tools/merovingian/daemon/.merovingian_properties.in
rename to tools/merovingian/daemon/config/.merovingian_properties.in
diff --git a/tools/merovingian/daemon/config/Makefile.ag
b/tools/merovingian/daemon/config/Makefile.ag
new file mode 100644
--- /dev/null
+++ b/tools/merovingian/daemon/config/Makefile.ag
@@ -0,0 +1,14 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V.
+
+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
+monetdb_etc_logrotatedir = $(sysconfdir)/logrotate.d
+monetdb_etc_logrotate_DATA = monetdbd
+
+EXTRA_DIST = .merovingian_properties.in monetdbd.service.in monetdbd.in
diff --git a/tools/merovingian/daemon/config/monetdbd.in
b/tools/merovingian/daemon/config/monetdbd.in
new file mode 100644
--- /dev/null
+++ b/tools/merovingian/daemon/config/monetdbd.in
@@ -0,0 +1,8 @@
+# this is the logrotate configuration for merovingian
+@Elogdir@@[email protected] {
+ missingok
+ notifempty
+ postrotate
+ kill -HUP $(cat @Erundir@@[email protected])
+ endscript
+}
diff --git a/tools/merovingian/daemon/monetdbd.service.in
b/tools/merovingian/daemon/config/monetdbd.service.in
rename from tools/merovingian/daemon/monetdbd.service.in
rename to tools/merovingian/daemon/config/monetdbd.service.in
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
