From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Mon, 22 Dec 2025 12:33:19 +0000 (+0100)
Subject: auth: Properly install schema files and upgrades
X-Git-Tag: rec-5.4.0-beta1~76^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f74445f5320e3e5b457aee38c555fd0c0a9e3e8;p=thirdparty%2Fpdns.git

auth: Properly install schema files and upgrades

Signed-off-by: Remi Gacogne <remi.gacogne@powerdns.com>
---

diff --git a/modules/bindbackend/meson.build b/modules/bindbackend/meson.build
index cea3a5f09b..6de913207f 100644
--- a/modules/bindbackend/meson.build
+++ b/modules/bindbackend/meson.build
@@ -5,8 +5,9 @@ module_sources = files(
 
 module_extras = files(
   'bindbackend2.hh',
+)
 
-  # TODO These should be packaged up some other way (and avoid product_source_dir)
+module_resources = files(
   product_source_dir / 'pdns' / 'bind-dnssec.4.2.0_to_4.3.0_schema.sqlite3.sql',
   product_source_dir / 'pdns' / 'bind-dnssec.schema.sqlite3.sql',
 )
diff --git a/modules/gmysqlbackend/meson.build b/modules/gmysqlbackend/meson.build
index 624438b012..5d61be644c 100644
--- a/modules/gmysqlbackend/meson.build
+++ b/modules/gmysqlbackend/meson.build
@@ -6,7 +6,9 @@ module_sources = files(
 module_extras = files(
   'gmysqlbackend.hh',
   'smysql.hh',
+)
 
+module_resources = files(
   'dnssec-3.x_to_3.4.0_schema.mysql.sql',
   'enable-foreign-keys.mysql.sql',
   'nodnssec-3.x_to_3.4.0_schema.mysql.sql',
diff --git a/modules/godbcbackend/meson.build b/modules/godbcbackend/meson.build
index 880d872e89..78b47cbfd0 100644
--- a/modules/godbcbackend/meson.build
+++ b/modules/godbcbackend/meson.build
@@ -6,7 +6,9 @@ module_sources = files(
 module_extras = files(
   'godbcbackend.hh',
   'sodbc.hh',
+)
 
+module_resources = files(
   'schema.mssql.sql',
   '4.0.0_to_4.2.0_schema.mssql.sql',
   '4.2.0_to_4.3.0_schema.mssql.sql',
diff --git a/modules/gpgsqlbackend/meson.build b/modules/gpgsqlbackend/meson.build
index a4d5d23658..872210e244 100644
--- a/modules/gpgsqlbackend/meson.build
+++ b/modules/gpgsqlbackend/meson.build
@@ -6,7 +6,9 @@ module_sources = files(
 module_extras = files(
   'gpgsqlbackend.hh',
   'spgsql.hh',
+)
 
+module_resources = files(
   'schema.pgsql.sql',
   'nodnssec-3.x_to_3.4.0_schema.pgsql.sql',
   'dnssec-3.x_to_3.4.0_schema.pgsql.sql',
diff --git a/modules/gsqlite3backend/meson.build b/modules/gsqlite3backend/meson.build
index 0fdeab7f79..a825fc8e9c 100644
--- a/modules/gsqlite3backend/meson.build
+++ b/modules/gsqlite3backend/meson.build
@@ -4,7 +4,9 @@ module_sources = files(
 
 module_extras = files(
   'gsqlite3backend.hh',
+)
 
+module_resources = files(
   'dnssec-3.x_to_3.4.0_schema.sqlite3.sql',
   'nodnssec-3.x_to_3.4.0_schema.sqlite3.sql',
   '3.4.0_to_4.0.0_schema.sqlite3.sql',
diff --git a/modules/ldapbackend/meson.build b/modules/ldapbackend/meson.build
index d21466b826..e7b21a84f9 100644
--- a/modules/ldapbackend/meson.build
+++ b/modules/ldapbackend/meson.build
@@ -15,7 +15,9 @@ module_extras = files(
   'ldaputils.hh',
   'powerldap.hh',
   'utils.hh',
+)
 
+module_resources = files(
   'dnsdomain2.schema',
   'pdns-domaininfo.schema',
 )
diff --git a/modules/meson.build b/modules/meson.build
index cde976842b..152d519f72 100644
--- a/modules/meson.build
+++ b/modules/meson.build
@@ -22,6 +22,7 @@ foreach module_name: all_modules
   module_dep_name = 'dep_' + module_backend_name
   module_lib_name = 'module_' + module_backend_name + '_lib'
   module_opt = get_option('module-' + module_name)
+  module_resources = []
 
   if module_opt == 'disabled'
     continue
@@ -53,6 +54,12 @@ foreach module_name: all_modules
     selected_dyn_modules += module_name
   endif
 
+  foreach resource: module_resources
+    install_data(resource,
+      install_dir: get_option('datadir') / 'powerdns'
+    )
+  endforeach
+
   dep_modules += get_variable(module_dep_name)
 endforeach