diff --git a/Makefile.am b/Makefile.am index d1e857d06bcd..03d15eb7e7d8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = src t +SUBDIRS = src etc t ACLOCAL_AMFLAGS = -I config EXTRA_DIST = \ config/tap-driver.sh \ diff --git a/configure.ac b/configure.ac index 29b6056b1f94..ac56d77dae10 100644 --- a/configure.ac +++ b/configure.ac @@ -83,8 +83,8 @@ AC_PKGCONFIG AS_VAR_SET(fluxlibdir, $libdir/flux) AC_SUBST(fluxlibdir) -AS_VAR_SET(fluxcfdir, $sysconfdir/flux/conf.d) -AC_SUBST(fluxcfdir) +AS_VAR_SET(fluxsecuritycfdir, $sysconfdir/flux/security/conf.d) +AC_SUBST(fluxsecuritycfdir) AS_VAR_SET(fluxsecurityincludedir, $includedir/flux/security) AC_SUBST(fluxsecurityincludedir) @@ -103,6 +103,7 @@ AC_CONFIG_FILES( \ src/libutil/Makefile \ src/libca/Makefile \ src/imp/Makefile \ + etc/Makefile \ ) AC_OUTPUT diff --git a/etc/Makefile.am b/etc/Makefile.am new file mode 100644 index 000000000000..95c85f6fbb1d --- /dev/null +++ b/etc/Makefile.am @@ -0,0 +1 @@ +dist_fluxsecuritycf_DATA = sign.toml diff --git a/etc/sign.toml b/etc/sign.toml new file mode 100644 index 000000000000..44ccbcfe8707 --- /dev/null +++ b/etc/sign.toml @@ -0,0 +1,4 @@ +[sign] +max-ttl = 1209600 # 2 weeks +default-type = "munge" +allowed-types = [ "munge" ] diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 2595affbb71f..e9a5881ec8fc 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -8,7 +8,7 @@ AM_LDFLAGS = \ AM_CPPFLAGS = \ -I$(top_srcdir) \ - -DINSTALLED_CF_PATTERN=\"$(fluxcfdir)/*.toml\" \ + -DINSTALLED_CF_PATTERN=\"$(fluxsecuritycfdir)/*.toml\" \ $(SODIUM_CFLAGS) $(JANSSON_CFLAGS) $(MUNGE_CFLAGS) lib_LTLIBRARIES = \