]> granicus.if.org Git - pdns/commitdiff
Add Lua2 backend
authorPieter Lexis <pieter.lexis@powerdns.com>
Fri, 16 Mar 2018 08:52:22 +0000 (09:52 +0100)
committerPieter Lexis <pieter.lexis@powerdns.com>
Thu, 27 Sep 2018 11:59:28 +0000 (13:59 +0200)
23 files changed:
builder-support/debian/authoritative/debian-jessie/config/pdns.local.lua2.conf [new file with mode: 0644]
builder-support/debian/authoritative/debian-jessie/control
builder-support/debian/authoritative/debian-jessie/pdns-backend-lua2.examples [new file with mode: 0644]
builder-support/debian/authoritative/debian-jessie/pdns-backend-lua2.install [new file with mode: 0644]
builder-support/debian/authoritative/debian-jessie/pdns-backend-lua2.postinst [new file with mode: 0644]
builder-support/debian/authoritative/debian-jessie/pdns-backend-lua2.prerm [new file with mode: 0644]
builder-support/debian/authoritative/debian-jessie/rules
builder-support/debian/authoritative/debian-stretch/config/pdns.local.lua2.conf [new file with mode: 0644]
builder-support/debian/authoritative/debian-stretch/control
builder-support/debian/authoritative/debian-stretch/pdns-backend-lua2.examples [new file with mode: 0644]
builder-support/debian/authoritative/debian-stretch/pdns-backend-lua2.install [new file with mode: 0644]
builder-support/debian/authoritative/debian-stretch/pdns-backend-lua2.postinst [new file with mode: 0644]
builder-support/debian/authoritative/debian-stretch/pdns-backend-lua2.prerm [new file with mode: 0644]
builder-support/debian/authoritative/debian-stretch/rules
builder-support/debian/authoritative/ubuntu-trusty/config/pdns.local.lua2.conf [new file with mode: 0644]
builder-support/debian/authoritative/ubuntu-trusty/control
builder-support/debian/authoritative/ubuntu-trusty/pdns-backend-lua2.examples [new file with mode: 0644]
builder-support/debian/authoritative/ubuntu-trusty/pdns-backend-lua2.install [new file with mode: 0644]
builder-support/debian/authoritative/ubuntu-trusty/pdns-backend-lua2.postinst [new file with mode: 0644]
builder-support/debian/authoritative/ubuntu-trusty/pdns-backend-lua2.prerm [new file with mode: 0644]
builder-support/debian/authoritative/ubuntu-trusty/rules
builder-support/dockerfiles/Dockerfile.target.centos-6
builder-support/specs/pdns.spec

diff --git a/builder-support/debian/authoritative/debian-jessie/config/pdns.local.lua2.conf b/builder-support/debian/authoritative/debian-jessie/config/pdns.local.lua2.conf
new file mode 100644 (file)
index 0000000..acf2016
--- /dev/null
@@ -0,0 +1,10 @@
+#launch+=lua2
+
+## lua2-api      Lua backend API version
+#lua2-api=2
+
+## lua2-filename Filename of the script for lua backend
+#lua2-filename=powerdns-luabackend.lua
+
+## lua2-query-logging    Logging of the Lua2 Backend
+#lua2-query-logging=no
index 1b62af8323f68e9b5370963a2e1784e4b5ee0e2c..a39be1f3d52e157d157089d5ae7ddd43704992d7 100644 (file)
@@ -224,6 +224,20 @@ Description: Lua backend for PowerDNS
  .
  This package contains the Lua backend for PowerDNS.
 
+Package: pdns-backend-lua2
+Architecture: any
+Depends: pdns-server (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Provides: pdns-backend
+Description: Lua backend for PowerDNS
+ PowerDNS is a versatile nameserver which supports a large number
+ of different backends ranging from simple zonefiles to relational
+ databases and load balancing/failover algorithms.
+ PowerDNS tries to emphasize speed and security.
+ .
+ This package contains the Lua2 backend for PowerDNS.
+
 Package: pdns-backend-remote
 Architecture: any
 Depends: pdns-server (= ${binary:Version}),
diff --git a/builder-support/debian/authoritative/debian-jessie/pdns-backend-lua2.examples b/builder-support/debian/authoritative/debian-jessie/pdns-backend-lua2.examples
new file mode 100644 (file)
index 0000000..c762a0b
--- /dev/null
@@ -0,0 +1 @@
+debian/config/pdns.local.lua2.conf
diff --git a/builder-support/debian/authoritative/debian-jessie/pdns-backend-lua2.install b/builder-support/debian/authoritative/debian-jessie/pdns-backend-lua2.install
new file mode 100644 (file)
index 0000000..dcb8ce5
--- /dev/null
@@ -0,0 +1 @@
+usr/lib/*/pdns/liblua2backend.so*
diff --git a/builder-support/debian/authoritative/debian-jessie/pdns-backend-lua2.postinst b/builder-support/debian/authoritative/debian-jessie/pdns-backend-lua2.postinst
new file mode 100644 (file)
index 0000000..dd662bc
--- /dev/null
@@ -0,0 +1,21 @@
+#!/bin/sh
+#
+# postinst script for pdns-backend-lua2
+
+set -e
+
+if [ -n "$PDNSDEBUG" ]; then
+  echo "now debugging $0 $@"
+  set -x
+fi
+
+# Activate trigger
+dpkg-trigger pdns-server
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
diff --git a/builder-support/debian/authoritative/debian-jessie/pdns-backend-lua2.prerm b/builder-support/debian/authoritative/debian-jessie/pdns-backend-lua2.prerm
new file mode 100644 (file)
index 0000000..3298654
--- /dev/null
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# Add call to init script to actually stop pdns.
+
+set -e
+
+if [ -x "/etc/init.d/pdns" ]; then
+       invoke-rc.d pdns stop || exit $?
+fi
+
+#DEBHELPER#
+
+exit 0
+
index bbd07d1e53e6bc1a667e8b50e12058181e39c95c..415321dd3bc8e0f5ff41f1c0a45e29f11d88bb97 100755 (executable)
@@ -4,7 +4,7 @@ DEB_HOST_ARCH_BITS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS)
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 # Backends
-backends := bind ldap pipe gmysql godbc gpgsql gsqlite3 geoip lua mydns remote random opendbx tinydns
+backends := bind ldap pipe gmysql godbc gpgsql gsqlite3 geoip lua lua2 mydns remote random opendbx tinydns
 
 # Disable systemd integration on non-linux archs
 ifeq ($(DEB_HOST_ARCH_OS),linux)
diff --git a/builder-support/debian/authoritative/debian-stretch/config/pdns.local.lua2.conf b/builder-support/debian/authoritative/debian-stretch/config/pdns.local.lua2.conf
new file mode 100644 (file)
index 0000000..acf2016
--- /dev/null
@@ -0,0 +1,10 @@
+#launch+=lua2
+
+## lua2-api      Lua backend API version
+#lua2-api=2
+
+## lua2-filename Filename of the script for lua backend
+#lua2-filename=powerdns-luabackend.lua
+
+## lua2-query-logging    Logging of the Lua2 Backend
+#lua2-query-logging=no
index 8911dadf95830ce1cb20955dc19bfafc76bb4231..f0daf1c20a3469a2a180647cceeca8042054875d 100644 (file)
@@ -224,6 +224,20 @@ Description: Lua backend for PowerDNS
  .
  This package contains the Lua backend for PowerDNS.
 
+Package: pdns-backend-lua2
+Architecture: any
+Depends: pdns-server (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Provides: pdns-backend
+Description: Lua backend for PowerDNS
+ PowerDNS is a versatile nameserver which supports a large number
+ of different backends ranging from simple zonefiles to relational
+ databases and load balancing/failover algorithms.
+ PowerDNS tries to emphasize speed and security.
+ .
+ This package contains the Lua2 backend for PowerDNS.
+
 Package: pdns-backend-remote
 Architecture: any
 Depends: pdns-server (= ${binary:Version}),
diff --git a/builder-support/debian/authoritative/debian-stretch/pdns-backend-lua2.examples b/builder-support/debian/authoritative/debian-stretch/pdns-backend-lua2.examples
new file mode 100644 (file)
index 0000000..c762a0b
--- /dev/null
@@ -0,0 +1 @@
+debian/config/pdns.local.lua2.conf
diff --git a/builder-support/debian/authoritative/debian-stretch/pdns-backend-lua2.install b/builder-support/debian/authoritative/debian-stretch/pdns-backend-lua2.install
new file mode 100644 (file)
index 0000000..dcb8ce5
--- /dev/null
@@ -0,0 +1 @@
+usr/lib/*/pdns/liblua2backend.so*
diff --git a/builder-support/debian/authoritative/debian-stretch/pdns-backend-lua2.postinst b/builder-support/debian/authoritative/debian-stretch/pdns-backend-lua2.postinst
new file mode 100644 (file)
index 0000000..dd662bc
--- /dev/null
@@ -0,0 +1,21 @@
+#!/bin/sh
+#
+# postinst script for pdns-backend-lua2
+
+set -e
+
+if [ -n "$PDNSDEBUG" ]; then
+  echo "now debugging $0 $@"
+  set -x
+fi
+
+# Activate trigger
+dpkg-trigger pdns-server
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
diff --git a/builder-support/debian/authoritative/debian-stretch/pdns-backend-lua2.prerm b/builder-support/debian/authoritative/debian-stretch/pdns-backend-lua2.prerm
new file mode 100644 (file)
index 0000000..3298654
--- /dev/null
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# Add call to init script to actually stop pdns.
+
+set -e
+
+if [ -x "/etc/init.d/pdns" ]; then
+       invoke-rc.d pdns stop || exit $?
+fi
+
+#DEBHELPER#
+
+exit 0
+
index b87448cf45a5823e2a029044d117167a315187bf..fb25ebb388417f3947f439f6b220959a24a60954 100755 (executable)
@@ -4,7 +4,7 @@ DEB_HOST_ARCH_BITS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS)
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 # Backends
-backends := bind ldap pipe gmysql godbc gpgsql gsqlite3 geoip lua mydns remote random opendbx tinydns
+backends := bind ldap pipe gmysql godbc gpgsql gsqlite3 geoip lua lua2 mydns remote random opendbx tinydns
 
 # Disable systemd integration on non-linux archs
 ifeq ($(DEB_HOST_ARCH_OS),linux)
