diff options
| author | Austin S. Hemmelgarn <ahferroin7@gmail.com> | 2018-05-10 11:13:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-10 11:13:33 -0400 |
| commit | 1a341ba578bc0a8b7a737439d7be9017076af0e6 (patch) | |
| tree | fb111bf8f6c7a15bf43205937814fe19924dd53a /conf.d/Makefile.am | |
| parent | f28f38673db1ddefcb7724f49910f4b86968fc2b (diff) | |
| parent | b3444fc33e5accc1cb8db2ff7f54c9a32cf1af08 (diff) | |
Merge branch 'master' into spigotmc
Diffstat (limited to 'conf.d/Makefile.am')
| -rw-r--r-- | conf.d/Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am index 9419e094b4..0ea859882a 100644 --- a/conf.d/Makefile.am +++ b/conf.d/Makefile.am @@ -62,6 +62,7 @@ dist_pythonconfig_DATA = \ python.d/postfix.conf \ python.d/postgres.conf \ python.d/powerdns.conf \ + python.d/puppet.conf \ python.d/rabbitmq.conf \ python.d/redis.conf \ python.d/retroshare.conf \ @@ -73,6 +74,7 @@ dist_pythonconfig_DATA = \ python.d/smartd_log.conf \ python.d/tomcat.conf \ python.d/traefik.conf \ + python.d/unbound.conf \ python.d/varnish.conf \ python.d/web_log.conf \ $(NULL) |