From 4600c0b6ed989efdab2ad3100efa50d6fe02c353 Mon Sep 17 00:00:00 2001 From: Carl Kittelberger Date: Mon, 28 Mar 2022 18:09:16 +0200 Subject: [PATCH] Install mysql schema from package instead of supplying ourselves. This replaces the changes in b035eef30de694a2fb74331c8995ada13bb2cef8. --- pdns/Dockerfile | 2 +- pdns/schema.mysql.sql | 90 ------------------------------------------- 2 files changed, 1 insertion(+), 91 deletions(-) delete mode 100644 pdns/schema.mysql.sql diff --git a/pdns/Dockerfile b/pdns/Dockerfile index f049a66..b62888a 100644 --- a/pdns/Dockerfile +++ b/pdns/Dockerfile @@ -19,6 +19,7 @@ ADD pdns.list /etc/apt/sources.list.d/pdns.list ADD pdns.preference /etc/apt/preferences.d/pdns RUN apt-get update && \ + echo "path-include /usr/share/doc/*/*.sql" >> /etc/dpkg/dpkg.cfg.d/docker && \ DEBIAN_FRONTEND=noninteractive apt-get install -q -y pdns-server pdns-backend-mysql mariadb-client && \ rm /etc/powerdns/pdns.d/*.conf && rm /etc/powerdns/*.conf && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends cron jq && \ @@ -31,7 +32,6 @@ EXPOSE 53/udp 53/tcp ADD start.sh /usr/local/bin/start.sh ADD fixdsrrs.sh /usr/local/bin/fixdsrrs.sh ADD secallzones.sh /usr/local/bin/secallzones.sh -ADD schema.mysql.sql /usr/share/doc/pdns-backend-mysql/ RUN chmod a+x /usr/local/bin/*.sh CMD ["/usr/local/bin/start.sh"] diff --git a/pdns/schema.mysql.sql b/pdns/schema.mysql.sql deleted file mode 100644 index 002fe92..0000000 --- a/pdns/schema.mysql.sql +++ /dev/null @@ -1,90 +0,0 @@ -CREATE TABLE domains ( - id INT AUTO_INCREMENT, - name VARCHAR(255) NOT NULL, - master VARCHAR(128) DEFAULT NULL, - last_check INT DEFAULT NULL, - type VARCHAR(6) NOT NULL, - notified_serial INT DEFAULT NULL, - account VARCHAR(40) DEFAULT NULL, - PRIMARY KEY (id) -) Engine=InnoDB; - -CREATE UNIQUE INDEX name_index ON domains(name); - - -CREATE TABLE records ( - id INT AUTO_INCREMENT, - domain_id INT DEFAULT NULL, - name VARCHAR(255) DEFAULT NULL, - type VARCHAR(10) DEFAULT NULL, - content VARCHAR(64000) DEFAULT NULL, - ttl INT DEFAULT NULL, - prio INT DEFAULT NULL, - change_date INT DEFAULT NULL, - disabled TINYINT(1) DEFAULT 0, - ordername VARCHAR(255) BINARY DEFAULT NULL, - auth TINYINT(1) DEFAULT 1, - PRIMARY KEY (id) -) Engine=InnoDB; - -CREATE INDEX nametype_index ON records(name,type); -CREATE INDEX domain_id ON records(domain_id); -CREATE INDEX recordorder ON records (domain_id, ordername); - - -CREATE TABLE supermasters ( - ip VARCHAR(64) NOT NULL, - nameserver VARCHAR(255) NOT NULL, - account VARCHAR(40) NOT NULL, - PRIMARY KEY (ip, nameserver) -) Engine=InnoDB; - - -CREATE TABLE comments ( - id INT AUTO_INCREMENT, - domain_id INT NOT NULL, - name VARCHAR(255) NOT NULL, - type VARCHAR(10) NOT NULL, - modified_at INT NOT NULL, - account VARCHAR(40) NOT NULL, - comment VARCHAR(64000) NOT NULL, - PRIMARY KEY (id) -) Engine=InnoDB; - -CREATE INDEX comments_domain_id_idx ON comments (domain_id); -CREATE INDEX comments_name_type_idx ON comments (name, type); -CREATE INDEX comments_order_idx ON comments (domain_id, modified_at); - - -CREATE TABLE domainmetadata ( - id INT AUTO_INCREMENT, - domain_id INT NOT NULL, - kind VARCHAR(32), - content TEXT, - PRIMARY KEY (id) -) Engine=InnoDB; - -CREATE INDEX domainmetadata_idx ON domainmetadata (domain_id, kind); - - -CREATE TABLE cryptokeys ( - id INT AUTO_INCREMENT, - domain_id INT NOT NULL, - flags INT NOT NULL, - active BOOL, - content TEXT, - PRIMARY KEY(id) -) Engine=InnoDB; - -CREATE INDEX domainidindex ON cryptokeys(domain_id); - - -CREATE TABLE tsigkeys ( - id INT AUTO_INCREMENT, - name VARCHAR(255), - algorithm VARCHAR(50), - secret VARCHAR(255), - PRIMARY KEY (id) -) Engine=InnoDB; - -CREATE UNIQUE INDEX namealgoindex ON tsigkeys(name, algorithm);