* [ptxdist] [PATCH] systemd: Journald gateway and remote support
@ 2016-07-27 12:30 Artur Wiebe
2016-07-28 10:11 ` Artur Wiebe
0 siblings, 1 reply; 3+ messages in thread
From: Artur Wiebe @ 2016-07-27 12:30 UTC (permalink / raw)
To: ptxdist; +Cc: Artur Wiebe
Signed-off-by: Artur Wiebe <artur@4wiebe.de>
---
projectroot/etc/group | 1 +
projectroot/etc/passwd | 1 +
rules/systemd.in | 27 +++++++++++++++++++--------
rules/systemd.make | 8 +++++++-
4 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/projectroot/etc/group b/projectroot/etc/group
index 9ff5702..6d90d40 100644
--- a/projectroot/etc/group
+++ b/projectroot/etc/group
@@ -23,4 +23,5 @@ mysql:x:117:
systemd-journal:x:201:
systemd-network:x:202:
systemd-journal-remote:x:203:
+systemd-journal-gateway:x:206:
nogroup:x:65534:
diff --git a/projectroot/etc/passwd b/projectroot/etc/passwd
index b75ed9f..a613e92 100644
--- a/projectroot/etc/passwd
+++ b/projectroot/etc/passwd
@@ -9,5 +9,6 @@ systemd-network:x:202:202:systemd-network:/dev/null:/bin/false
systemd-resolve:x:203:65534:systemd-resolve:/dev/null:/bin/false
systemd-timesync:x:204:65534:systemd-timesync:/dev/null:/bin/false
systemd-bus-proxy:x:205:65534:systemd-timesync:/dev/null:/bin/false
+systemd-journal-gateway:x:206:206:systemd-journal-gateway:/dev/null:/bin/false
rpcuser:x:65533:65534:RPC user:/dev/null:/bin/false
nobody:x:65534:65534:Unprivileged Nobody:/dev/null:/bin/false
diff --git a/rules/systemd.in b/rules/systemd.in
index 27a6be4..65419ab 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
@@ -57,14 +58,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"
@@ -112,5 +105,23 @@ 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_MICROHTTPD
+ bool
+ prompt "Journald gateway and remote support"
+ help
+ Build systemd with libmicrohttpd support
+
+endmenu
+
endif
diff --git a/rules/systemd.make b/rules/systemd.make
index 69da447..9aa24fc 100644
--- a/rules/systemd.make
+++ b/rules/systemd.make
@@ -90,7 +90,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 \
@@ -181,6 +181,8 @@ SYSTEMD_HELPER := \
systemd-hostnamed \
systemd-initctl \
systemd-journald \
+ $(call ptx/ifdef, PTXCONF_SYSTEMD_MICROHTTPD,systemd-journal-gatewayd,) \
+ $(call ptx/ifdef, PTXCONF_SYSTEMD_MICROHTTPD,systemd-journal-remote,) \
$(call ptx/ifdef, PTXCONF_SYSTEMD_LOCALES,systemd-localed,) \
$(call ptx/ifdef, PTXCONF_SYSTEMD_LOGIND,systemd-logind,) \
systemd-modules-load \
@@ -303,6 +305,10 @@ ifdef PTXCONF_SYSTEMD_LOCALES
@$(call install_copy, systemd, 0, 0, 0644, -, /usr/share/systemd/kbd-model-map)
endif
+ifdef PTXCONF_SYSTEMD_MICROHTTPD
+ @$(call install_alternative, systemd, 0, 0, 0644, /etc/systemd/journal-remote.conf)
+endif
+
@$(call install_copy, systemd, 0, 0, 0644, -, /lib/udev/rules.d/99-systemd.rules)
ifdef PTXCONF_SYSTEMD_NETWORK
@$(call install_tree, systemd, 0, 0, -, /lib/systemd/network)
--
2.9.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [ptxdist] [PATCH] systemd: Journald gateway and remote support
2016-07-27 12:30 [ptxdist] [PATCH] systemd: Journald gateway and remote support Artur Wiebe
@ 2016-07-28 10:11 ` Artur Wiebe
0 siblings, 0 replies; 3+ messages in thread
From: Artur Wiebe @ 2016-07-28 10:11 UTC (permalink / raw)
To: ptxdist
Please use the newer patch, I added all users and groups introduced by
this feature to etc/group, etc/passwd
Dipl. Ing. Artur Wiebe
Software-Ingenieur
Email: artur@4wiebe.de
Telefon: +49 163 2699840
Web: artur.4wiebe.de
Rosenstraße 13, 72124 Pliezhausen
USt-IdNr: DE299286057
Am 27.07.2016 um 14:30 schrieb Artur Wiebe:
> Signed-off-by: Artur Wiebe <artur@4wiebe.de>
> ---
> projectroot/etc/group | 1 +
> projectroot/etc/passwd | 1 +
> rules/systemd.in | 27 +++++++++++++++++++--------
> rules/systemd.make | 8 +++++++-
> 4 files changed, 28 insertions(+), 9 deletions(-)
>
> diff --git a/projectroot/etc/group b/projectroot/etc/group
> index 9ff5702..6d90d40 100644
> --- a/projectroot/etc/group
> +++ b/projectroot/etc/group
> @@ -23,4 +23,5 @@ mysql:x:117:
> systemd-journal:x:201:
> systemd-network:x:202:
> systemd-journal-remote:x:203:
> +systemd-journal-gateway:x:206:
> nogroup:x:65534:
> diff --git a/projectroot/etc/passwd b/projectroot/etc/passwd
> index b75ed9f..a613e92 100644
> --- a/projectroot/etc/passwd
> +++ b/projectroot/etc/passwd
> @@ -9,5 +9,6 @@ systemd-network:x:202:202:systemd-network:/dev/null:/bin/false
> systemd-resolve:x:203:65534:systemd-resolve:/dev/null:/bin/false
> systemd-timesync:x:204:65534:systemd-timesync:/dev/null:/bin/false
> systemd-bus-proxy:x:205:65534:systemd-timesync:/dev/null:/bin/false
> +systemd-journal-gateway:x:206:206:systemd-journal-gateway:/dev/null:/bin/false
> rpcuser:x:65533:65534:RPC user:/dev/null:/bin/false
> nobody:x:65534:65534:Unprivileged Nobody:/dev/null:/bin/false
> diff --git a/rules/systemd.in b/rules/systemd.in
> index 27a6be4..65419ab 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
> @@ -57,14 +58,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"
> @@ -112,5 +105,23 @@ 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_MICROHTTPD
> + bool
> + prompt "Journald gateway and remote support"
> + help
> + Build systemd with libmicrohttpd support
> +
> +endmenu
> +
> endif
>
> diff --git a/rules/systemd.make b/rules/systemd.make
> index 69da447..9aa24fc 100644
> --- a/rules/systemd.make
> +++ b/rules/systemd.make
> @@ -90,7 +90,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 \
> @@ -181,6 +181,8 @@ SYSTEMD_HELPER := \
> systemd-hostnamed \
> systemd-initctl \
> systemd-journald \
> + $(call ptx/ifdef, PTXCONF_SYSTEMD_MICROHTTPD,systemd-journal-gatewayd,) \
> + $(call ptx/ifdef, PTXCONF_SYSTEMD_MICROHTTPD,systemd-journal-remote,) \
> $(call ptx/ifdef, PTXCONF_SYSTEMD_LOCALES,systemd-localed,) \
> $(call ptx/ifdef, PTXCONF_SYSTEMD_LOGIND,systemd-logind,) \
> systemd-modules-load \
> @@ -303,6 +305,10 @@ ifdef PTXCONF_SYSTEMD_LOCALES
> @$(call install_copy, systemd, 0, 0, 0644, -, /usr/share/systemd/kbd-model-map)
> endif
>
> +ifdef PTXCONF_SYSTEMD_MICROHTTPD
> + @$(call install_alternative, systemd, 0, 0, 0644, /etc/systemd/journal-remote.conf)
> +endif
> +
> @$(call install_copy, systemd, 0, 0, 0644, -, /lib/udev/rules.d/99-systemd.rules)
> ifdef PTXCONF_SYSTEMD_NETWORK
> @$(call install_tree, systemd, 0, 0, -, /lib/systemd/network)
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 3+ messages in thread
* [ptxdist] [PATCH] systemd: Journald gateway and remote support
@ 2016-07-28 10:07 Artur Wiebe
0 siblings, 0 replies; 3+ messages in thread
From: Artur Wiebe @ 2016-07-28 10:07 UTC (permalink / raw)
To: ptxdist; +Cc: Artur Wiebe
Signed-off-by: Artur Wiebe <artur@4wiebe.de>
---
projectroot/etc/group | 2 ++
projectroot/etc/passwd | 3 +++
rules/systemd.in | 27 +++++++++++++++++++--------
rules/systemd.make | 8 +++++++-
4 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/projectroot/etc/group b/projectroot/etc/group
index 9ff5702..a1e9d7f 100644
--- a/projectroot/etc/group
+++ b/projectroot/etc/group
@@ -23,4 +23,6 @@ mysql:x:117:
systemd-journal:x:201:
systemd-network:x:202:
systemd-journal-remote:x:203:
+systemd-journal-gateway:x:207:
+systemd-journal-upload:x:208:
nogroup:x:65534:
diff --git a/projectroot/etc/passwd b/projectroot/etc/passwd
index b75ed9f..6802115 100644
--- a/projectroot/etc/passwd
+++ b/projectroot/etc/passwd
@@ -9,5 +9,8 @@ systemd-network:x:202:202:systemd-network:/dev/null:/bin/false
systemd-resolve:x:203:65534:systemd-resolve:/dev/null:/bin/false
systemd-timesync:x:204:65534:systemd-timesync:/dev/null:/bin/false
systemd-bus-proxy:x:205:65534:systemd-timesync:/dev/null:/bin/false
+systemd-journal-remote:x:206:203:systemd-journal-remote:/dev/null:/bin/false
+systemd-journal-gateway:x:207:207:systemd-journal-gateway:/dev/null:/bin/false
+systemd-journal-upload:x:208:208:systemd-journal-upload:/dev/null:/bin/false
rpcuser:x:65533:65534:RPC user:/dev/null:/bin/false
nobody:x:65534:65534:Unprivileged Nobody:/dev/null:/bin/false
diff --git a/rules/systemd.in b/rules/systemd.in
index 27a6be4..65419ab 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
@@ -57,14 +58,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"
@@ -112,5 +105,23 @@ 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_MICROHTTPD
+ bool
+ prompt "Journald gateway and remote support"
+ help
+ Build systemd with libmicrohttpd support
+
+endmenu
+
endif
diff --git a/rules/systemd.make b/rules/systemd.make
index 69da447..9aa24fc 100644
--- a/rules/systemd.make
+++ b/rules/systemd.make
@@ -90,7 +90,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 \
@@ -181,6 +181,8 @@ SYSTEMD_HELPER := \
systemd-hostnamed \
systemd-initctl \
systemd-journald \
+ $(call ptx/ifdef, PTXCONF_SYSTEMD_MICROHTTPD,systemd-journal-gatewayd,) \
+ $(call ptx/ifdef, PTXCONF_SYSTEMD_MICROHTTPD,systemd-journal-remote,) \
$(call ptx/ifdef, PTXCONF_SYSTEMD_LOCALES,systemd-localed,) \
$(call ptx/ifdef, PTXCONF_SYSTEMD_LOGIND,systemd-logind,) \
systemd-modules-load \
@@ -303,6 +305,10 @@ ifdef PTXCONF_SYSTEMD_LOCALES
@$(call install_copy, systemd, 0, 0, 0644, -, /usr/share/systemd/kbd-model-map)
endif
+ifdef PTXCONF_SYSTEMD_MICROHTTPD
+ @$(call install_alternative, systemd, 0, 0, 0644, /etc/systemd/journal-remote.conf)
+endif
+
@$(call install_copy, systemd, 0, 0, 0644, -, /lib/udev/rules.d/99-systemd.rules)
ifdef PTXCONF_SYSTEMD_NETWORK
@$(call install_tree, systemd, 0, 0, -, /lib/systemd/network)
--
2.9.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-07-28 10:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-27 12:30 [ptxdist] [PATCH] systemd: Journald gateway and remote support Artur Wiebe
2016-07-28 10:11 ` Artur Wiebe
2016-07-28 10:07 Artur Wiebe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox