* [ptxdist] [PATCH] systemd: added option to install systemd-journal-remote
@ 2017-06-28 11:49 Artur Wiebe
2017-06-30 14:07 ` Michael Olbrich
0 siblings, 1 reply; 2+ messages in thread
From: Artur Wiebe @ 2017-06-28 11:49 UTC (permalink / raw)
To: ptxdist; +Cc: Artur Wiebe
Signed-off-by: Artur Wiebe <artur@4wiebe.de>
---
rules/systemd.in | 33 +++++++++++++++++++++++++--------
rules/systemd.make | 7 ++++++-
2 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/rules/systemd.in b/rules/systemd.in
index 0e542289d..259567a1a 100644
--- a/rules/systemd.in
+++ b/rules/systemd.in
@@ -20,6 +20,7 @@ menuconfig SYSTEMD
select MACHINE_ID if RUNTIME
select XZ if SYSTEMD_XZ
select LZ4 if SYSTEMD_LZ4
+ select LIBMICROHTTPD if SYSTEMD_MICROHTTPD
select LIBSECCOMP if SYSTEMD_SECCOMP
select LIBSELINUX if GLOBAL_SELINUX
select IPTABLES if SYSTEMD_IPMASQUERADE
@@ -50,6 +51,9 @@ comment "D-Bus is needed for the enabled features"
config SYSTEMD_DBUS
bool
+config SYSTEMD_MICROHTTPD
+ bool
+
config SYSTEMD_LOCALES
bool
default LOCALES
@@ -58,14 +62,6 @@ config SYSTEMD_VCONSOLE
bool
prompt "virtual console support"
-config SYSTEMD_XZ
- bool
- prompt "XZ compressed journal support"
-
-config SYSTEMD_LZ4
- bool
- prompt "LZ4 compressed journal support"
-
config SYSTEMD_DISABLE_RANDOM_SEED
bool
prompt "disable random seed services"
@@ -113,6 +109,27 @@ config SYSTEMD_SECCOMP
Enable this if you want to use SystemCallFilter in service files
+menu "journald "
+
+config SYSTEMD_XZ
+ bool
+ prompt "XZ compressed journal support"
+
+config SYSTEMD_LZ4
+ bool
+ prompt "LZ4 compressed journal support"
+
+config SYSTEMD_JOURNAL_REMOTE
+ bool
+ select SYSTEMD_MICROHTTPD
+ prompt "install systemd-journal-remote"
+ help
+ systemd-journal-remote is a command to receive serialized
+ journal events and store them to the journal
+
+endmenu
+
+
menu "udev "
menu "install options "
diff --git a/rules/systemd.make b/rules/systemd.make
index a06282bef..9857adaf6 100644
--- a/rules/systemd.make
+++ b/rules/systemd.make
@@ -91,7 +91,7 @@ SYSTEMD_CONF_OPT := \
--disable-libcryptsetup \
--disable-qrencode \
--disable-gnutls \
- --disable-microhttpd \
+ --$(call ptx/endis,PTXCONF_SYSTEMD_MICROHTTPD)-microhttpd \
--disable-libcurl \
--disable-libidn \
--$(call ptx/endis,PTXCONF_SYSTEMD_IPMASQUERADE)-libiptc \
@@ -190,6 +190,7 @@ SYSTEMD_HELPER := \
systemd-hostnamed \
systemd-initctl \
systemd-journald \
+ $(call ptx/ifdef, PTXCONF_SYSTEMD_JOURNAL_REMOTE,systemd-journal-remote,) \
$(call ptx/ifdef, PTXCONF_SYSTEMD_LOCALES,systemd-localed,) \
$(call ptx/ifdef, PTXCONF_SYSTEMD_LOGIND,systemd-logind,) \
systemd-modules-load \
@@ -340,6 +341,10 @@ ifdef PTXCONF_SYSTEMD_NETWORK
@$(call install_alternative, systemd, 0, 0, 0644, \
/etc/systemd/resolved.conf)
endif
+ifdef PTXCONF_SYSTEMD_JOURNAL_REMOTE
+ @$(call install_alternative, systemd, 0, 0, 0644, \
+ /etc/systemd/journal-remote.conf)
+endif
@$(call install_tree, systemd, 0, 0, -, /etc/systemd/system/)
@$(call install_tree, systemd, 0, 0, -, /usr/share/dbus-1/system.d/)
--
2.13.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [ptxdist] [PATCH] systemd: added option to install systemd-journal-remote
2017-06-28 11:49 [ptxdist] [PATCH] systemd: added option to install systemd-journal-remote Artur Wiebe
@ 2017-06-30 14:07 ` Michael Olbrich
0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2017-06-30 14:07 UTC (permalink / raw)
To: ptxdist
On Wed, Jun 28, 2017 at 01:49:24PM +0200, Artur Wiebe wrote:
> Signed-off-by: Artur Wiebe <artur@4wiebe.de>
So I looked at the old patches and the code a bit. There are multiple
use-cases for this stuff.
- systemd-journal-remote with the default service/socket in passive mode
that receives a journal
- systemd-journal-upload the sender to the use-case above
- systemd-journal-gatewayd basically allows browsing the journal via http.
- systemd-journal-remote in 'active' mode with a custom service & 'getter'
to pull the data.
I guess the last one is you're use-case? I suppose this is a good start.
I'd like to see the others eventually. But that will also require some
certificate handling etc. so that's more work.
Michael
> ---
> rules/systemd.in | 33 +++++++++++++++++++++++++--------
> rules/systemd.make | 7 ++++++-
> 2 files changed, 31 insertions(+), 9 deletions(-)
>
> diff --git a/rules/systemd.in b/rules/systemd.in
> index 0e542289d..259567a1a 100644
> --- a/rules/systemd.in
> +++ b/rules/systemd.in
> @@ -20,6 +20,7 @@ menuconfig SYSTEMD
> select MACHINE_ID if RUNTIME
> select XZ if SYSTEMD_XZ
> select LZ4 if SYSTEMD_LZ4
> + select LIBMICROHTTPD if SYSTEMD_MICROHTTPD
> select LIBSECCOMP if SYSTEMD_SECCOMP
> select LIBSELINUX if GLOBAL_SELINUX
> select IPTABLES if SYSTEMD_IPMASQUERADE
> @@ -50,6 +51,9 @@ comment "D-Bus is needed for the enabled features"
> config SYSTEMD_DBUS
> bool
>
> +config SYSTEMD_MICROHTTPD
> + bool
> +
> config SYSTEMD_LOCALES
> bool
> default LOCALES
> @@ -58,14 +62,6 @@ config SYSTEMD_VCONSOLE
> bool
> prompt "virtual console support"
>
> -config SYSTEMD_XZ
> - bool
> - prompt "XZ compressed journal support"
> -
> -config SYSTEMD_LZ4
> - bool
> - prompt "LZ4 compressed journal support"
> -
> config SYSTEMD_DISABLE_RANDOM_SEED
> bool
> prompt "disable random seed services"
> @@ -113,6 +109,27 @@ config SYSTEMD_SECCOMP
> Enable this if you want to use SystemCallFilter in service files
>
>
> +menu "journald "
> +
> +config SYSTEMD_XZ
> + bool
> + prompt "XZ compressed journal support"
> +
> +config SYSTEMD_LZ4
> + bool
> + prompt "LZ4 compressed journal support"
> +
> +config SYSTEMD_JOURNAL_REMOTE
> + bool
> + select SYSTEMD_MICROHTTPD
> + prompt "install systemd-journal-remote"
> + help
> + systemd-journal-remote is a command to receive serialized
> + journal events and store them to the journal
> +
> +endmenu
> +
> +
> menu "udev "
>
> menu "install options "
> diff --git a/rules/systemd.make b/rules/systemd.make
> index a06282bef..9857adaf6 100644
> --- a/rules/systemd.make
> +++ b/rules/systemd.make
> @@ -91,7 +91,7 @@ SYSTEMD_CONF_OPT := \
> --disable-libcryptsetup \
> --disable-qrencode \
> --disable-gnutls \
> - --disable-microhttpd \
> + --$(call ptx/endis,PTXCONF_SYSTEMD_MICROHTTPD)-microhttpd \
> --disable-libcurl \
> --disable-libidn \
> --$(call ptx/endis,PTXCONF_SYSTEMD_IPMASQUERADE)-libiptc \
> @@ -190,6 +190,7 @@ SYSTEMD_HELPER := \
> systemd-hostnamed \
> systemd-initctl \
> systemd-journald \
> + $(call ptx/ifdef, PTXCONF_SYSTEMD_JOURNAL_REMOTE,systemd-journal-remote,) \
> $(call ptx/ifdef, PTXCONF_SYSTEMD_LOCALES,systemd-localed,) \
> $(call ptx/ifdef, PTXCONF_SYSTEMD_LOGIND,systemd-logind,) \
> systemd-modules-load \
> @@ -340,6 +341,10 @@ ifdef PTXCONF_SYSTEMD_NETWORK
> @$(call install_alternative, systemd, 0, 0, 0644, \
> /etc/systemd/resolved.conf)
> endif
> +ifdef PTXCONF_SYSTEMD_JOURNAL_REMOTE
> + @$(call install_alternative, systemd, 0, 0, 0644, \
> + /etc/systemd/journal-remote.conf)
> +endif
> @$(call install_tree, systemd, 0, 0, -, /etc/systemd/system/)
> @$(call install_tree, systemd, 0, 0, -, /usr/share/dbus-1/system.d/)
>
> --
> 2.13.1
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-06-30 14:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-28 11:49 [ptxdist] [PATCH] systemd: added option to install systemd-journal-remote Artur Wiebe
2017-06-30 14:07 ` Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox