shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-09-08 13:44:50 +03:00
Code Activity

meson: use jinja2 in src/journal-remote

Browse Source 
One stanza had "if install_sysconfdir_samples", while the other
"if install_sysconfdir", which looks like a mistake.
install_sysconfdir_samples is now used for both.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2021-05-16 18:03:23 +02:00
committed by Yu Watanabe
parent d34593570a
commit 8e6c71bc19
3 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/journal-remote/journal-remote.conf.in
View File

@@ -15,6 +15,6 @@
[Remote] [Remote]
# Seal=false # Seal=false
# SplitMode=host # SplitMode=host
# ServerKeyFile=@CERTIFICATEROOT@/private/journal-remote.pem # ServerKeyFile={{CERTIFICATE_ROOT}}/private/journal-remote.pem
# ServerCertificateFile=@CERTIFICATEROOT@/certs/journal-remote.pem # ServerCertificateFile={{CERTIFICATE_ROOT}}/certs/journal-remote.pem
# TrustedCertificateFile=@CERTIFICATEROOT@/ca/trusted.pem # TrustedCertificateFile={{CERTIFICATE_ROOT}}/ca/trusted.pem

6
src/journal-remote/journal-upload.conf.in
View File

@@ -14,6 +14,6 @@
[Upload] [Upload]
# URL= # URL=
# ServerKeyFile=@CERTIFICATEROOT@/private/journal-upload.pem # ServerKeyFile={{CERTIFICATE_ROOT}}/private/journal-upload.pem
# ServerCertificateFile=@CERTIFICATEROOT@/certs/journal-upload.pem # ServerCertificateFile={{CERTIFICATE_ROOT}}/certs/journal-upload.pem
# TrustedCertificateFile=@CERTIFICATEROOT@/ca/trusted.pem # TrustedCertificateFile={{CERTIFICATE_ROOT}}/ca/trusted.pem

34
src/journal-remote/meson.build
View File

@@ -42,27 +42,25 @@ systemd_journal_gatewayd_sources = files('''
microhttpd-util.c microhttpd-util.c
'''.split()) '''.split())
if conf.get('ENABLE_REMOTE') ==1 and conf.get('HAVE_LIBCURL') == 1 in_files = [
journal_upload_conf = configure_file( ['journal-upload.conf',
input : 'journal-upload.conf.in', conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_LIBCURL') == 1 and install_sysconfdir_samples],
output : 'journal-upload.conf', ['journal-remote.conf',
configuration : substs) conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_MICROHTTPD') == 1 and install_sysconfdir_samples]]
if install_sysconfdir
install_data(journal_upload_conf, foreach tuple : in_files
file = tuple[0]
custom_target(
file,
input : file + '.in',
output: file,
command : [meson_render_jinja2, config_h, '@INPUT@'],
capture : true,
install : tuple[1],
install_dir : pkgsysconfdir) install_dir : pkgsysconfdir)
endif endforeach
endif
if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_MICROHTTPD') == 1 if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_MICROHTTPD') == 1
journal_remote_conf = configure_file(
input : 'journal-remote.conf.in',
output : 'journal-remote.conf',
configuration : substs)
if install_sysconfdir_samples
install_data(journal_remote_conf,
install_dir : pkgsysconfdir)
endif
install_data('browse.html', install_data('browse.html',
install_dir : join_paths(pkgdatadir, 'gatewayd')) install_dir : join_paths(pkgdatadir, 'gatewayd'))