Merge pull request flux-framework#76 from garlick/config_file

etc: install config file for signing
grondo · Jun 11, 2018 · f9e1e96 · f9e1e96
2 parents 782c556 + 43242d2
commit f9e1e96
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git 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
@@ -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
@@ -0,0 +1 @@
+dist_fluxsecuritycf_DATA = sign.toml
diff --git a/etc/sign.toml 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
@@ -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 = \