Skip to content

Commit

Permalink
chore(devadmin): remove container
Browse files Browse the repository at this point in the history
The devadmin functionalities have become obsolete because we have the REST
API now, and manual access to the database is easily possible via
docker-compose.

After applying this commit, some manual cleanup is advised:

  - In .env, clean up the devadmin-related section.

  - On dblord, delete the poweradmin database user.

  - In the pdns database on dblord, drop the following tables:
      - users
      - perm_items
      - perm_templ
      - perm_templ_items
      - zones
      - zone_templ
      - zone_templ_records
      - records_zone_templ
      - migrations

    These tables are not required by PowerDNS.
  • Loading branch information
peterthomassen authored and nils-wisiol committed Aug 19, 2017
1 parent 69a6444 commit 2911808
Show file tree
Hide file tree
Showing 14 changed files with 0 additions and 429 deletions.
4 changes: 0 additions & 4 deletions .env.default
Expand Up @@ -37,7 +37,3 @@ DESECSTACK_DBMASTER_SUBJECT_ns2replication=ns2.desec.io
DESECSTACK_NSMASTER_APIKEY=
DESECSTACK_NSMASTER_CARBONSERVER=
DESECSTACK_NSMASTER_CARBONOURNAME=

# devadmin-related
DESECSTACK_DEVADMIN_PASSWORD_poweradmin=
DESECSTACK_DEVADMIN_SESSIONKEY_poweradmin=
1 change: 0 additions & 1 deletion .travis.yml
Expand Up @@ -20,7 +20,6 @@ env:
- DESECSTACK_DB_SUBJECT_ns1replication=9Fn33T5yGufacv
- DESECSTACK_DB_PASSWORD_ns2replication=9Fn33T5yGulkjhetrlkjew
- DESECSTACK_DB_SUBJECT_ns2replication=9Fn33T5yGukjnrtj
- DESECSTACK_DEVADMIN_PASSWORDmd5=.
- DESECSTACK_NSLORD_APIKEY=9Fn33T5yGukjekwjew
- DESECSTACK_NSMASTER_APIKEY=LLq1orOQuXCINUz4TV
- DESECSTACK_IPV4_REAR_PREFIX16=172.19
Expand Down
4 changes: 0 additions & 4 deletions README.md
Expand Up @@ -8,7 +8,6 @@ This is a docker-compose application providing the basic stack for deSEC name se
- `nsmaster`: Stealth authoritative DNS server (PowerDNS). Receives fully signed AXFR zone transfers from `nslord`. No access to keys.
- `api`: RESTful API to create deSEC users and domains. Currently used for dynDNS purposes only.
- `dbapi`, `dblord`, `dbmaster`: MariaDB database services for `api`, `nslord`, and `nsmaster`, respectively. The `dbmaster` database is exposed at 3306 for TLS-secured replication.
- `devadmin`: Web server with phpmyadmin and poweradmin for dev purposes.


Requirements
Expand Down Expand Up @@ -58,9 +57,6 @@ Although most configuration is contained in this repository, some external depen
- `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)
- devadmin-related
- `DESECSTACK_DEVADMIN_PASSWORD_poweradmin`: poweradmin password (if you're planning to use the dev environment)
- `DESECSTACK_DEVADMIN_SESSIONKEY_poweradmin`: poweradmin session key

Running the standard stack will also fire up an instance of the `www` proxy service (see `desec-www` repository), assuming that the `desec-static` project is located under the `static` directory/symlink.

Expand Down
4 changes: 0 additions & 4 deletions dblord/initdb.d/00-init.sql.var
Expand Up @@ -2,7 +2,3 @@
CREATE DATABASE pdns;
CREATE USER 'pdns'@'${DESECSTACK_IPV4_REAR_PREFIX16}.3.%' IDENTIFIED BY '${DESECSTACK_DBLORD_PASSWORD_pdns}';
GRANT SELECT, INSERT, UPDATE, DELETE ON pdns.* TO 'pdns'@'${DESECSTACK_IPV4_REAR_PREFIX16}.3.%';

-- poweradmin database (for devadmin)
CREATE USER 'poweradmin'@'${DESECSTACK_IPV4_REAR_PREFIX16}.3.%' IDENTIFIED BY '${DESECSTACK_DBLORD_PASSWORD_poweradmin}';
GRANT SELECT, INSERT, UPDATE, DELETE ON pdns.* TO 'poweradmin'@'${DESECSTACK_IPV4_REAR_PREFIX16}.3.%';
2 changes: 0 additions & 2 deletions dblord/initdb.d/20-poweradmin-mysql-db-structure.sql

This file was deleted.

121 changes: 0 additions & 121 deletions dblord/initdb.d/20-poweradmin-mysql-db-structure.sql.var

This file was deleted.

22 changes: 0 additions & 22 deletions devadmin/Dockerfile

This file was deleted.

6 changes: 0 additions & 6 deletions devadmin/README.md

This file was deleted.

175 changes: 0 additions & 175 deletions devadmin/conf/phpmyadmin/config.inc.php

This file was deleted.

0 comments on commit 2911808

Please sign in to comment.