diff options
| author | Stephen Gallagher <sgallagh@redhat.com> | 2014-01-07 15:43:13 -0500 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2014-02-19 12:29:05 +0100 |
| commit | 9542512d7be40f2000298c86d3d2b728f4f0f65a (patch) | |
| tree | 2afe30d9861147f829ec1a99ab6a57cf03db47c5 /src | |
| parent | b96988a35bfb5f6faf2e364ae966166398afeca3 (diff) | |
| download | sssd-9542512d7be40f2000298c86d3d2b728f4f0f65a.tar.gz sssd-9542512d7be40f2000298c86d3d2b728f4f0f65a.tar.xz sssd-9542512d7be40f2000298c86d3d2b728f4f0f65a.zip | |
BUILD: Simplify enabling journald on installed systems
systemd supports overrides of the standard service file to be placed in
/etc/systemd/system/<service>.service.d/
With this patch, we will install a commented-out override file to /etc
that will instruct the user on how to enable logging to journald.
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
Reviewed-by: Lukáš Slebodník <lslebodn@redhat.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/conf_macros.m4 | 20 | ||||
| -rw-r--r-- | src/sysv/systemd/journal.conf.in | 7 |
2 files changed, 27 insertions, 0 deletions
diff --git a/src/conf_macros.m4 b/src/conf_macros.m4 index 4be819d4a..71118593c 100644 --- a/src/conf_macros.m4 +++ b/src/conf_macros.m4 @@ -221,6 +221,26 @@ AC_DEFUN([WITH_SYSTEMD_UNIT_DIR], AC_SUBST(systemdunitdir) ]) +dnl A macro to configure the directory to install the systemd unit file +dnl overrides to +AC_DEFUN([WITH_SYSTEMD_CONF_DIR], + [ AC_ARG_WITH([systemdconfdir], + [ AC_HELP_STRING([--with-systemdconfdir=DIR], + [Directory for systemd service file overrides [Auto]] + ), + ], + ) + if test x"$with_systemdconfdir" != x; then + systemdconfdir=$with_systemdconfdir + else + systemdconfdir=$($PKG_CONFIG --variable=systemdsystemconfdir systemd) + if test x"$systemdconfdir" = x; then + AC_MSG_ERROR([Could not detect systemd config directory]) + fi + fi + AC_SUBST(systemdconfdir) + ]) + AC_DEFUN([WITH_MANPAGES], [ AC_ARG_WITH([manpages], [AC_HELP_STRING([--with-manpages], diff --git a/src/sysv/systemd/journal.conf.in b/src/sysv/systemd/journal.conf.in new file mode 100644 index 000000000..d89325e08 --- /dev/null +++ b/src/sysv/systemd/journal.conf.in @@ -0,0 +1,7 @@ +[Service] +# Uncomment *both* of the following lines to enable debug logging +# to go to journald instead of /var/log/sssd. You will need to +# run 'systemctl daemon-reload' and then restart the SSSD service +# for this to take effect +#ExecStart= +#ExecStart=@sbindir@/sssd -D |