moving to sqlite3

Author: Ben Firestone

.gitignore

@@ -0,0 +1 @@
+.env

build.sh

@@ -0,0 +1,11 @@
+pushd pdns-recursor
+    docker build -t krypticlabs/pdns-recursor .
+popd
+
+pushd pdns-mysql
+    docker build -t krypticlabs/pdns-mysql .
+popd
+
+pushd pdns-server
+    docker build -t krypticlabs/pdns-server .
+popd

docker-compose.yaml

@@ -2,7 +2,7 @@ version: '3.7'
 
 services:
   pdns-server:
-    image: krypticlabs/pdns-server
+    image: dockerhub.krypticlabs.com/powerdns/pdns-server
     hostname: ${PDNS_HOST}
     container_name: ${PDNS_HOST}
     networks:
@@ -12,11 +12,6 @@ services:
       - '53'
       - '53/udp'
     environment:
-      - PDNS_gmysql_host=${PDNS_DB_HOST}
-      - PDNS_gmysql_port=${PDNS_DB_PORT}
-      - PDNS_gmysql_user=${PDNS_DB_USER}
-      - PDNS_gmysql_password=${PDNS_DB_PASSWORD}
-      - PDNS_gmysql_dbname=${PDNS_DB_NAME}
       - PDNS_master=yes
       - PDNS_api=yes
       - PDNS_api_key=${PDNS_API_KEY}
@@ -29,19 +24,17 @@ services:
       - PDNS_soa_minimum_ttl=1200
       - PDNS_default_soa_name=ns1.ramstone.net
       - PDNS_default_soa_mail=hostmaster.ramstone.net
-    depends_on:
-      - pdns-mysql
 
 
   pdns-recursor:
-    image: krypticlabs/pdns-recursor
+    image: dockerhub.krypticlabs.com/powerdns/pdns-recursor
     hostname: ${PDNS_RECURSOR_HOST}
     container_name: ${PDNS_RECURSOR_HOST}
     networks:
        - default_net
     ports:
-      - "192.168.0.75:53:53/tcp"
-      - "192.168.0.75:53:53/udp"
+      - "192.168.1.45:53:53/tcp"
+      - "192.168.1.45:53:53/udp"
     environment:
       - PDNS_forward-zones=ramstone.net=${PDNS_IP}
       - PDNS_allow-from=192.168.0.0/23
@@ -50,28 +43,8 @@ services:
     depends_on:
       - pdns-server
 
-  pdns-mysql:
-    image: krypticlabs/pdns-mysql
-    hostname: ${PDNS_DB_HOST}
-    container_name: ${PDNS_DB_HOST}
-    networks:
-       - default_net
-    expose:
-      - 3306
-    environment:
-      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
-      - MYSQL_DATABASE=${PDNS_DB_NAME}
-      - MYSQL_USER=${PDNS_DB_USER}
-      - MYSQL_PASSWORD=${PDNS_DB_PASSWORD}
-    volumes:
-      - pdns-mysql-data:/var/lib/mysql
-    healthcheck:
-      test: ["CMD", "mysqladmin" ,"-u", "root", "--password=${MYSQL_ROOT_PASSWORD}", "ping", "-h", "localhost", "-v"]
-      timeout: 10s
-      retries: 5
-
-  admin:
-    image: ngoduykhanh/powerdns-admin:latest
+  pdns-admin:
+    image: dockerhub.krypticlabs.com/powerdns/pdns-admin
     container_name: pdns-admin
     networks:
        - default_net
@@ -82,18 +55,13 @@ services:
       options:
         max-size: 50m
     environment:
-      - SQLALCHEMY_DATABASE_URI=mysql://${PDA_DB_USER}:${PDA_DB_PASSWORD}@${PDNS_DB_HOST}/${PDA_DB_NAME}
       - GUNICORN_TIMEOUT=60
       - GUNICORN_WORKERS=2
       - GUNICORN_LOGLEVEL=DEBUG
       - OFFLINE_MODE=False
     depends_on:
-      - pdns-mysql
       - pdns-server
 
-volumes:
-  pdns-mysql-data:
-
 networks:
   default_net:
     ipam:

pdns-admin/.dockerignore

@@ -0,0 +1,112 @@
+### OSX ###
+*.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### Python ###
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+.pytest_cache/
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+
+# Translations
+*.mo
+*.pot
+
+# Flask stuff:
+flask/
+instance/settings.py
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# celery beat schedule file
+celerybeat-schedule.*
+
+# Node
+node_modules
+npm-debug.log
+
+# Docker
+Dockerfile*
+docker-compose*
+.dockerignore
+
+# Git
+.git
+.gitattributes
+.gitignore
+
+# Vscode
+.vscode
+*.code-workspace
+
+# Others
+.lgtm.yml
+.travis.yml

pdns-admin/.lgtm.yml

@@ -0,0 +1,10 @@
+extraction:
+  python:
+    python_setup:
+      version: 3
+    index:
+      exclude:
+        - .git
+        - upload
+        - flask
+        - node_modules

pdns-admin/.travis.yml

@@ -0,0 +1,5 @@
+language: minimal
+script:
+  - docker-compose -f docker-compose-test.yml up --exit-code-from powerdns-admin --abort-on-container-exit
+services:
+  - docker

pdns-admin/.yarnrc

@@ -0,0 +1 @@
+--*.modules-folder "./powerdnsadmin/static/node_modules"

pdns-admin/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 Khanh Ngo - ngokhanhit[at]gmail.com
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

pdns-admin/README.md

@@ -0,0 +1,62 @@
+# PowerDNS-Admin
+A PowerDNS web interface with advanced features.
+
+[![Build Status](https://travis-ci.org/ngoduykhanh/PowerDNS-Admin.svg?branch=master)](https://travis-ci.org/ngoduykhanh/PowerDNS-Admin)
+[![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/ngoduykhanh/PowerDNS-Admin.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/ngoduykhanh/PowerDNS-Admin/context:python)
+[![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/ngoduykhanh/PowerDNS-Admin.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/ngoduykhanh/PowerDNS-Admin/context:javascript)
+
+#### Features:
+- Multiple domain management
+- Domain template
+- User management
+- User access management based on domain
+- User activity logging
+- Support Local DB / SAML / LDAP / Active Directory user authentication
+- Support Google / Github / Azure / OpenID OAuth
+- Support Two-factor authentication (TOTP)
+- Dashboard and pdns service statistics
+- DynDNS 2 protocol support
+- Edit IPv6 PTRs using IPv6 addresses directly (no more editing of literal addresses!)
+- Limited API for manipulating zones and records
+
+## Running PowerDNS-Admin
+There are several ways to run PowerDNS-Admin. The easiest way is to use Docker.
+If you are looking to install and run PowerDNS-Admin directly onto your system check out the [Wiki](https://github.com/ngoduykhanh/PowerDNS-Admin/wiki#installation-guides) for ways to do that.
+
+### Docker
+This are two options to run PowerDNS-Admin using Docker.
+To get started as quickly as possible try option 1. If you want to make modifications to the configuration option 2 may be cleaner.
+
+#### Option 1: From Docker Hub
+The easiest is to just run the latest Docker image from Docker Hub:
+```
+$ docker run -d \
+    -v pda-data:/data
+    -p 9191:80 \
+    ngoduykhanh/powerdns-admin:latest
+```
+This creates a volume called `pda-data` to persist the SQLite database with the configuration.
+
+#### Option 2: Using docker-compose
+1. Update the configuration
+   Edit the `docker-compose.yml` file to update the database connection string in `SQLALCHEMY_DATABASE_URI`.
+   Other environment variables are mentioned in the [legal_envvars](https://github.com/ngoduykhanh/PowerDNS-Admin/blob/master/configs/docker_config.py#L5-L46).
+   To use the Docker secrets feature it is possible to append `_FILE` to the environment variables and point to a file with the values stored in it.
+
+2. Start docker container
+   ```
+   $ docker-compose up
+   ```
+
+You can then access PowerDNS-Admin by pointing your browser to http://localhost:9191.
+
+## Screenshots
+![dashboard](https://user-images.githubusercontent.com/6447444/44068603-0d2d81f6-9fa5-11e8-83af-14e2ad79e370.png)
+
+## LICENSE
+MIT. See [LICENSE](https://github.com/ngoduykhanh/PowerDNS-Admin/blob/master/LICENSE)
+
+## Support
+If you like the project and want to support it, you can *buy me a coffee* ☕
+
+<a href="https://www.buymeacoffee.com/khanhngo" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/default-orange.png" alt="Buy Me A Coffee" height="41" width="174"></a>