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 cea3a5f09beae993da189b8c0d8a1ac2b416a100..6de913207fea2f02f3c89c4ec9cecb5c5cc1bf37 100644 (file)
--- 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 624438b01294a461c2d307a6007965dd5e55f9b2..5d61be644c288fcd35926edd40bc8d3cc3261bb6 100644 (file)
--- 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 880d872e89a3caabe90e37c446b229aa5ac6ae5d..78b47cbfd047ed90cb92d4c4ea71817b6dfd938f 100644 (file)
--- 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 a4d5d236585a91c19fa2aad9ddf39d5bc363d18b..872210e24445850102709b304d94e003576da78b 100644 (file)
--- 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 0fdeab7f79985b2b4b573bef26665263af25c624..a825fc8e9c5c5badecaa616324df458e1253c664 100644 (file)
--- 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 d21466b826966a298202c523d482adb967ad3fdb..e7b21a84f98726f68940976f129b19dd1e0ccc5b 100644 (file)
--- 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 cde976842b40acfa2ea963bf80d6aa33fbbf965a..152d519f7250bf9158c4a5210c9900250fed07f7 100644 (file)
--- 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