Remove abandoned (for now) powerdns integration

.docker/web/entrypoint.sh

@@ -13,7 +13,6 @@ done
 
 # Apply pending migrations on every start
 python3 -m pipenv run python -m serveradmin migrate --no-input
-python3 -m pipenv run python -m serveradmin migrate --database=powerdns --no-input
 
 # Requires Django >= 3.x
 # pipenv run python -m serveradmin createsuper --no-input

.env.dist

@@ -1,19 +1,10 @@
-POSTGRES_VERSION=14
-
 # db service database settings
 POSTGRES_DB=serveradmin
 POSTGRES_USER=serveradmin
 POSTGRES_PASSWORD=serveradmin
 POSTGRES_HOST=db
 POSTGRES_PORT=5432
 
-# PowerDNS db service database settings
-POSTGRES_POWERDNS_DB=powerdns
-POSTGRES_POWERDNS_USER=powerdns
-POSTGRES_POWERDNS_PASSWORD=powerdns
-POSTGRES_POWERDNS_HOST=db
-POSTGRES_POWERDNS_PORT=5432
-
 # Credentials for default super user (requires Django >= 3.x)
 DJANGO_SUPERUSER_USERNAME=serveradmin
 [email protected]

.github/workflows/tests.yml

@@ -31,19 +31,6 @@ jobs:
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
-      pdns-db:
-        image: 'postgres:15'
-        env:
-          POSTGRES_USER: powerdns
-          POSTGRES_PASSWORD: powerdns
-          POSTGRES_DB: powerdns
-        ports:
-          - 5432/tcp
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
 
     steps:
       - name: Setup python
@@ -71,18 +58,6 @@ jobs:
                       'client_encoding': 'UTF8',
                   },
               },
-              'powerdns': {
-                  'ENGINE': 'django.db.backends.postgresql',
-                  'HOST': '127.0.0.1',
-                  'PORT': '${{ job.services.pdns-db.ports[5432] }}',
-                  'NAME': 'powerdns',
-                  'USER': 'powerdns',
-                  'PASSWORD': 'powerdns',
-                  'OPTIONS': {
-                      'connect_timeout': 1,
-                      'client_encoding': 'UTF8',
-                  },
-              },
           }
           SECRET_KEY = 'TEST'
           TIME_ZONE = 'Europe/Berlin'

docker-compose.yml

@@ -2,14 +2,13 @@ version: "3.9"
 
 services:
   db:
-    image: "postgres:${POSTGRES_VERSION}"
+    image: "postgres:15"
     environment:
       - POSTGRES_DB=${POSTGRES_DB}
       - POSTGRES_USER=${POSTGRES_USER}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     volumes:
       - ".docker/db/postgres.conf:/etc/postgresql/postgres.conf:ro"
-      - ".docker/db/pdns-db.sql:/docker-entrypoint-initdb.d/pdns-db.sql:ro"
       - postgres-data:/var/lib/postgresql/data
     ports:
       - "127.0.0.1:5432:5432"
@@ -24,20 +23,5 @@ services:
     depends_on:
       - db
 
-  pdns-auth:
-    build: .docker/pdns-auth
-    environment:
-      - GPGSQL_HOST=${POSTGRES_POWERDNS_HOST}
-      - GPGSQL_PORT=5432
-      - GPGSQL_DBNAME=${POSTGRES_POWERDNS_DB}
-      - GPGSQL_USER=${POSTGRES_POWERDNS_USER}
-      - GPGSQL_PASSWORD=${POSTGRES_POWERDNS_PASSWORD}
-    ports:
-      - "127.0.0.1:1053:53"
-      - "127.0.0.1:1053:53/udp"
-    depends_on:
-      - db
-      - web
-
 volumes:
   postgres-data:

docs/source/index.rst

@@ -7,4 +7,3 @@ Serveradmin Documentation
    extending.rst
    python-api.rst
    module-adminapi.rst
-   extensions.rst

serveradmin/local_settings.py.example

@@ -31,7 +31,7 @@ Copyright (c) 2019 InnoGames GmbH
 # LOGGING['loggers']['myapp'] = {'level': LOG_LEVEL}
 
 # # See https://docs.djangoproject.com/en/dev/ref/settings/#databases
-# # for more detauls on how to configure your database connection.
+# # for more defaults on how to configure your database connection.
 # DATABASES = {
 # }