(dbmaster): remove old replication setup

.env.default

@@ -34,10 +34,6 @@ DESECSTACK_NSLORD_DEFAULT_TTL=3600
 
 # nsmaster-related
 DESECSTACK_DBMASTER_PASSWORD_pdns=
-DESECSTACK_DBMASTER_PASSWORD_ns1replication=
-DESECSTACK_DBMASTER_SUBJECT_ns1replication=ns1.desec.io
-DESECSTACK_DBMASTER_PASSWORD_ns2replication=
-DESECSTACK_DBMASTER_SUBJECT_ns2replication=ns2.desec.io
 DESECSTACK_NSMASTER_APIKEY=
 DESECSTACK_NSMASTER_CARBONSERVER=
 DESECSTACK_NSMASTER_CARBONOURNAME=

.env.dev

@@ -34,10 +34,6 @@ DESECSTACK_NSLORD_DEFAULT_TTL=3600
 
 # nsmaster-related
 DESECSTACK_DBMASTER_PASSWORD_pdns=insecure
-DESECSTACK_DBMASTER_PASSWORD_ns1replication=insecure
-DESECSTACK_DBMASTER_SUBJECT_ns1replication=ns1.desec.io
-DESECSTACK_DBMASTER_PASSWORD_ns2replication=insecure
-DESECSTACK_DBMASTER_SUBJECT_ns2replication=ns2.desec.io
 DESECSTACK_NSMASTER_APIKEY=insecure
 DESECSTACK_NSMASTER_CARBONSERVER=
 DESECSTACK_NSMASTER_CARBONOURNAME=

.travis.yml

@@ -20,10 +20,6 @@ env:
    - DESECSTACK_DBAPI_PASSWORD_desec=9Fn33T5yGueeee
    - DESECSTACK_DB_PASSWORD_pdnslord=9Fn33T5yGulkjlskdf
    - DESECSTACK_DB_PASSWORD_pdnsmaster=9Fn33T5yGukjwelt
-   - DESECSTACK_DB_PASSWORD_ns1replication=9Fn33T5yGuejeje
-   - DESECSTACK_DB_SUBJECT_ns1replication=9Fn33T5yGufacv
-   - DESECSTACK_DB_PASSWORD_ns2replication=9Fn33T5yGulkjhetrlkjew
-   - DESECSTACK_DB_SUBJECT_ns2replication=9Fn33T5yGukjnrtj
    - DESECSTACK_NSLORD_APIKEY=9Fn33T5yGukjekwjew
    - DESECSTACK_NSLORD_DEFAULT_TTL=1234
    - DESECSTACK_NSMASTER_APIKEY=LLq1orOQuXCINUz4TV

README.md

@@ -51,10 +51,6 @@ Although most configuration is contained in this repository, some external depen
       - `DESECSTACK_NSLORD_DEFAULT_TTL`: TTL to use by default, including for default NS records
     - nsmaster-related
       - `DESECSTACK_DBMASTER_PASSWORD_pdns`: mysql password for pdns on nsmaster
-      - `DESECSTACK_DBMASTER_PASSWORD_ns1replication`: slave 1 replication password
-      - `DESECSTACK_DBMASTER_SUBJECT_ns1replication`: slave 1 replication SSL certificate subject name
-      - `DESECSTACK_DBMASTER_PASSWORD_ns2replication`: slave 2 replication password
-      - `DESECSTACK_DBMASTER_SUBJECT_ns2replication`: slave 1 replication SSL certificate subject name
       - `DESECSTACK_NSMASTER_APIKEY`: pdns API key on nsmaster (required so that we can execute zone deletions on nsmaster, which replicates to the slaves)
       - `DESECSTACK_NSMASTER_CARBONSERVER`: pdns `carbon-server` setting on nsmaster (optional)
       - `DESECSTACK_NSMASTER_CARBONOURNAME`: pdns `carbon-ourname` setting on nsmaster (optional)

dbmaster/initdb.d/00-init.sql.var

@@ -2,12 +2,3 @@
 CREATE DATABASE pdns;
 CREATE USER 'pdns'@'${DESECSTACK_IPV4_REAR_PREFIX16}.4.%' IDENTIFIED BY '${DESECSTACK_DBMASTER_PASSWORD_pdns}';
 GRANT SELECT, INSERT, UPDATE, DELETE ON pdns.* TO 'pdns'@'${DESECSTACK_IPV4_REAR_PREFIX16}.4.%';
-
--- replication
-CREATE USER ns1@'%' IDENTIFIED BY "${DESECSTACK_DBMASTER_PASSWORD_ns1replication}";
-GRANT RELOAD, REPLICATION CLIENT, REPLICATION SLAVE ON *.* TO ns1@'%' REQUIRE SUBJECT '/CN=${DESECSTACK_DBMASTER_SUBJECT_ns1replication}';
-GRANT SELECT ON pdns.* TO ns1@'%' REQUIRE SUBJECT '/CN=${DESECSTACK_DBMASTER_SUBJECT_ns1replication}';
-
-CREATE USER ns2@'%' IDENTIFIED BY "${DESECSTACK_DBMASTER_PASSWORD_ns2replication}";
-GRANT RELOAD, REPLICATION CLIENT, REPLICATION SLAVE ON *.* TO ns2@'%' REQUIRE SUBJECT '/CN=${DESECSTACK_DBMASTER_SUBJECT_ns2replication}';
-GRANT SELECT ON pdns.* TO ns2@'%' REQUIRE SUBJECT '/CN=${DESECSTACK_DBMASTER_SUBJECT_ns2replication}';

docker-compose.yml

@@ -87,10 +87,6 @@ services:
     environment:
     - DESECSTACK_IPV4_REAR_PREFIX16
     - DESECSTACK_DBMASTER_PASSWORD_pdns
-    - DESECSTACK_DBMASTER_PASSWORD_ns1replication
-    - DESECSTACK_DBMASTER_SUBJECT_ns1replication
-    - DESECSTACK_DBMASTER_PASSWORD_ns2replication
-    - DESECSTACK_DBMASTER_SUBJECT_ns2replication
     networks:
     - rearmaster
     logging: