From: Kees Monshouwer Date: Wed, 13 Nov 2013 09:01:12 +0000 (+0100) Subject: move mysql/pgsql/sqlite3 .sql files to backend directories X-Git-Tag: rec-3.6.0-rc1~345^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=284bc360222fa977718b5fed435aa3901909b28e;p=pdns move mysql/pgsql/sqlite3 .sql files to backend directories --- diff --git a/modules/gmysqlbackend/Makefile.am b/modules/gmysqlbackend/Makefile.am index a754f3887..1f7d8e3e8 100644 --- a/modules/gmysqlbackend/Makefile.am +++ b/modules/gmysqlbackend/Makefile.am @@ -1,15 +1,10 @@ AM_CPPFLAGS=@MYSQL_inc@ @THREADFLAGS@ $(BOOST_CPPFLAGS) lib_LTLIBRARIES = libgmysqlbackend.la -EXTRA_DIST=OBJECTFILES OBJECTLIBS +EXTRA_DIST=OBJECTFILES OBJECTLIBS \ + dnssec.schema.mysql.sql no-dnssec.schema.mysql.sql libgmysqlbackend_la_SOURCES=gmysqlbackend.cc gmysqlbackend.hh \ - smysql.hh smysql.cc - + smysql.hh smysql.cc libgmysqlbackend_la_LDFLAGS=-module -avoid-version $(MYSQL_lib) - -# -Wl,-Bstatic -lpq++ -lpq -Wl,-Bdynamic -lssl -lcrypt -lcrypto - - - diff --git a/pdns/dnssec.schema.mysql.sql b/modules/gmysqlbackend/dnssec.schema.mysql.sql similarity index 100% rename from pdns/dnssec.schema.mysql.sql rename to modules/gmysqlbackend/dnssec.schema.mysql.sql diff --git a/pdns/no-dnssec.schema.mysql.sql b/modules/gmysqlbackend/no-dnssec.schema.mysql.sql similarity index 100% rename from pdns/no-dnssec.schema.mysql.sql rename to modules/gmysqlbackend/no-dnssec.schema.mysql.sql diff --git a/modules/gpgsqlbackend/Makefile.am b/modules/gpgsqlbackend/Makefile.am index 344e162ce..be98d629b 100644 --- a/modules/gpgsqlbackend/Makefile.am +++ b/modules/gpgsqlbackend/Makefile.am @@ -1,10 +1,11 @@ AM_CPPFLAGS=-I@PGSQL_incdir@ @THREADFLAGS@ lib_LTLIBRARIES = libgpgsqlbackend.la -EXTRA_DIST=OBJECTFILES OBJECTLIBS +EXTRA_DIST=OBJECTFILES OBJECTLIBS \ + dnssec.schema.pgsql.sql no-dnssec.schema.pgsql.sql libgpgsqlbackend_la_SOURCES=gpgsqlbackend.cc gpgsqlbackend.hh \ - spgsql.hh spgsql.cc + spgsql.hh spgsql.cc ## Filter out known build breakers for Mac OS X ## Don't remove the empty lines between if and endif or tabs will screw up your makefile @@ -17,4 +18,3 @@ libgpgsqlbackend_la_LDFLAGS=-module -avoid-version @PGSQL_lib@ -Wl,-Bstatic -lpq endif libgpgsqlbackend_la_LIBADD=-lssl @LIBCRYPT@ -lcrypto - diff --git a/pdns/dnssec.schema.pgsql.sql b/modules/gpgsqlbackend/dnssec.schema.pgsql.sql similarity index 100% rename from pdns/dnssec.schema.pgsql.sql rename to modules/gpgsqlbackend/dnssec.schema.pgsql.sql diff --git a/pdns/no-dnssec.schema.pgsql.sql b/modules/gpgsqlbackend/no-dnssec.schema.pgsql.sql similarity index 100% rename from pdns/no-dnssec.schema.pgsql.sql rename to modules/gpgsqlbackend/no-dnssec.schema.pgsql.sql diff --git a/modules/gsqlite3backend/Makefile.am b/modules/gsqlite3backend/Makefile.am index 0c9f3b1e5..bd4d93960 100644 --- a/modules/gsqlite3backend/Makefile.am +++ b/modules/gsqlite3backend/Makefile.am @@ -1,7 +1,8 @@ AM_CPPFLAGS=@THREADFLAGS@ $(BOOST_CPPFLAGS) lib_LTLIBRARIES = libgsqlite3backend.la -EXTRA_DIST=OBJECTFILES OBJECTLIBS +EXTRA_DIST=OBJECTFILES OBJECTLIBS \ + dnssec.schema.sqlite3.sql no-dnssec.schema.sqlite3.sql libgsqlite3backend_la_SOURCES=gsqlite3backend.cc gsqlite3backend.hh diff --git a/pdns/dnssec.schema.sqlite3.sql b/modules/gsqlite3backend/dnssec.schema.sqlite3.sql similarity index 100% rename from pdns/dnssec.schema.sqlite3.sql rename to modules/gsqlite3backend/dnssec.schema.sqlite3.sql diff --git a/pdns/no-dnssec.schema.sqlite3.sql b/modules/gsqlite3backend/no-dnssec.schema.sqlite3.sql similarity index 100% rename from pdns/no-dnssec.schema.sqlite3.sql rename to modules/gsqlite3backend/no-dnssec.schema.sqlite3.sql diff --git a/pdns/Makefile.am b/pdns/Makefile.am index 8e88cc772..b5edd32fc 100644 --- a/pdns/Makefile.am +++ b/pdns/Makefile.am @@ -16,8 +16,6 @@ endif EXTRA_DIST = dnslabeltext.rl dnslabeltext.cc mtasker.cc inflighter.cc docs/pdns_control.8 \ docs/pdns_server.8 docs/zone2sql.8 docs/zone2ldap.8 docs/pdnssec.8 \ docs/dnsreplay.8 docs/dnsscope.8 docs/dnswasher.8 docs/pdnssec.8 docs/zone2ldap.8 \ - dnssec.schema.mysql.sql dnssec.schema.pgsql.sql dnssec.schema.sqlite3.sql \ - no-dnssec.schema.mysql.sql no-dnssec.schema.pgsql.sql no-dnssec.schema.sqlite3.sql \ bind-dnssec.schema.sqlite3.sql bindparser.h SUBDIRS= $(POLARSSL_SUBDIR) ext/yahttp diff --git a/pdns/docs/pdns.xml b/pdns/docs/pdns.xml index be93af1fa..3964a2678 100755 --- a/pdns/docs/pdns.xml +++ b/pdns/docs/pdns.xml @@ -11398,7 +11398,7 @@ name IN A 192.0.2.4 Example: configuring MySQL Connect to MySQL as a user with sufficient privileges and issue the following commands: - + GRANT SELECT ON supermasters TO pdns; @@ -17523,14 +17523,14 @@ authoritative). The default setup conforms to the following schema: - + Zone2sql with the --gmysql flag also assumes this layout is in place. To support or migrate to DNSSEC, the following SQL statements must be executed: - + For full migration notes, please see . @@ -17559,7 +17559,7 @@ REFERENCES `domains` (`id`) ON DELETE CASCADE; PostgreSQL specifics The default setup conforms to the following schema, which you should add to a PostgreSQL database. - + Zone2sql with the --gpgsql flag also assumes this layout is in place. @@ -17570,7 +17570,7 @@ REFERENCES `domains` (`id`) ON DELETE CASCADE; To support DNSSEC or to migrate to DNSSEC, the following statements have to be issued: - + For full migration notes, please see . @@ -19093,7 +19093,7 @@ VALUES (:zoneid, :ip) Before you can use this backend you first have to set it up and fill it with data. The default setup conforms to the following schema: - + This schema contains all elements needed for master, slave and superslave operation. @@ -19102,7 +19102,7 @@ VALUES (:zoneid, :ip) To support DNSSEC, or to migrate to DNSSEC, the following statements must be issued: - + For full migration notes, please see . diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop index 24e2d1ae8..088de45f6 100755 --- a/regression-tests/start-test-stop +++ b/regression-tests/start-test-stop @@ -492,7 +492,7 @@ case $context in || echo ignoring mysqladmin drop failure mysqladmin --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" create "$GMYSQLDB" mysql --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" \ - "$GMYSQLDB" < ../pdns/no-dnssec.schema.mysql.sql + "$GMYSQLDB" < ../modules/gmysqlbackend/no-dnssec.schema.mysql.sql tosql gmysql | mysql --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" \ "$GMYSQLDB" @@ -565,9 +565,9 @@ __EOF__ || echo ignoring mysqladmin drop failure mysqladmin --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" create "$GMYSQLDB" mysql --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" \ - "$GMYSQLDB" < ../pdns/no-dnssec.schema.mysql.sql + "$GMYSQLDB" < ../modules/gmysqlbackend/no-dnssec.schema.mysql.sql mysql --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" \ - "$GMYSQLDB" < ../pdns/dnssec.schema.mysql.sql + "$GMYSQLDB" < ../modules/gmysqlbackend/dnssec.schema.mysql.sql tosql gmysql | mysql --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" \ "$GMYSQLDB" @@ -631,8 +631,8 @@ __EOF__ dropdb --user="$GPGSQLUSER" "$GPGSQLDB" || echo ignoring dropdb failure createdb --user="$GPGSQLUSER" "$GPGSQLDB" || echo ignoring createdb failure # FIXME - psql --user="$GPGSQLUSER" "$GPGSQLDB" < ../pdns/no-dnssec.schema.pgsql.sql - psql --user="$GPGSQLUSER" "$GPGSQLDB" < ../pdns/dnssec.schema.pgsql.sql + psql --user="$GPGSQLUSER" "$GPGSQLDB" < ../modules/gpgsqlbackend/no-dnssec.schema.pgsql.sql + psql --user="$GPGSQLUSER" "$GPGSQLDB" < ../modules/gpgsqlbackend/dnssec.schema.pgsql.sql tosql gpgsql | psql --user="$GPGSQLUSER" "$GPGSQLDB" 2>&1 | uniq -c @@ -683,7 +683,7 @@ __EOF__ dropdb --user="$GPGSQLUSER" "$GPGSQLDB" || echo ignoring mysqladmin drop failure createdb --user="$GPGSQLUSER" "$GPGSQLDB" || echo ignoring mysqladmin drop failure - psql --user="$GPGSQLUSER" "$GPGSQLDB" < ../pdns/no-dnssec.schema.pgsql.sql + psql --user="$GPGSQLUSER" "$GPGSQLDB" < ../modules/gpgsqlbackend/no-dnssec.schema.pgsql.sql tosql gpgsql | psql --user="$GPGSQLUSER" "$GPGSQLDB" 2>&1 | uniq -c @@ -711,7 +711,7 @@ __EOF__ gsqlite3-nodnssec) rm -f pdns.sqlite3 - sqlite3 pdns.sqlite3 < ../pdns/no-dnssec.schema.sqlite3.sql + sqlite3 pdns.sqlite3 < ../modules/gsqlite3backend/no-dnssec.schema.sqlite3.sql tosql gsqlite | sqlite3 pdns.sqlite3 echo ANALYZE\; | sqlite3 pdns.sqlite3 @@ -735,7 +735,7 @@ __EOF__ ;; opendbx-sqlite3) rm -f pdns-opendbx.sqlite3 - sqlite3 pdns-opendbx.sqlite3 < ../pdns/no-dnssec.schema.sqlite3.sql + sqlite3 pdns-opendbx.sqlite3 < ../modules/gsqlite3backend/no-dnssec.schema.sqlite3.sql tosql gsqlite | sqlite3 pdns-opendbx.sqlite3 sqlite3 pdns-opendbx.sqlite3 "ALTER TABLE domains ADD status CHARACTER(1) NOT NULL DEFAULT 'A'; \ ALTER TABLE domains ADD auto_serial INTEGER DEFAULT 0;" @@ -752,8 +752,8 @@ __EOF__ ;; gsqlite3 | gsqlite3-nsec3 | gsqlite3-nsec3-optout) rm -f pdns.sqlite3 - sqlite3 pdns.sqlite3 < ../pdns/no-dnssec.schema.sqlite3.sql - sqlite3 pdns.sqlite3 < ../pdns/dnssec.schema.sqlite3.sql + sqlite3 pdns.sqlite3 < ../modules/gsqlite3backend/no-dnssec.schema.sqlite3.sql + sqlite3 pdns.sqlite3 < ../modules/gsqlite3backend/dnssec.schema.sqlite3.sql tosql gsqlite | sqlite3 pdns.sqlite3 echo ANALYZE\; | sqlite3 pdns.sqlite3 @@ -936,9 +936,9 @@ startslave () || echo ignoring mysqladmin drop failure mysqladmin --user="$GMYSQL2USER" --password="$GMYSQL2PASSWD" --host="$GMYSQL2HOST" create "$GMYSQL2DB" mysql --user="$GMYSQL2USER" --password="$GMYSQL2PASSWD" --host="$GMYSQL2HOST" \ - "$GMYSQL2DB" < ../pdns/no-dnssec.schema.mysql.sql + "$GMYSQL2DB" < ../modules/gmysqlbackend/no-dnssec.schema.mysql.sql mysql --user="$GMYSQL2USER" --password="$GMYSQL2PASSWD" --host="$GMYSQL2HOST" \ - "$GMYSQL2DB" < ../pdns/dnssec.schema.mysql.sql + "$GMYSQL2DB" < ../modules/gmysqlbackend/dnssec.schema.mysql.sql for zone in $(grep zone named.conf | cut -f2 -d\" | tac) do @@ -989,8 +989,8 @@ startslave () then context=${context}-presigned rm -f pdns.sqlite31 - sqlite3 pdns.sqlite31 < ../pdns/no-dnssec.schema.sqlite3.sql - sqlite3 pdns.sqlite31 < ../pdns/dnssec.schema.sqlite3.sql + sqlite3 pdns.sqlite31 < ../modules/gsqlite3backend/no-dnssec.schema.sqlite3.sql + sqlite3 pdns.sqlite31 < ../modules/gsqlite3backend/dnssec.schema.sqlite3.sql for zone in $(grep zone named.conf | cut -f2 -d\" | tac) do