X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=pdns%2Fdnsdistdist%2FMakefile.am;h=b0ca67ad4245007a82776c7e56936db21831415e;hb=a161449f908f20082f1130e9b867eda71c6fed08;hp=145d6b0713aadce6010d41d020f6a4f24309bb69;hpb=838c2f00cc9ae56944bd1c845387badf01a6b7da;p=thirdparty%2Fpdns.git

diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am
index 145d6b0713..b0ca67ad42 100644
--- a/pdns/dnsdistdist/Makefile.am
+++ b/pdns/dnsdistdist/Makefile.am
@@ -10,6 +10,7 @@ CLEANFILES = \
 	dnsmessage.pb.h \
 	htmlfiles.h.tmp \
 	htmlfiles.h \
+	dnsdist-lua-ffi-interface.inc \
 	dnstap.pb.cc \
 	dnstap.pb.h
 
@@ -17,12 +18,18 @@ dnslabeltext.cc: dnslabeltext.rl
 	$(AM_V_GEN)$(RAGEL) $< -o dnslabeltext.cc
 
 BUILT_SOURCES=htmlfiles.h \
+	dnsdist-lua-ffi-interface.inc \
 	dnslabeltext.cc
 
 htmlfiles.h: $(srcdir)/html/*
 	$(AM_V_GEN)$(srcdir)/incfiles $(srcdir) > $@.tmp
 	@mv $@.tmp $@
 
+dnsdist-lua-ffi-interface.inc: dnsdist-lua-ffi-interface.h
+	echo 'R"FFIContent(' > $@
+	cat $< >> $@
+	echo ')FFIContent"' >> $@
+
 SRC_JS_FILES := $(wildcard src_js/*.js)
 MIN_JS_FILES := $(patsubst src_js/%.js,html/js/%.min.js,$(SRC_JS_FILES))
 
@@ -117,6 +124,7 @@ dnsdist_SOURCES = \
 	dns.cc dns.hh \
 	dnscrypt.cc dnscrypt.hh \
 	dnsdist.cc dnsdist.hh \
+	dnsdist-backend.cc \
 	dnsdist-dynbpf.cc dnsdist-dynbpf.hh \
 	dnsdist-cache.cc dnsdist-cache.hh \
 	dnsdist-carbon.cc \
@@ -124,8 +132,10 @@ dnsdist_SOURCES = \
 	dnsdist-dnscrypt.cc \
 	dnsdist-dynblocks.cc dnsdist-dynblocks.hh \
 	dnsdist-ecs.cc dnsdist-ecs.hh \
+	dnsdist-healthchecks.cc dnsdist-healthchecks.hh \
 	dnsdist-idstate.cc \
 	dnsdist-kvs.hh dnsdist-kvs.cc \
+	dnsdist-lbpolicies.cc dnsdist-lbpolicies.hh \
 	dnsdist-lua.hh dnsdist-lua.cc \
 	dnsdist-lua-actions.cc \
 	dnsdist-lua-bindings.cc \
@@ -134,17 +144,22 @@ dnsdist_SOURCES = \
 	dnsdist-lua-bindings-kvs.cc \
 	dnsdist-lua-bindings-packetcache.cc \
 	dnsdist-lua-bindings-protobuf.cc \
+	dnsdist-lua-ffi.cc dnsdist-lua-ffi.hh \
+	dnsdist-lua-ffi-interface.h dnsdist-lua-ffi-interface.inc \
 	dnsdist-lua-inspection.cc \
 	dnsdist-lua-inspection-ffi.cc dnsdist-lua-inspection-ffi.hh \
 	dnsdist-lua-rules.cc \
 	dnsdist-lua-vars.cc \
+	dnsdist-prometheus.hh \
 	dnsdist-protobuf.cc dnsdist-protobuf.hh \
+	dnsdist-proxy-protocol.cc dnsdist-proxy-protocol.hh \
 	dnsdist-rings.cc dnsdist-rings.hh \
 	dnsdist-rules.hh \
 	dnsdist-secpoll.cc dnsdist-secpoll.hh \
 	dnsdist-snmp.cc dnsdist-snmp.hh \
+	dnsdist-systemd.cc dnsdist-systemd.hh \
 	dnsdist-tcp.cc \
-	dnsdist-web.cc \
+	dnsdist-web.cc dnsdist-web.hh \
 	dnsdist-xpf.cc dnsdist-xpf.hh \
 	dnslabeltext.cc \
 	dnsname.cc dnsname.hh \
@@ -166,6 +181,7 @@ dnsdist_SOURCES = \
 	namespaces.hh \
 	pdnsexception.hh \
 	protobuf.cc protobuf.hh \
+	proxy-protocol.cc proxy-protocol.hh \
 	dnstap.cc dnstap.hh \
 	qtype.cc qtype.hh \
 	remote_logger.cc remote_logger.hh \
@@ -178,6 +194,7 @@ dnsdist_SOURCES = \
 	tcpiohandler.cc tcpiohandler.hh \
 	threadname.hh threadname.cc \
 	uuid-utils.hh uuid-utils.cc \
+	views.hh \
 	xpf.cc xpf.hh \
 	ext/luawrapper/include/LuaContext.hpp \
 	ext/json11/json11.cpp \
@@ -194,19 +211,25 @@ testrunner_SOURCES = \
 	test-dnsdist_cc.cc \
 	test-dnsdistdynblocks_hh.cc \
 	test-dnsdistkvs_cc.cc \
+	test-dnsdistlbpolicies_cc.cc \
 	test-dnsdistpacketcache_cc.cc \
 	test-dnsdistrings_cc.cc \
 	test-dnsdistrules_cc.cc \
 	test-dnsparser_cc.cc \
 	test-iputils_hh.cc \
 	test-mplexer.cc \
+	test-proxy_protocol_cc.cc \
 	cachecleaner.hh \
 	circular_buffer.hh \
 	dnsdist.hh \
+	dnsdist-backend.cc \
 	dnsdist-cache.cc dnsdist-cache.hh \
 	dnsdist-dynblocks.cc dnsdist-dynblocks.hh \
 	dnsdist-ecs.cc dnsdist-ecs.hh \
 	dnsdist-kvs.cc dnsdist-kvs.hh \
+	dnsdist-lbpolicies.cc dnsdist-lbpolicies.hh \
+	dnsdist-lua-ffi.cc dnsdist-lua-ffi.hh \
+	dnsdist-lua-ffi-interface.h dnsdist-lua-ffi-interface.inc \
 	dnsdist-rings.hh \
 	dnsdist-xpf.cc dnsdist-xpf.hh \
 	dnscrypt.cc dnscrypt.hh \
@@ -224,6 +247,7 @@ testrunner_SOURCES = \
 	namespaces.hh \
 	pdnsexception.hh \
 	pollmplexer.cc \
+	proxy-protocol.cc proxy-protocol.hh \
 	qtype.cc qtype.hh \
 	sholder.hh \
 	sodcrypto.cc \
@@ -231,7 +255,9 @@ testrunner_SOURCES = \
 	statnode.cc statnode.hh \
 	threadname.hh threadname.cc \
 	testrunner.cc \
-	xpf.cc xpf.hh
+	uuid-utils.hh uuid-utils.cc \
+	xpf.cc xpf.hh \
+	ext/luawrapper/include/LuaContext.hpp
 
 dnsdist_LDFLAGS = \
 	$(AM_LDFLAGS) \
@@ -259,8 +285,9 @@ testrunner_LDFLAGS = \
 
 testrunner_LDADD = \
 	$(BOOST_UNIT_TEST_FRAMEWORK_LIBS) \
-	$(LIBSODIUM_LIBS) \
 	$(FSTRM_LIBS) \
+	$(LIBSODIUM_LIBS) \
+	$(LUA_LIBS) \
 	$(RT_LIBS) \
 	$(SANITIZER_FLAGS) \
 	$(LIBCAP_LIBS)
@@ -309,9 +336,10 @@ endif
 if !HAVE_LUA_HPP
 BUILT_SOURCES += lua.hpp
 nodist_dnsdist_SOURCES = lua.hpp
-CLEANFILES += lua.hpp
 endif
 
+CLEANFILES += lua.hpp
+
 if HAVE_PROTOBUF
 if HAVE_PROTOC
 dnsmessage.pb.cc: dnsmessage.proto
@@ -398,7 +426,7 @@ endif
 
 if HAVE_SYSTEMD
 dnsdist.service: dnsdist.service.in
-	$(AM_V_GEN)sed -e 's![@]bindir[@]!$(bindir)!' < $< > $@
+	$(AM_V_GEN)sed -e 's![@]bindir[@]!$(bindir)!' -e 's![@]service_user[@]!$(service_user)!' -e 's![@]service_group[@]!$(service_group)!' < $< > $@
 if !HAVE_SYSTEMD_LOCK_PERSONALITY
 	$(AM_V_GEN)perl -ni -e 'print unless /^LockPersonality/' $@
 endif
@@ -440,7 +468,9 @@ if !HAVE_SYSTEMD_SYSTEM_CALL_FILTER
 endif
 
 dnsdist@.service: dnsdist.service
-	$(AM_V_GEN)sed -e 's!/dnsdist !&--config $(sysconfdir)/dnsdist-%i.conf !' < $< >$@
+	$(AM_V_GEN)sed -e 's!/dnsdist !&--config $(sysconfdir)/dnsdist-%i.conf !' \
+	  -e 's!RuntimeDirectory=.*!&-%i!' \
+	  < $< >$@
 
 systemdsystemunitdir = $(SYSTEMD_DIR)