mirror of
https://github.com/xiaoxinpro/nginx-proxy-manager-zh.git
synced 2025-01-23 05:18:12 -05:00
Fix for pdns startup
This commit is contained in:
parent
5b4fe24957
commit
e433bdaeec
6
Jenkinsfile
vendored
6
Jenkinsfile
vendored
@ -112,12 +112,16 @@ pipeline {
|
|||||||
// Dumps to analyze later
|
// Dumps to analyze later
|
||||||
sh 'mkdir -p debug'
|
sh 'mkdir -p debug'
|
||||||
sh 'docker-compose cp fullstack:/data/logs/acme.sh.log debug/acme.sh.log'
|
sh 'docker-compose cp fullstack:/data/logs/acme.sh.log debug/acme.sh.log'
|
||||||
|
|
||||||
sh 'docker logs $(docker-compose ps -q fullstack) > debug/docker_fullstack.log'
|
sh 'docker logs $(docker-compose ps -q fullstack) > debug/docker_fullstack.log'
|
||||||
|
sh 'docker-compose logs fullstack > debug/docker_compose_fullstack.log'
|
||||||
sh 'docker logs $(docker-compose ps -q stepca) > debug/docker_stepca.log'
|
sh 'docker logs $(docker-compose ps -q stepca) > debug/docker_stepca.log'
|
||||||
|
sh 'docker-compose logs stepca > debug/docker_compose_stepca.log'
|
||||||
sh 'docker logs $(docker-compose ps -q pdns) > debug/docker_pdns.log'
|
sh 'docker logs $(docker-compose ps -q pdns) > debug/docker_pdns.log'
|
||||||
|
sh 'docker-compose logs pdns > debug/docker_compose_pdns.log'
|
||||||
sh 'docker logs $(docker-compose ps -q pdns-db) > debug/docker_pdns-db.log'
|
sh 'docker logs $(docker-compose ps -q pdns-db) > debug/docker_pdns-db.log'
|
||||||
|
sh 'docker-compose logs pdns-db > debug/docker_compose_pdns-db.log'
|
||||||
sh 'docker logs $(docker-compose ps -q dnsrouter) > debug/docker_dnsrouter.log'
|
sh 'docker logs $(docker-compose ps -q dnsrouter) > debug/docker_dnsrouter.log'
|
||||||
|
sh 'docker-compose logs dnsrouter > debug/docker_compose_dnsrouter.log'
|
||||||
junit 'test/results/junit/*'
|
junit 'test/results/junit/*'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -4,12 +4,12 @@ CREATE TABLE `comments` (
|
|||||||
`name` varchar(255) NOT NULL,
|
`name` varchar(255) NOT NULL,
|
||||||
`type` varchar(10) NOT NULL,
|
`type` varchar(10) NOT NULL,
|
||||||
`modified_at` int(11) NOT NULL,
|
`modified_at` int(11) NOT NULL,
|
||||||
`account` varchar(40) CHARACTER SET utf8mb3 DEFAULT NULL,
|
`account` varchar(40) DEFAULT NULL,
|
||||||
`comment` text CHARACTER SET utf8mb3 NOT NULL,
|
`comment` text NOT NULL,
|
||||||
PRIMARY KEY (`id`),
|
PRIMARY KEY (`id`),
|
||||||
KEY `comments_name_type_idx` (`name`,`type`),
|
KEY `comments_name_type_idx` (`name`,`type`),
|
||||||
KEY `comments_order_idx` (`domain_id`,`modified_at`)
|
KEY `comments_order_idx` (`domain_id`,`modified_at`)
|
||||||
);
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
|
||||||
|
|
||||||
CREATE TABLE `cryptokeys` (
|
CREATE TABLE `cryptokeys` (
|
||||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||||
@ -20,7 +20,7 @@ CREATE TABLE `cryptokeys` (
|
|||||||
`content` text DEFAULT NULL,
|
`content` text DEFAULT NULL,
|
||||||
PRIMARY KEY (`id`),
|
PRIMARY KEY (`id`),
|
||||||
KEY `domainidindex` (`domain_id`)
|
KEY `domainidindex` (`domain_id`)
|
||||||
);
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
|
||||||
|
|
||||||
CREATE TABLE `domainmetadata` (
|
CREATE TABLE `domainmetadata` (
|
||||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||||
@ -29,7 +29,7 @@ CREATE TABLE `domainmetadata` (
|
|||||||
`content` text DEFAULT NULL,
|
`content` text DEFAULT NULL,
|
||||||
PRIMARY KEY (`id`),
|
PRIMARY KEY (`id`),
|
||||||
KEY `domainmetadata_idx` (`domain_id`,`kind`)
|
KEY `domainmetadata_idx` (`domain_id`,`kind`)
|
||||||
);
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
|
||||||
|
|
||||||
INSERT INTO `domainmetadata` VALUES (1,1,'SOA-EDIT-API','DEFAULT');
|
INSERT INTO `domainmetadata` VALUES (1,1,'SOA-EDIT-API','DEFAULT');
|
||||||
|
|
||||||
@ -40,10 +40,10 @@ CREATE TABLE `domains` (
|
|||||||
`last_check` int(11) DEFAULT NULL,
|
`last_check` int(11) DEFAULT NULL,
|
||||||
`type` varchar(6) NOT NULL,
|
`type` varchar(6) NOT NULL,
|
||||||
`notified_serial` int(10) unsigned DEFAULT NULL,
|
`notified_serial` int(10) unsigned DEFAULT NULL,
|
||||||
`account` varchar(40) CHARACTER SET utf8mb3 DEFAULT NULL,
|
`account` varchar(40) DEFAULT NULL,
|
||||||
PRIMARY KEY (`id`),
|
PRIMARY KEY (`id`),
|
||||||
UNIQUE KEY `name_index` (`name`)
|
UNIQUE KEY `name_index` (`name`)
|
||||||
);
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
|
||||||
|
|
||||||
INSERT INTO `domains` VALUES (1,'example.com','',NULL,'NATIVE',NULL,'');
|
INSERT INTO `domains` VALUES (1,'example.com','',NULL,'NATIVE',NULL,'');
|
||||||
|
|
||||||
@ -56,13 +56,13 @@ CREATE TABLE `records` (
|
|||||||
`ttl` int(11) DEFAULT NULL,
|
`ttl` int(11) DEFAULT NULL,
|
||||||
`prio` int(11) DEFAULT NULL,
|
`prio` int(11) DEFAULT NULL,
|
||||||
`disabled` tinyint(1) DEFAULT 0,
|
`disabled` tinyint(1) DEFAULT 0,
|
||||||
`ordername` varchar(255) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
|
`ordername` varchar(255) DEFAULT NULL,
|
||||||
`auth` tinyint(1) DEFAULT 1,
|
`auth` tinyint(1) DEFAULT 1,
|
||||||
PRIMARY KEY (`id`),
|
PRIMARY KEY (`id`),
|
||||||
KEY `nametype_index` (`name`,`type`),
|
KEY `nametype_index` (`name`,`type`),
|
||||||
KEY `domain_id` (`domain_id`),
|
KEY `domain_id` (`domain_id`),
|
||||||
KEY `ordername` (`ordername`)
|
KEY `ordername` (`ordername`)
|
||||||
);
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
|
||||||
|
|
||||||
INSERT INTO `records` VALUES
|
INSERT INTO `records` VALUES
|
||||||
(1,1,'example.com','NS','ns1.pdns',1500,0,0,NULL,1),
|
(1,1,'example.com','NS','ns1.pdns',1500,0,0,NULL,1),
|
||||||
@ -73,9 +73,9 @@ INSERT INTO `records` VALUES
|
|||||||
CREATE TABLE `supermasters` (
|
CREATE TABLE `supermasters` (
|
||||||
`ip` varchar(64) NOT NULL,
|
`ip` varchar(64) NOT NULL,
|
||||||
`nameserver` varchar(255) NOT NULL,
|
`nameserver` varchar(255) NOT NULL,
|
||||||
`account` varchar(40) CHARACTER SET utf8mb3 NOT NULL,
|
`account` varchar(40) NOT NULL,
|
||||||
PRIMARY KEY (`ip`,`nameserver`)
|
PRIMARY KEY (`ip`,`nameserver`)
|
||||||
);
|
) DEFAULT CHARSET=latin1;
|
||||||
|
|
||||||
CREATE TABLE `tsigkeys` (
|
CREATE TABLE `tsigkeys` (
|
||||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||||
@ -84,4 +84,4 @@ CREATE TABLE `tsigkeys` (
|
|||||||
`secret` varchar(255) DEFAULT NULL,
|
`secret` varchar(255) DEFAULT NULL,
|
||||||
PRIMARY KEY (`id`),
|
PRIMARY KEY (`id`),
|
||||||
UNIQUE KEY `namealgoindex` (`name`,`algorithm`)
|
UNIQUE KEY `namealgoindex` (`name`,`algorithm`)
|
||||||
);
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
|
||||||
|
@ -67,7 +67,7 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- pdns_mysql_vol:/var/lib/mysql
|
- pdns_mysql_vol:/var/lib/mysql
|
||||||
- '/etc/localtime:/etc/localtime:ro'
|
- '/etc/localtime:/etc/localtime:ro'
|
||||||
- ./dev/pdns-db.sql:/docker-entrypoint-initdb.d/01_init.sql:ro
|
- './dev/pdns-db.sql:/docker-entrypoint-initdb.d/01_init.sql:ro'
|
||||||
|
|
||||||
dnsrouter:
|
dnsrouter:
|
||||||
image: jc21/dnsrouter
|
image: jc21/dnsrouter
|
||||||
|
@ -114,7 +114,7 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- npm_pdns_mysql_vol:/var/lib/mysql
|
- npm_pdns_mysql_vol:/var/lib/mysql
|
||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
- ./dev/pdns-db.sql:/docker-entrypoint-initdb.d/01_init.sql:ro
|
- './dev/pdns-db.sql:/docker-entrypoint-initdb.d/01_init.sql:ro'
|
||||||
|
|
||||||
npm-dnsrouter:
|
npm-dnsrouter:
|
||||||
image: jc21/dnsrouter
|
image: jc21/dnsrouter
|
||||||
|
Loading…
Reference in New Issue
Block a user