diff --git a/builder-support/debian/authoritative/ubuntu-trusty/config/pdns.local.lua2.conf b/builder-support/debian/authoritative/ubuntu-trusty/config/pdns.local.lua2.conf
new file mode 100644 (file)
index 0000000..acf2016
--- /dev/null
@@ -0,0 +1,10 @@
+#launch+=lua2
+
+## lua2-api      Lua backend API version
+#lua2-api=2
+
+## lua2-filename Filename of the script for lua backend
+#lua2-filename=powerdns-luabackend.lua
+
+## lua2-query-logging    Logging of the Lua2 Backend
+#lua2-query-logging=no
index c98085d276db9241b007cfba8a8b800dea3c2a67..c44df8d9002e761c04bde82212f2a47c4dc30b10 100644 (file)
@@ -221,6 +221,20 @@ Description: Lua backend for PowerDNS
  .
  This package contains the Lua backend for PowerDNS.
 
+Package: pdns-backend-lua2
+Architecture: any
+Depends: pdns-server (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Provides: pdns-backend
+Description: Lua backend for PowerDNS
+ PowerDNS is a versatile nameserver which supports a large number
+ of different backends ranging from simple zonefiles to relational
+ databases and load balancing/failover algorithms.
+ PowerDNS tries to emphasize speed and security.
+ .
+ This package contains the Lua2 backend for PowerDNS.
+
 Package: pdns-backend-remote
 Architecture: any
 Depends: pdns-server (= ${binary:Version}),
diff --git a/builder-support/debian/authoritative/ubuntu-trusty/pdns-backend-lua2.examples b/builder-support/debian/authoritative/ubuntu-trusty/pdns-backend-lua2.examples
new file mode 100644 (file)
index 0000000..c762a0b
--- /dev/null
@@ -0,0 +1 @@
+debian/config/pdns.local.lua2.conf
diff --git a/builder-support/debian/authoritative/ubuntu-trusty/pdns-backend-lua2.install b/builder-support/debian/authoritative/ubuntu-trusty/pdns-backend-lua2.install
new file mode 100644 (file)
index 0000000..dcb8ce5
--- /dev/null
@@ -0,0 +1 @@
+usr/lib/*/pdns/liblua2backend.so*
diff --git a/builder-support/debian/authoritative/ubuntu-trusty/pdns-backend-lua2.postinst b/builder-support/debian/authoritative/ubuntu-trusty/pdns-backend-lua2.postinst
new file mode 100644 (file)
index 0000000..dd662bc
--- /dev/null
@@ -0,0 +1,21 @@
+#!/bin/sh
+#
+# postinst script for pdns-backend-lua2
+
+set -e
+
+if [ -n "$PDNSDEBUG" ]; then
+  echo "now debugging $0 $@"
+  set -x
+fi
+
+# Activate trigger
+dpkg-trigger pdns-server
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
diff --git a/builder-support/debian/authoritative/ubuntu-trusty/pdns-backend-lua2.prerm b/builder-support/debian/authoritative/ubuntu-trusty/pdns-backend-lua2.prerm
new file mode 100644 (file)
index 0000000..3298654
--- /dev/null
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# Add call to init script to actually stop pdns.
+
+set -e
+
+if [ -x "/etc/init.d/pdns" ]; then
+       invoke-rc.d pdns stop || exit $?
+fi
+
+#DEBHELPER#
+
+exit 0
+
index 6a093a9c81444b8bba44ac7c7bdf354c8d10c1d0..ed0790b0d4ff4194486858cda4bee34dcc26344c 100755 (executable)
@@ -4,7 +4,7 @@ DEB_HOST_ARCH_BITS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS)
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 # Backends
-backends := bind ldap pipe gmysql godbc gpgsql gsqlite3 geoip lua mydns remote random opendbx tinydns
+backends := bind ldap pipe gmysql godbc gpgsql gsqlite3 geoip lua lua2 mydns remote random opendbx tinydns
 
 
 # Use new build system
index 0d53ed47b6305f24cfe831637c6109b9e8ecb00d..a4e2554cb5a7f295167ca1452acbbe3394bb1889 100644 (file)
@@ -4,7 +4,9 @@
 # This defines the dstribution base layer
 # Put only the bare minimum of common commands here, without dev tools
 FROM centos:6 as dist-base
-RUN yum install -y epel-release centos-release-scl-rh && \
+RUN which yum
+RUN yum clean all
+RUN yum install -y --verbose epel-release centos-release-scl-rh && \
     yum install -y --nogpgcheck devtoolset-3-gcc-c++
 
 # Do the actual rpm build
index ffdb7df7f3c6c267fb8b63d246e1c17e93030ac8..6a12122c5c919f3ec830923f612dda9ccf88a355 100644 (file)
@@ -111,6 +111,15 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %description backend-lua
 This package contains the lua backend for %{name}
 
+%package backend-lua2
+Summary: Lua backend for %{name}
+Group: System Environment/Daemons
+Requires: %{name}%{?_isa} = %{version}-%{release}
+%global backends %{backends} lua2
+
+%description backend-lua2
+This package contains the lua2 backend for %{name}
+
 %package backend-sqlite
 Summary: SQLite backend for %{name}
 Group: System Environment/Daemons
@@ -351,6 +360,9 @@ fi
 %files backend-lua
 %{_libdir}/%{name}/libluabackend.so
 
+%files backend-lua2
+%{_libdir}/%{name}/liblua2backend.so
+
 %files backend-sqlite
 %doc modules/gsqlite3backend/schema.sqlite3.sql
 %doc modules/gsqlite3backend/dnssec-3.x_to_3.4.0_schema.sqlite3.sql