diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 6aba80c6..3fcd972c 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -9,5 +9,5 @@ contact_links: url: https://github.com/PowerDNS-Admin/PowerDNS-Admin/discussions about: "If you're just looking for help, try starting a discussion instead" - name: 💬 Project Chat - url: https://mattermost.powerdnsadmin.org/ + url: https://mattermost.gundnsadmin.org/ about: "Join our Mattermost chat to discuss the project with other users and developers" \ No newline at end of file diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 9f4b66fc..01bc9218 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -28,10 +28,10 @@ on: - docker/** - docker-test/** - docs/** - - powerdnsadmin/static/assets/** - - powerdnsadmin/static/custom/css/** - - powerdnsadmin/static/img/** - - powerdnsadmin/swagger-spec.yaml + - gundnsadmin/static/assets/** + - gundnsadmin/static/custom/css/** + - gundnsadmin/static/img/** + - gundnsadmin/swagger-spec.yaml - .dockerignore - .gitattributes - .gitignore @@ -61,10 +61,10 @@ on: - docker/** - docker-test/** - docs/** - - powerdnsadmin/static/assets/** - - powerdnsadmin/static/custom/css/** - - powerdnsadmin/static/img/** - - powerdnsadmin/swagger-spec.yaml + - gundnsadmin/static/assets/** + - gundnsadmin/static/custom/css/** + - gundnsadmin/static/img/** + - gundnsadmin/swagger-spec.yaml - .dockerignore - .gitattributes - .gitignore diff --git a/.gitignore b/.gitignore index 91bfea92..d2a3f040 100644 --- a/.gitignore +++ b/.gitignore @@ -37,7 +37,7 @@ db_repository/* tmp/* node_modules -powerdnsadmin/static/generated +gundnsadmin/static/generated .webassets-cache .venv* venv* diff --git a/.yarnrc b/.yarnrc index fc9dce03..9c850cc1 100644 --- a/.yarnrc +++ b/.yarnrc @@ -1 +1 @@ ---*.modules-folder "./powerdnsadmin/static/node_modules" +--*.modules-folder "./gundnsadmin/static/node_modules" diff --git a/README.md b/README.md index e747d445..3fd57e2c 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ You can then access GunDNS-Admin by pointing your browser to http://localhost:91 **Looking for help?** Try taking a look at the project's [Support Guide](https://github.com/nicelizhi/GunDNS-Admin/blob/master/.github/SUPPORT.md) or joining -our [Discord Server](https://discord.powerdnsadmin.org). +our [Discord Server](https://discord.gundnsadmin.org). ## Security Policy diff --git a/SECURITY.md b/SECURITY.md index bd91d362..3a491ffc 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -24,7 +24,7 @@ If you believe you've uncovered a security vulnerability and wish to report it c Please note that we **DO NOT** accept reports generated by automated tooling which merely suggest that a file or file(s) _may_ be vulnerable under certain conditions, as these are most often innocuous. -If you believe that you've found a vulnerability which meets all of these conditions, please [submit a draft security advisory](https://github.com/PowerDNS-Admin/PowerDNS-Admin/security/advisories/new) on GitHub, or email a brief description of the suspected bug and instructions for reproduction to **admin@powerdnsadmin.org**. +If you believe that you've found a vulnerability which meets all of these conditions, please [submit a draft security advisory](https://github.com/PowerDNS-Admin/PowerDNS-Admin/security/advisories/new) on GitHub, or email a brief description of the suspected bug and instructions for reproduction to **admin@gundnsadmin.org**. ### Bug Bounties diff --git a/configs/development.py b/configs/development.py index 3dbb17bf..1928fcaf 100644 --- a/configs/development.py +++ b/configs/development.py @@ -157,7 +157,7 @@ # ### If the user is a member of this group, and that group name is included in the collection, # ### the user will be set as an administrator. # #SAML_ATTRIBUTE_GROUP = 'https://example.edu/pdns-groups' -# #SAML_GROUP_ADMIN_NAME = 'PowerDNSAdmin-Administrators' +# #SAML_GROUP_ADMIN_NAME = 'gundnsadmin-Administrators' # SAML_SP_ENTITY_ID = 'http://' # SAML_SP_CONTACT_NAME = '' diff --git a/deploy/auto-setup/setup_linux.sh b/deploy/auto-setup/setup_linux.sh index 19cda589..2864095a 100644 --- a/deploy/auto-setup/setup_linux.sh +++ b/deploy/auto-setup/setup_linux.sh @@ -1,13 +1,13 @@ #!/bin/bash # Create a new group for PowerDNS-Admin -groupadd powerdnsadmin +groupadd gundnsadmin # Create a user for PowerDNS-Admin -useradd --system -g powerdnsadmin powerdnsadmin +useradd --system -g gundnsadmin gundnsadmin # Make the new user and group the owners of the PowerDNS-Admin files -chown -R powerdnsadmin:powerdnsadmin /opt/web/powerdns-admin +chown -R gundnsadmin:gundnsadmin /opt/web/powerdns-admin # Start the PowerDNS-Admin service systemctl start powerdns-admin diff --git a/deploy/auto-setup/setup_win.bat b/deploy/auto-setup/setup_win.bat index a5ee9fd5..7998e0bf 100644 --- a/deploy/auto-setup/setup_win.bat +++ b/deploy/auto-setup/setup_win.bat @@ -1,13 +1,13 @@ @echo off rem Create a new group for PowerDNS-Admin -net localgroup powerdnsadmin /add +net localgroup gundnsadmin /add rem Create a user for PowerDNS-Admin -net user powerdnsadmin /add /passwordchg:no /homedir:nul /active:yes /expires:never /passwordreq:no /s +net user gundnsadmin /add /passwordchg:no /homedir:nul /active:yes /expires:never /passwordreq:no /s rem Make the new user and group the owners of the PowerDNS-Admin files -icacls "C:\path\to\powerdns-admin" /setowner "powerdnsadmin" +icacls "C:\path\to\powerdns-admin" /setowner "gundnsadmin" rem Start the PowerDNS-Admin service net start powerdns-admin diff --git a/deploy/docker/portainer.yaml b/deploy/docker/portainer.yaml index 84402ef1..54dc9837 100644 --- a/deploy/docker/portainer.yaml +++ b/deploy/docker/portainer.yaml @@ -2,7 +2,7 @@ version: '3.3' services: core: - image: powerdnsadmin/pda-legacy:latest + image: gundnsadmin/pda-legacy:latest restart: unless-stopped environment: - SECRET_KEY=INSECURE-CHANGE-ME-9I0DAtfkfj5JmBkPSaHah3ECAa8Df5KK diff --git a/deploy/kubernetes/configmap.yml b/deploy/kubernetes/configmap.yml index 4270db25..06421490 100644 --- a/deploy/kubernetes/configmap.yml +++ b/deploy/kubernetes/configmap.yml @@ -1,8 +1,8 @@ kind: ConfigMap apiVersion: v1 metadata: - name: powerdnsadmin-env + name: gundnsadmin-env data: - FLASK_APP: powerdnsadmin/__init__.py + FLASK_APP: gundnsadmin/__init__.py SECRET_KEY: changeme_secret SQLALCHEMY_DATABASE_URI: 'mysql://user:password@host/database' diff --git a/deploy/kubernetes/deployment.yml b/deploy/kubernetes/deployment.yml index d3e4cfe9..e84f13b0 100644 --- a/deploy/kubernetes/deployment.yml +++ b/deploy/kubernetes/deployment.yml @@ -1,29 +1,29 @@ kind: Deployment apiVersion: apps/v1 metadata: - name: powerdnsadmin + name: gundnsadmin labels: - app: powerdnsadmin + app: gundnsadmin spec: strategy: type: RollingUpdate replicas: 1 selector: matchLabels: - app: powerdnsadmin + app: gundnsadmin template: metadata: labels: - app: powerdnsadmin + app: gundnsadmin spec: containers: - - name: powerdnsadmin - image: powerdnsadmin/pda-legacy + - name: gundnsadmin + image: gundnsadmin/pda-legacy ports: - containerPort: 80 protocol: TCP envFrom: - configMapRef: - name: powerdnsadmin-env + name: gundnsadmin-env imagePullPolicy: Always restartPolicy: Always \ No newline at end of file diff --git a/deploy/kubernetes/service.yml b/deploy/kubernetes/service.yml index 813b37b6..8b1df1bd 100644 --- a/deploy/kubernetes/service.yml +++ b/deploy/kubernetes/service.yml @@ -1,15 +1,15 @@ apiVersion: v1 kind: Service metadata: - name: powerdnsadmin - namespace: powerdnsadmin + name: gundnsadmin + namespace: gundnsadmin labels: - app: powerdnsadmin + app: gundnsadmin spec: ports: - name: http port: 80 targetPort: 80 selector: - app: powerdnsadmin + app: gundnsadmin diff --git a/docker-compose.yml b/docker-compose.yml index 74ff185f..801bc0f9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: app: - image: powerdnsadmin/pda-legacy:latest + image: gundnsadmin/pda-legacy:latest container_name: powerdns_admin ports: - "9191:80" diff --git a/docker-test/Dockerfile b/docker-test/Dockerfile index 7191825e..206e7bda 100644 --- a/docker-test/Dockerfile +++ b/docker-test/Dockerfile @@ -43,7 +43,7 @@ RUN pip3 install -r requirements.txt COPY . /app -ENV FLASK_APP=powerdnsadmin/__init__.py +ENV FLASK_APP=gundnsadmin/__init__.py RUN yarn install --pure-lockfile --production \ && yarn cache clean \ && flask assets build diff --git a/docker/Dockerfile b/docker/Dockerfile index 55ccdfd6..063defaf 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -15,7 +15,7 @@ ARG BUILD_DEPENDENCIES="build-base \ ENV LC_ALL=en_US.UTF-8 \ LANG=en_US.UTF-8 \ LANGUAGE=en_US.UTF-8 \ - FLASK_APP=/build/powerdnsadmin/__init__.py + FLASK_APP=/build/gundnsadmin/__init__.py # Get dependencies # py3-pip should not belong to BUILD_DEPENDENCIES. Otherwise, when we remove @@ -39,17 +39,17 @@ COPY . /build # Prepare assets RUN yarn install --pure-lockfile --production && \ yarn cache clean && \ - sed -i -r -e "s|'rcssmin',\s?'cssrewrite'|'rcssmin'|g" /build/powerdnsadmin/assets.py && \ + sed -i -r -e "s|'rcssmin',\s?'cssrewrite'|'rcssmin'|g" /build/gundnsadmin/assets.py && \ flask assets build -RUN mv /build/powerdnsadmin/static /tmp/static && \ - mkdir /build/powerdnsadmin/static && \ - cp -r /tmp/static/generated /build/powerdnsadmin/static && \ - cp -r /tmp/static/assets /build/powerdnsadmin/static && \ - cp -r /tmp/static/img /build/powerdnsadmin/static && \ - find /tmp/static/node_modules -name 'webfonts' -exec cp -r {} /build/powerdnsadmin/static \; && \ - find /tmp/static/node_modules -name 'fonts' -exec cp -r {} /build/powerdnsadmin/static \; && \ - find /tmp/static/node_modules/icheck/skins/square -name '*.png' -exec cp {} /build/powerdnsadmin/static/generated \; +RUN mv /build/gundnsadmin/static /tmp/static && \ + mkdir /build/gundnsadmin/static && \ + cp -r /tmp/static/generated /build/gundnsadmin/static && \ + cp -r /tmp/static/assets /build/gundnsadmin/static && \ + cp -r /tmp/static/img /build/gundnsadmin/static && \ + find /tmp/static/node_modules -name 'webfonts' -exec cp -r {} /build/gundnsadmin/static \; && \ + find /tmp/static/node_modules -name 'fonts' -exec cp -r {} /build/gundnsadmin/static \; && \ + find /tmp/static/node_modules/icheck/skins/square -name '*.png' -exec cp {} /build/gundnsadmin/static/generated \; RUN { \ echo "from flask_assets import Environment"; \ @@ -59,18 +59,18 @@ RUN { \ echo "assets.register('css_login', 'generated/login.css')"; \ echo "assets.register('js_main', 'generated/main.js')"; \ echo "assets.register('css_main', 'generated/main.css')"; \ - } > /build/powerdnsadmin/assets.py + } > /build/gundnsadmin/assets.py # Move application RUN mkdir -p /app && \ - cp -r /build/migrations/ /build/powerdnsadmin/ /build/run.py /app && \ + cp -r /build/migrations/ /build/gundnsadmin/ /build/run.py /app && \ mkdir -p /app/configs && \ cp -r /build/configs/docker_config.py /app/configs # Build image FROM alpine:3.17 -ENV FLASK_APP=/app/powerdnsadmin/__init__.py \ +ENV FLASK_APP=/app/gundnsadmin/__init__.py \ USER=pda RUN apk add --no-cache mariadb-connector-c postgresql-client py3-gunicorn py3-pyldap py3-flask py3-psycopg2 xmlsec tzdata libcap && \ @@ -88,10 +88,10 @@ COPY ./docker/entrypoint.sh /usr/bin/ WORKDIR /app RUN chown ${USER}:${USER} ./configs /app && \ - cat ./powerdnsadmin/default_config.py ./configs/docker_config.py > ./powerdnsadmin/docker_config.py + cat ./gundnsadmin/default_config.py ./configs/docker_config.py > ./gundnsadmin/docker_config.py EXPOSE 80/tcp USER ${USER} HEALTHCHECK CMD ["wget","--output-document=-","--quiet","--tries=1","http://127.0.0.1/"] ENTRYPOINT ["entrypoint.sh"] -CMD ["gunicorn","powerdnsadmin:create_app()"] +CMD ["gunicorn","gundnsadmin:create_app()"] diff --git a/docs/API.md b/docs/API.md index 7514d5c8..6ecb4b55 100644 --- a/docs/API.md +++ b/docs/API.md @@ -15,7 +15,7 @@ PDA has its own API, that should not be confused with the PowerDNS API. Keep in The PDA API consists of two distinct parts: -- The /powerdnsadmin endpoints manages PDA content (accounts, users, apikeys) and also allow domain creation/deletion +- The /gundnsadmin endpoints manages PDA content (accounts, users, apikeys) and also allow domain creation/deletion - The /server endpoints are proxying queries to the backend PowerDNS instance's API. PDA acts as a proxy managing several API Keys and permissions to the PowerDNS content. The requests to the API needs two headers: @@ -23,7 +23,7 @@ The requests to the API needs two headers: - The classic 'Content-Type: application/json' is required to all POST and PUT requests, though it's harmless to use it on each call - The authentication header to provide either the login:password basic authentication or the Api Key authentication. -When you access the `/powerdnsadmin` endpoint, you must use the Basic Auth: +When you access the `/gundnsadmin` endpoint, you must use the Basic Auth: ```bash # Encode your user and password to base64 @@ -44,7 +44,7 @@ Finally, the `/sync_domains` endpoint accepts both basic and apikey authenticati #### Examples -Creating domain via `/powerdnsadmin`: +Creating domain via `/gundnsadmin`: ```bash curl -L -vvv -H 'Content-Type: application/json' -H 'Authorization: Basic YWRtaW46YWRtaW4=' -X POST http://localhost:9191/api/v1/pdnsadmin/zones --data '{"name": "yourdomain.com.", "kind": "NATIVE", "nameservers": ["ns1.mydomain.com."]}' @@ -132,5 +132,5 @@ docker-compose up -d # Set environment variables source .env # Generate the diagrams -eralchemy -i 'mysql://${PDA_DB_USER}:${PDA_DB_PASSWORD}@'$(docker inspect powerdns-admin-mysql|jq -jr '.[0].NetworkSettings.Networks.powerdnsadmin_default.IPAddress')':3306/powerdns_admin' -o /tmp/output.pdf +eralchemy -i 'mysql://${PDA_DB_USER}:${PDA_DB_PASSWORD}@'$(docker inspect powerdns-admin-mysql|jq -jr '.[0].NetworkSettings.Networks.gundnsadmin_default.IPAddress')':3306/powerdns_admin' -o /tmp/output.pdf ``` diff --git a/docs/CODE_OF_CONDUCT.md b/docs/CODE_OF_CONDUCT.md index ed3cb474..53a424df 100644 --- a/docs/CODE_OF_CONDUCT.md +++ b/docs/CODE_OF_CONDUCT.md @@ -55,7 +55,7 @@ further defined and clarified by project maintainers. ## Enforcement Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported by contacting the project team at [admin@powerdnsadmin.org](mailto:admin@powerdnsadmin.org). All +reported by contacting the project team at [admin@gundnsadmin.org](mailto:admin@gundnsadmin.org). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index d4fb25fa..07373550 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -2,7 +2,7 @@ **Looking for help?** Try taking a look at the project's [Support Guide](https://github.com/PowerDNS-Admin/PowerDNS-Admin/blob/master/.github/SUPPORT.md) or joining -our [Discord Server](https://discord.powerdnsadmin.org). +our [Discord Server](https://discord.gundnsadmin.org).

@@ -95,7 +95,7 @@ We do maintain an active Mattermost instance for internal communication, but we Some maintainers petition their employer to grant some of their paid time to work on PDA. -Interested? You can contact our lead maintainer, Matt Scott, at admin@powerdnsadmin.org. We'd love to have you on the team! +Interested? You can contact our lead maintainer, Matt Scott, at admin@gundnsadmin.org. We'd love to have you on the team! ## :heart: Other Ways to Contribute diff --git a/docs/oauth.md b/docs/oauth.md index b493f876..39971d69 100644 --- a/docs/oauth.md +++ b/docs/oauth.md @@ -4,7 +4,7 @@ To link to Azure for authentication, you need to register PowerDNS-Admin in Azure. This requires your PowerDNS-Admin web interface to use an HTTPS URL. -* Under the Azure Active Directory, select App Registrations, and create a new one. Give it any name you want, and the Redirect URI shoule be type 'Web' and of the format https://powerdnsadmin/azure/authorized (replace the host name approriately). +* Under the Azure Active Directory, select App Registrations, and create a new one. Give it any name you want, and the Redirect URI shoule be type 'Web' and of the format https://gundnsadmin/azure/authorized (replace the host name approriately). * Select the newly-created registration * On the Overview page, the Application ID is your new Client ID to use with PowerDNS-Admin * On the Overview page, make a note of your Directory/Tenant ID - you need it for the API URLs later diff --git a/docs/wiki/configuration/Getting-started.md b/docs/wiki/configuration/Getting-started.md index ce722348..be64d0a7 100644 --- a/docs/wiki/configuration/Getting-started.md +++ b/docs/wiki/configuration/Getting-started.md @@ -10,7 +10,7 @@ SQLALCHEMY_DATABASE_URI = 'mysql://username:password@127.0.0.1/db_name' For Postgres: ``` -SQLALCHEMY_DATABASE_URI = 'postgresql://powerdnsadmin:powerdnsadmin@127.0.0.1/powerdnsadmindb' +SQLALCHEMY_DATABASE_URI = 'postgresql://gundnsadmin:gundnsadmin@127.0.0.1/gundnsadmindb' ``` Open your web browser and go to `http://localhost:9191` to visit PowerDNS-Admin web interface. Register a user. The first user will be in the Administrator role. diff --git a/docs/wiki/configuration/basic_settings.md b/docs/wiki/configuration/basic_settings.md index 6a47d6a2..32de223a 100644 --- a/docs/wiki/configuration/basic_settings.md +++ b/docs/wiki/configuration/basic_settings.md @@ -1,6 +1,6 @@ -### PowerDNSAdmin basic settings +### gundnsadmin basic settings -PowerDNSAdmin has many features and settings available to be turned either off or on. +gundnsadmin has many features and settings available to be turned either off or on. In this docs those settings will be explain. To find the settings in the the dashboard go to settings>basic. diff --git a/docs/wiki/database-setup/Setup-MySQL-or-MariaDB.md b/docs/wiki/database-setup/Setup-MySQL-or-MariaDB.md index 5242b69c..dc2c9c0b 100644 --- a/docs/wiki/database-setup/Setup-MySQL-or-MariaDB.md +++ b/docs/wiki/database-setup/Setup-MySQL-or-MariaDB.md @@ -16,8 +16,8 @@ The following directions assume a default configuration and for productions setu Connect to the database (Usually using `mysql -u root -p` if a password has been set on the root database user or `sudo mysql` if not), then enter the following: ``` -CREATE DATABASE `powerdnsadmin` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; -GRANT ALL PRIVILEGES ON `powerdnsadmin`.* TO 'pdnsadminuser'@'localhost' IDENTIFIED BY 'YOUR_PASSWORD_HERE'; +CREATE DATABASE `gundnsadmin` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +GRANT ALL PRIVILEGES ON `gundnsadmin`.* TO 'pdnsadminuser'@'localhost' IDENTIFIED BY 'YOUR_PASSWORD_HERE'; FLUSH PRIVILEGES; ``` - If your database server is located on a different machine then change 'localhost' to '%' @@ -51,6 +51,6 @@ Solution: Convert the column to MEDIUMTEXT: 1. Connect to the database shell as described in the setup database section: 2. Execute the following commands: ``` - USE powerdnsadmin; + USE gundnsadmin; ALTER TABLE history MODIFY detail MEDIUMTEXT; ``` diff --git a/docs/wiki/database-setup/Setup-PostgreSQL.md b/docs/wiki/database-setup/Setup-PostgreSQL.md index 197aae52..f8b8a07b 100644 --- a/docs/wiki/database-setup/Setup-PostgreSQL.md +++ b/docs/wiki/database-setup/Setup-PostgreSQL.md @@ -10,14 +10,14 @@ We assume the database is installed per your platform's directions (apt, yum, et We assume a default configuration and only the postgres user existing. ## Setup database -The below will create a database called powerdnsadmindb and a user of powerdnsadmin. +The below will create a database called gundnsadmindb and a user of gundnsadmin. ``` $ sudo su - postgres -$ createuser powerdnsadmin -$ createdb -E UTF8 -l en_US.UTF-8 -O powerdnsadmin -T template0 powerdnsadmindb 'The database for PowerDNS-Admin' +$ createuser gundnsadmin +$ createdb -E UTF8 -l en_US.UTF-8 -O gundnsadmin -T template0 gundnsadmindb 'The database for PowerDNS-Admin' $ psql -postgres=# ALTER ROLE powerdnsadmin WITH PASSWORD 'powerdnsadmin_password'; +postgres=# ALTER ROLE gundnsadmin WITH PASSWORD 'gundnsadmin_password'; ``` Note: diff --git a/docs/wiki/debug/build-process.md b/docs/wiki/debug/build-process.md index 28f1cfed..fc83ba39 100644 --- a/docs/wiki/debug/build-process.md +++ b/docs/wiki/debug/build-process.md @@ -21,7 +21,7 @@ services: environment: - BIND_ADDRESS=127.0.0.1:8082 - SECRET_KEY='VerySecret' - - SQLALCHEMY_DATABASE_URI=mysql://pdnsadminuser:password@127.0.0.1/powerdnsadmin + - SQLALCHEMY_DATABASE_URI=mysql://pdnsadminuser:password@127.0.0.1/gundnsadmin - GUNICORN_TIMEOUT=60 - GUNICORN_WORKERS=2 - GUNICORN_LOGLEVEL=DEBUG diff --git a/docs/wiki/install/Running-PowerDNS-Admin-as-a-service-(Systemd).md b/docs/wiki/install/Running-PowerDNS-Admin-as-a-service-(Systemd).md index f6937361..f184fffe 100644 --- a/docs/wiki/install/Running-PowerDNS-Admin-as-a-service-(Systemd).md +++ b/docs/wiki/install/Running-PowerDNS-Admin-as-a-service-(Systemd).md @@ -9,11 +9,11 @@ You shouldn't run PowerDNS-Admin as _root_, so let's start of with the user/grou Create a new group for PowerDNS-Admin: -> sudo groupadd powerdnsadmin +> sudo groupadd gundnsadmin Create a user for PowerDNS-Admin: -> sudo useradd --system -g powerdnsadmin powerdnsadmin +> sudo useradd --system -g gundnsadmin gundnsadmin _`--system` creates a user without login-shell and password, suitable for running system services._ @@ -29,8 +29,8 @@ After=network.target [Service] Type=simple -User=powerdnsadmin -Group=powerdnsadmin +User=gundnsadmin +Group=gundnsadmin ExecStart=/opt/web/powerdns-admin/flask/bin/python ./run.py WorkingDirectory=/opt/web/powerdns-admin Restart=always @@ -47,8 +47,8 @@ After=network.target [Service] Type=simple -User=powerdnsadmin -Group=powerdnsadmin +User=gundnsadmin +Group=gundnsadmin Environment=PATH=/opt/web/powerdns-admin/flask/bin ExecStart=/opt/web/powerdns-admin/flask/bin/python /opt/web/powerdns-admin/run.py WorkingDirectory=/opt/web/powerdns-admin @@ -58,7 +58,7 @@ Restart=always WantedBy=multi-user.target ``` Before starting the service, we need to make sure that the new user can work on the files in the PowerDNS-Admin folder: -> chown -R powerdnsadmin:powerdnsadmin /opt/web/powerdns-admin +> chown -R gundnsadmin:gundnsadmin /opt/web/powerdns-admin After saving the file, we need to reload the systemd daemon: > sudo systemctl daemon-reload diff --git a/docs/wiki/install/Running-PowerDNS-Admin-on-Centos-7.md b/docs/wiki/install/Running-PowerDNS-Admin-on-Centos-7.md index cee272c0..3a32b16b 100644 --- a/docs/wiki/install/Running-PowerDNS-Admin-on-Centos-7.md +++ b/docs/wiki/install/Running-PowerDNS-Admin-on-Centos-7.md @@ -54,14 +54,14 @@ pip install -r requirements.txt ``` ## Running PowerDNS-Admin: -NOTE: The default config file is located at `./powerdnsadmin/default_config.py`. If you want to load another one, please set the `FLASK_CONF` environment variable. E.g. +NOTE: The default config file is located at `./gundnsadmin/default_config.py`. If you want to load another one, please set the `FLASK_CONF` environment variable. E.g. ```bash export FLASK_CONF=../configs/development.py ``` ### Create the database schema: ``` -export FLASK_APP=powerdnsadmin/__init__.py +export FLASK_APP=gundnsadmin/__init__.py flask db upgrade ``` diff --git a/docs/wiki/install/Running-PowerDNS-Admin-on-Docker.md b/docs/wiki/install/Running-PowerDNS-Admin-on-Docker.md index 1e3ef50c..d40753fd 100644 --- a/docs/wiki/install/Running-PowerDNS-Admin-on-Docker.md +++ b/docs/wiki/install/Running-PowerDNS-Admin-on-Docker.md @@ -1,6 +1,6 @@ # Installation on docker -The Docker image is powerdnsadmin/pda-legacy available on [DockerHub](https://hub.docker.com/r/powerdnsadmin/pda-legacy) +The Docker image is gundnsadmin/pda-legacy available on [DockerHub](https://hub.docker.com/r/gundnsadmin/pda-legacy) The supported environment variables to configure the container are located [here](../configuration/Environment-variables.md). @@ -10,5 +10,5 @@ docker run -d \ -e SECRET_KEY='a-very-secret-key' \ -v pda-data:/data \ -p 9191:80 \ - powerdnsadmin/pda-legacy:latest + gundnsadmin/pda-legacy:latest ``` diff --git a/docs/wiki/install/Running-PowerDNS-Admin-on-Fedora-30.md b/docs/wiki/install/Running-PowerDNS-Admin-on-Fedora-30.md index 53f1c7ce..3b8ea6d0 100644 --- a/docs/wiki/install/Running-PowerDNS-Admin-on-Fedora-30.md +++ b/docs/wiki/install/Running-PowerDNS-Admin-on-Fedora-30.md @@ -52,14 +52,14 @@ pip install -r requirements.txt ## Running PowerDNS-Admin -NOTE: The default config file is located at `./powerdnsadmin/default_config.py`. If you want to load another one, please set the `FLASK_CONF` environment variable. E.g. +NOTE: The default config file is located at `./gundnsadmin/default_config.py`. If you want to load another one, please set the `FLASK_CONF` environment variable. E.g. ```bash export FLASK_CONF=../configs/development.py ``` **Then create the database schema by running:** ``` -(flask) [khanh@localhost powerdns-admin] export FLASK_APP=powerdnsadmin/__init__.py +(flask) [khanh@localhost powerdns-admin] export FLASK_APP=gundnsadmin/__init__.py (flask) [khanh@localhost powerdns-admin] flask db upgrade ``` diff --git a/docs/wiki/install/Running-PowerDNS-Admin-on-Ubuntu-or-Debian.md b/docs/wiki/install/Running-PowerDNS-Admin-on-Ubuntu-or-Debian.md index ad51c2b5..d924e27c 100644 --- a/docs/wiki/install/Running-PowerDNS-Admin-on-Ubuntu-or-Debian.md +++ b/docs/wiki/install/Running-PowerDNS-Admin-on-Ubuntu-or-Debian.md @@ -67,7 +67,7 @@ export FLASK_CONF=../configs/production.py Do the DB migration ```bash -export FLASK_APP=powerdnsadmin/__init__.py +export FLASK_APP=gundnsadmin/__init__.py flask db upgrade ``` diff --git a/docs/wiki/install/Running-on-FreeBSD.md b/docs/wiki/install/Running-on-FreeBSD.md index b37e9c3a..ece98cc8 100644 --- a/docs/wiki/install/Running-on-FreeBSD.md +++ b/docs/wiki/install/Running-on-FreeBSD.md @@ -38,7 +38,7 @@ pip3 install -r requirements.txt ## Configuring PowerDNS-Admin -NOTE: The default config file is located at `./powerdnsadmin/default_config.py`. If you want to load another one, please set the `FLASK_CONF` environment variable. E.g. +NOTE: The default config file is located at `./gundnsadmin/default_config.py`. If you want to load another one, please set the `FLASK_CONF` environment variable. E.g. ```bash cp configs/development.py /opt/powerdns-admin/production.py export FLASK_CONF=/opt/powerdns-admin/production.py @@ -74,7 +74,7 @@ Be sure to uncomment one of the lines like `SQLALCHEMY_DATABASE_URI`. ### Initialise the database ```bash -export FLASK_APP=powerdnsadmin/__init__.py +export FLASK_APP=gundnsadmin/__init__.py flask db upgrade ``` diff --git a/docs/wiki/web-server/Running-Docker-Apache-Reverseproxy.md b/docs/wiki/web-server/Running-Docker-Apache-Reverseproxy.md index e757ab7f..ff5bf8f3 100644 --- a/docs/wiki/web-server/Running-Docker-Apache-Reverseproxy.md +++ b/docs/wiki/web-server/Running-Docker-Apache-Reverseproxy.md @@ -11,7 +11,7 @@ docker-compose.yml version: "3" services: app: - image: powerdnsadmin/pda-legacy:latest + image: gundnsadmin/pda-legacy:latest container_name: powerdns restart: always network_mode: "host" @@ -22,7 +22,7 @@ services: environment: - BIND_ADDRESS=127.0.0.1:8082 - SECRET_KEY='NotVerySecret' - - SQLALCHEMY_DATABASE_URI=mysql://pdnsadminuser:password@127.0.0.1/powerdnsadmin + - SQLALCHEMY_DATABASE_URI=mysql://pdnsadminuser:password@127.0.0.1/gundnsadmin - GUNICORN_TIMEOUT=60 - GUNICORN_WORKERS=2 - GUNICORN_LOGLEVEL=DEBUG @@ -35,7 +35,7 @@ After running the Container create the static directory and populate ``` mkdir -p /var/www/powerdns -docker cp powerdns:/app/powerdnsadmin/static /var/www/powerdns/ +docker cp powerdns:/app/gundnsadmin/static /var/www/powerdns/ chown -R root:www-data /var/www/powerdns ``` diff --git a/docs/wiki/web-server/Running-PowerDNS-Admin-with-Systemd,-Gunicorn-and-Apache.md b/docs/wiki/web-server/Running-PowerDNS-Admin-with-Systemd,-Gunicorn-and-Apache.md index a2d4fa2b..dbd1d26f 100644 --- a/docs/wiki/web-server/Running-PowerDNS-Admin-with-Systemd,-Gunicorn-and-Apache.md +++ b/docs/wiki/web-server/Running-PowerDNS-Admin-with-Systemd,-Gunicorn-and-Apache.md @@ -18,7 +18,7 @@ PIDFile=/run/powerdns-admin/pid User=pdnsa Group=pdnsa WorkingDirectory=/opt/powerdns-admin -ExecStart=/usr/bin/gunicorn-3.6 --workers 4 --log-level info --pid /run/powerdns-admin/pid --bind unix:/run/powerdns-admin/socket "powerdnsadmin:create_app(config='config.py')" +ExecStart=/usr/bin/gunicorn-3.6 --workers 4 --log-level info --pid /run/powerdns-admin/pid --bind unix:/run/powerdns-admin/socket "gundnsadmin:create_app(config='config.py')" ExecReload=/bin/kill -s HUP $MAINPID ExecStop=/bin/kill -s TERM $MAINPID PrivateTmp=true @@ -68,10 +68,10 @@ This includes SSL redirect. ServerName dnsadmin.company.com - DocumentRoot "/opt/powerdns-admin/powerdnsadmin" + DocumentRoot "/opt/powerdns-admin/gundnsadmin" ## Alias declarations for resources outside the DocumentRoot - Alias /static/ "/opt/powerdns-admin/powerdnsadmin/static/" - Alias /favicon.ico "/opt/powerdns-admin/powerdnsadmin/static/favicon.ico" + Alias /static/ "/opt/powerdns-admin/gundnsadmin/static/" + Alias /favicon.ico "/opt/powerdns-admin/gundnsadmin/static/favicon.ico" AllowOverride None Require all granted diff --git a/docs/wiki/web-server/Running-PowerDNS-Admin-with-Systemd-Gunicorn-and-Nginx.md b/docs/wiki/web-server/Running-PowerDNS-Admin-with-Systemd-Gunicorn-and-Nginx.md index 57725bc1..b92df8b0 100644 --- a/docs/wiki/web-server/Running-PowerDNS-Admin-with-Systemd-Gunicorn-and-Nginx.md +++ b/docs/wiki/web-server/Running-PowerDNS-Admin-with-Systemd-Gunicorn-and-Nginx.md @@ -25,7 +25,7 @@ Group=pdns WorkingDirectory=/opt/web/powerdns-admin ExecStartPre=+mkdir -p /run/powerdns-admin/ ExecStartPre=+chown pdns:pdns -R /run/powerdns-admin/ -ExecStart=/usr/local/bin/gunicorn --pid /run/powerdns-admin/pid --bind unix:/run/powerdns-admin/socket 'powerdnsadmin:create_app()' +ExecStart=/usr/local/bin/gunicorn --pid /run/powerdns-admin/pid --bind unix:/run/powerdns-admin/socket 'gundnsadmin:create_app()' ExecReload=/bin/kill -s HUP $MAINPID ExecStop=/bin/kill -s TERM $MAINPID PrivateTmp=true @@ -88,7 +88,7 @@ server { location ~ ^/static/ { include /etc/nginx/mime.types; - root /opt/web/powerdns-admin/powerdnsadmin; + root /opt/web/powerdns-admin/gundnsadmin; location ~* \.(jpg|jpeg|png|gif)$ { expires 365d; @@ -126,7 +126,7 @@ server { listen 443 ssl http2 default_server; server_name _; index index.html index.htm; - error_log /var/log/nginx/error_powerdnsadmin.log error; + error_log /var/log/nginx/error_gundnsadmin.log error; access_log off; ssl_certificate path_to_your_fullchain_or_cert; @@ -153,7 +153,7 @@ server { location ~ ^/static/ { include mime.types; - root /opt/web/powerdns-admin/powerdnsadmin; + root /opt/web/powerdns-admin/gundnsadmin; location ~* \.(jpg|jpeg|png|gif)$ { expires 365d; } location ~* ^.+.(css|js)$ { expires 7d; } } diff --git a/docs/wiki/web-server/Supervisord-example.md b/docs/wiki/web-server/Supervisord-example.md index 11cebc8b..915b64a3 100644 --- a/docs/wiki/web-server/Supervisord-example.md +++ b/docs/wiki/web-server/Supervisord-example.md @@ -2,17 +2,17 @@ Following is an example showing how to run PowerDNS-Admin with supervisord Create supervisord program config file ``` -$ sudo vim /etc/supervisor.d/powerdnsadmin.conf +$ sudo vim /etc/supervisor.d/gundnsadmin.conf ``` ``` -[program:powerdnsadmin] +[program:gundnsadmin] command=/opt/web/powerdns-admin/flask/bin/python ./run.py -stdout_logfile=/var/log/supervisor/program_powerdnsadmin.log -stderr_logfile=/var/log/supervisor/program_powerdnsadmin.error +stdout_logfile=/var/log/supervisor/program_gundnsadmin.log +stderr_logfile=/var/log/supervisor/program_gundnsadmin.error autostart=true autorestart=true directory=/opt/web/powerdns-admin ``` -Then `sudo supervisorctl start powerdnsadmin` to start the Powerdns-Admin service. \ No newline at end of file +Then `sudo supervisorctl start gundnsadmin` to start the Powerdns-Admin service. \ No newline at end of file diff --git a/docs/wiki/web-server/Systemd-example.md b/docs/wiki/web-server/Systemd-example.md index d7f738b3..9b7d84d9 100644 --- a/docs/wiki/web-server/Systemd-example.md +++ b/docs/wiki/web-server/Systemd-example.md @@ -16,7 +16,7 @@ PIDFile=/run/powerdns-admin/pid User=pdnsa Group=pdnsa WorkingDirectory=/opt/powerdns-admin -ExecStart=/usr/bin/gunicorn-3.6 --workers 4 --log-level info --pid /run/powerdns-admin/pid --bind unix:/run/powerdns-admin/socket "powerdnsadmin:create_app(config='config.py')" +ExecStart=/usr/bin/gunicorn-3.6 --workers 4 --log-level info --pid /run/powerdns-admin/pid --bind unix:/run/powerdns-admin/socket "gundnsadmin:create_app(config='config.py')" ExecReload=/bin/kill -s HUP $MAINPID ExecStop=/bin/kill -s TERM $MAINPID PrivateTmp=true diff --git a/docs/wiki/web-server/WSGI-Apache-example.md b/docs/wiki/web-server/WSGI-Apache-example.md index d31e4f77..3ad58e45 100644 --- a/docs/wiki/web-server/WSGI-Apache-example.md +++ b/docs/wiki/web-server/WSGI-Apache-example.md @@ -53,7 +53,7 @@ Apache vhost configuration; DocumentRoot /srv/vhosts/superawesomedns.foo.bar/ WSGIDaemonProcess pdnsadmin user=pdnsadmin group=pdnsadmin threads=5 - WSGIScriptAlias / /srv/vhosts/superawesomedns.foo.bar/powerdnsadmin.wsgi + WSGIScriptAlias / /srv/vhosts/superawesomedns.foo.bar/gundnsadmin.wsgi # pass BasicAuth on to the WSGI process WSGIPassAuthorization On @@ -79,7 +79,7 @@ WSGIDaemonProcess pdnsadmin socket-user=apache user=pdnsadmin group=pdnsadmin th WSGISocketPrefix /var/run/wsgi ``` -Content of `/srv/vhosts/superawesomedns.foo.bar/powerdnsadmin.wsgi`; +Content of `/srv/vhosts/superawesomedns.foo.bar/gundnsadmin.wsgi`; ```python #!/usr/bin/env python3 import sys @@ -87,13 +87,13 @@ sys.path.insert(0, '/srv/vhosts/superawesomedns.foo.bar') from app import app as application ``` -Starting from 0.2 version, the `powerdnsadmin.wsgi` file is slighty different : +Starting from 0.2 version, the `gundnsadmin.wsgi` file is slighty different : ```python #!/usr/bin/env python3 import sys sys.path.insert(0, '/srv/vhosts/superawesomedns.foo.bar') -from powerdnsadmin import create_app +from gundnsadmin import create_app application = create_app() ``` diff --git a/docs/wiki/web-server/uWSGI-example.md b/docs/wiki/web-server/uWSGI-example.md index db15d038..c7bef30a 100644 --- a/docs/wiki/web-server/uWSGI-example.md +++ b/docs/wiki/web-server/uWSGI-example.md @@ -25,7 +25,7 @@ This guide will show you how to run PowerDNS-Admin via uWSGI and nginx. This gui pythonpath = /opt/pdns-admin/PowerDNS-Admin/ virtualenv = /opt/pdns-admin/PowerDNS-Admin/flask - mount = /pdns=powerdnsadmin:create_app() + mount = /pdns=gundnsadmin:create_app() manage-script-name = true vacuum = true diff --git a/powerdnsadmin/__init__.py b/gundnsadmin/__init__.py similarity index 96% rename from powerdnsadmin/__init__.py rename to gundnsadmin/__init__.py index d447a002..0fee673d 100755 --- a/powerdnsadmin/__init__.py +++ b/gundnsadmin/__init__.py @@ -34,10 +34,10 @@ def create_app(config=None): # Load config from env variables if using docker if os.path.exists(os.path.join(app.root_path, 'docker_config.py')): - app.config.from_object('powerdnsadmin.docker_config') + app.config.from_object('gundnsadmin.docker_config') else: # Load default configuration - app.config.from_object('powerdnsadmin.default_config') + app.config.from_object('gundnsadmin.default_config') # Load config file from FLASK_CONF env variable if 'FLASK_CONF' in os.environ: diff --git a/powerdnsadmin/assets.py b/gundnsadmin/assets.py similarity index 100% rename from powerdnsadmin/assets.py rename to gundnsadmin/assets.py diff --git a/powerdnsadmin/decorators.py b/gundnsadmin/decorators.py similarity index 100% rename from powerdnsadmin/decorators.py rename to gundnsadmin/decorators.py diff --git a/powerdnsadmin/default_config.py b/gundnsadmin/default_config.py similarity index 100% rename from powerdnsadmin/default_config.py rename to gundnsadmin/default_config.py diff --git a/powerdnsadmin/lib/__init__.py b/gundnsadmin/lib/__init__.py similarity index 100% rename from powerdnsadmin/lib/__init__.py rename to gundnsadmin/lib/__init__.py diff --git a/powerdnsadmin/lib/certutil.py b/gundnsadmin/lib/certutil.py similarity index 100% rename from powerdnsadmin/lib/certutil.py rename to gundnsadmin/lib/certutil.py diff --git a/powerdnsadmin/lib/errors.py b/gundnsadmin/lib/errors.py similarity index 100% rename from powerdnsadmin/lib/errors.py rename to gundnsadmin/lib/errors.py diff --git a/powerdnsadmin/lib/helper.py b/gundnsadmin/lib/helper.py similarity index 100% rename from powerdnsadmin/lib/helper.py rename to gundnsadmin/lib/helper.py diff --git a/powerdnsadmin/lib/schema.py b/gundnsadmin/lib/schema.py similarity index 100% rename from powerdnsadmin/lib/schema.py rename to gundnsadmin/lib/schema.py diff --git a/powerdnsadmin/lib/utils.py b/gundnsadmin/lib/utils.py similarity index 99% rename from powerdnsadmin/lib/utils.py rename to gundnsadmin/lib/utils.py index f8cc997d..a1651478 100644 --- a/powerdnsadmin/lib/utils.py +++ b/gundnsadmin/lib/utils.py @@ -33,7 +33,7 @@ def fetch_remote(remote_url, verify = bool(verify) # enforce type boolean our_headers = { - 'user-agent': 'powerdnsadmin/0', + 'user-agent': 'gundnsadmin/0', 'pragma': 'no-cache', 'cache-control': 'no-cache' } diff --git a/powerdnsadmin/lib/validators.py b/gundnsadmin/lib/validators.py similarity index 100% rename from powerdnsadmin/lib/validators.py rename to gundnsadmin/lib/validators.py diff --git a/powerdnsadmin/models/__init__.py b/gundnsadmin/models/__init__.py similarity index 100% rename from powerdnsadmin/models/__init__.py rename to gundnsadmin/models/__init__.py diff --git a/powerdnsadmin/models/account.py b/gundnsadmin/models/account.py similarity index 100% rename from powerdnsadmin/models/account.py rename to gundnsadmin/models/account.py diff --git a/powerdnsadmin/models/account_user.py b/gundnsadmin/models/account_user.py similarity index 100% rename from powerdnsadmin/models/account_user.py rename to gundnsadmin/models/account_user.py diff --git a/powerdnsadmin/models/api_key.py b/gundnsadmin/models/api_key.py similarity index 100% rename from powerdnsadmin/models/api_key.py rename to gundnsadmin/models/api_key.py diff --git a/powerdnsadmin/models/api_key_account.py b/gundnsadmin/models/api_key_account.py similarity index 100% rename from powerdnsadmin/models/api_key_account.py rename to gundnsadmin/models/api_key_account.py diff --git a/powerdnsadmin/models/base.py b/gundnsadmin/models/base.py similarity index 100% rename from powerdnsadmin/models/base.py rename to gundnsadmin/models/base.py diff --git a/powerdnsadmin/models/domain.py b/gundnsadmin/models/domain.py similarity index 100% rename from powerdnsadmin/models/domain.py rename to gundnsadmin/models/domain.py diff --git a/powerdnsadmin/models/domain_setting.py b/gundnsadmin/models/domain_setting.py similarity index 100% rename from powerdnsadmin/models/domain_setting.py rename to gundnsadmin/models/domain_setting.py diff --git a/powerdnsadmin/models/domain_template.py b/gundnsadmin/models/domain_template.py similarity index 100% rename from powerdnsadmin/models/domain_template.py rename to gundnsadmin/models/domain_template.py diff --git a/powerdnsadmin/models/domain_template_record.py b/gundnsadmin/models/domain_template_record.py similarity index 100% rename from powerdnsadmin/models/domain_template_record.py rename to gundnsadmin/models/domain_template_record.py diff --git a/powerdnsadmin/models/domain_user.py b/gundnsadmin/models/domain_user.py similarity index 100% rename from powerdnsadmin/models/domain_user.py rename to gundnsadmin/models/domain_user.py diff --git a/powerdnsadmin/models/history.py b/gundnsadmin/models/history.py similarity index 100% rename from powerdnsadmin/models/history.py rename to gundnsadmin/models/history.py diff --git a/powerdnsadmin/models/record.py b/gundnsadmin/models/record.py similarity index 100% rename from powerdnsadmin/models/record.py rename to gundnsadmin/models/record.py diff --git a/powerdnsadmin/models/record_entry.py b/gundnsadmin/models/record_entry.py similarity index 100% rename from powerdnsadmin/models/record_entry.py rename to gundnsadmin/models/record_entry.py diff --git a/powerdnsadmin/models/role.py b/gundnsadmin/models/role.py similarity index 100% rename from powerdnsadmin/models/role.py rename to gundnsadmin/models/role.py diff --git a/powerdnsadmin/models/server.py b/gundnsadmin/models/server.py similarity index 100% rename from powerdnsadmin/models/server.py rename to gundnsadmin/models/server.py diff --git a/powerdnsadmin/models/setting.py b/gundnsadmin/models/setting.py similarity index 100% rename from powerdnsadmin/models/setting.py rename to gundnsadmin/models/setting.py diff --git a/powerdnsadmin/models/user.py b/gundnsadmin/models/user.py similarity index 100% rename from powerdnsadmin/models/user.py rename to gundnsadmin/models/user.py diff --git a/powerdnsadmin/routes/__init__.py b/gundnsadmin/routes/__init__.py similarity index 100% rename from powerdnsadmin/routes/__init__.py rename to gundnsadmin/routes/__init__.py diff --git a/powerdnsadmin/routes/admin.py b/gundnsadmin/routes/admin.py similarity index 100% rename from powerdnsadmin/routes/admin.py rename to gundnsadmin/routes/admin.py diff --git a/powerdnsadmin/routes/api.py b/gundnsadmin/routes/api.py similarity index 100% rename from powerdnsadmin/routes/api.py rename to gundnsadmin/routes/api.py diff --git a/powerdnsadmin/routes/base.py b/gundnsadmin/routes/base.py similarity index 100% rename from powerdnsadmin/routes/base.py rename to gundnsadmin/routes/base.py diff --git a/powerdnsadmin/routes/dashboard.py b/gundnsadmin/routes/dashboard.py similarity index 100% rename from powerdnsadmin/routes/dashboard.py rename to gundnsadmin/routes/dashboard.py diff --git a/powerdnsadmin/routes/domain.py b/gundnsadmin/routes/domain.py similarity index 100% rename from powerdnsadmin/routes/domain.py rename to gundnsadmin/routes/domain.py diff --git a/powerdnsadmin/routes/index.py b/gundnsadmin/routes/index.py similarity index 100% rename from powerdnsadmin/routes/index.py rename to gundnsadmin/routes/index.py diff --git a/powerdnsadmin/routes/user.py b/gundnsadmin/routes/user.py similarity index 100% rename from powerdnsadmin/routes/user.py rename to gundnsadmin/routes/user.py diff --git a/powerdnsadmin/services/__init__.py b/gundnsadmin/services/__init__.py similarity index 100% rename from powerdnsadmin/services/__init__.py rename to gundnsadmin/services/__init__.py diff --git a/powerdnsadmin/services/azure.py b/gundnsadmin/services/azure.py similarity index 100% rename from powerdnsadmin/services/azure.py rename to gundnsadmin/services/azure.py diff --git a/powerdnsadmin/services/base.py b/gundnsadmin/services/base.py similarity index 100% rename from powerdnsadmin/services/base.py rename to gundnsadmin/services/base.py diff --git a/powerdnsadmin/services/email.py b/gundnsadmin/services/email.py similarity index 100% rename from powerdnsadmin/services/email.py rename to gundnsadmin/services/email.py diff --git a/powerdnsadmin/services/github.py b/gundnsadmin/services/github.py similarity index 100% rename from powerdnsadmin/services/github.py rename to gundnsadmin/services/github.py diff --git a/powerdnsadmin/services/google.py b/gundnsadmin/services/google.py similarity index 100% rename from powerdnsadmin/services/google.py rename to gundnsadmin/services/google.py diff --git a/powerdnsadmin/services/oidc.py b/gundnsadmin/services/oidc.py similarity index 100% rename from powerdnsadmin/services/oidc.py rename to gundnsadmin/services/oidc.py diff --git a/powerdnsadmin/services/saml.py b/gundnsadmin/services/saml.py similarity index 99% rename from powerdnsadmin/services/saml.py rename to gundnsadmin/services/saml.py index 4a33ee63..1aa20cb0 100644 --- a/powerdnsadmin/services/saml.py +++ b/gundnsadmin/services/saml.py @@ -134,7 +134,7 @@ def init_saml_auth(self, req): if 'SAML_SP_REQUESTED_ATTRIBUTES' in current_app.config: saml_req_attr = json.loads(current_app.config['SAML_SP_REQUESTED_ATTRIBUTES']) settings['sp']['attributeConsumingService'] = { - "serviceName": "PowerDNSAdmin", + "serviceName": "gundnsadmin", "serviceDescription": "PowerDNS-Admin - PowerDNS administration utility", "requestedAttributes": saml_req_attr } diff --git a/powerdnsadmin/services/token.py b/gundnsadmin/services/token.py similarity index 100% rename from powerdnsadmin/services/token.py rename to gundnsadmin/services/token.py diff --git a/powerdnsadmin/static/assets/css/roboto_mono.css b/gundnsadmin/static/assets/css/roboto_mono.css similarity index 100% rename from powerdnsadmin/static/assets/css/roboto_mono.css rename to gundnsadmin/static/assets/css/roboto_mono.css diff --git a/powerdnsadmin/static/assets/css/source_sans_pro.css b/gundnsadmin/static/assets/css/source_sans_pro.css similarity index 100% rename from powerdnsadmin/static/assets/css/source_sans_pro.css rename to gundnsadmin/static/assets/css/source_sans_pro.css diff --git a/powerdnsadmin/static/assets/css/style.css b/gundnsadmin/static/assets/css/style.css similarity index 100% rename from powerdnsadmin/static/assets/css/style.css rename to gundnsadmin/static/assets/css/style.css diff --git a/powerdnsadmin/static/assets/fonts/roboto-mono-v7-latin-300.woff b/gundnsadmin/static/assets/fonts/roboto-mono-v7-latin-300.woff similarity index 100% rename from powerdnsadmin/static/assets/fonts/roboto-mono-v7-latin-300.woff rename to gundnsadmin/static/assets/fonts/roboto-mono-v7-latin-300.woff diff --git a/powerdnsadmin/static/assets/fonts/roboto-mono-v7-latin-300.woff2 b/gundnsadmin/static/assets/fonts/roboto-mono-v7-latin-300.woff2 similarity index 100% rename from powerdnsadmin/static/assets/fonts/roboto-mono-v7-latin-300.woff2 rename to gundnsadmin/static/assets/fonts/roboto-mono-v7-latin-300.woff2 diff --git a/powerdnsadmin/static/assets/fonts/roboto-mono-v7-latin-700.woff b/gundnsadmin/static/assets/fonts/roboto-mono-v7-latin-700.woff similarity index 100% rename from powerdnsadmin/static/assets/fonts/roboto-mono-v7-latin-700.woff rename to gundnsadmin/static/assets/fonts/roboto-mono-v7-latin-700.woff diff --git a/powerdnsadmin/static/assets/fonts/roboto-mono-v7-latin-700.woff2 b/gundnsadmin/static/assets/fonts/roboto-mono-v7-latin-700.woff2 similarity index 100% rename from powerdnsadmin/static/assets/fonts/roboto-mono-v7-latin-700.woff2 rename to gundnsadmin/static/assets/fonts/roboto-mono-v7-latin-700.woff2 diff --git a/powerdnsadmin/static/assets/fonts/roboto-mono-v7-latin-regular.woff b/gundnsadmin/static/assets/fonts/roboto-mono-v7-latin-regular.woff similarity index 100% rename from powerdnsadmin/static/assets/fonts/roboto-mono-v7-latin-regular.woff rename to gundnsadmin/static/assets/fonts/roboto-mono-v7-latin-regular.woff diff --git a/powerdnsadmin/static/assets/fonts/roboto-mono-v7-latin-regular.woff2 b/gundnsadmin/static/assets/fonts/roboto-mono-v7-latin-regular.woff2 similarity index 100% rename from powerdnsadmin/static/assets/fonts/roboto-mono-v7-latin-regular.woff2 rename to gundnsadmin/static/assets/fonts/roboto-mono-v7-latin-regular.woff2 diff --git a/powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-300.eot b/gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-300.eot similarity index 100% rename from powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-300.eot rename to gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-300.eot diff --git a/powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-300.svg b/gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-300.svg similarity index 100% rename from powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-300.svg rename to gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-300.svg diff --git a/powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-300.ttf b/gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-300.ttf similarity index 100% rename from powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-300.ttf rename to gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-300.ttf diff --git a/powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-300.woff b/gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-300.woff similarity index 100% rename from powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-300.woff rename to gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-300.woff diff --git a/powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-300.woff2 b/gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-300.woff2 similarity index 100% rename from powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-300.woff2 rename to gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-300.woff2 diff --git a/powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-300italic.eot b/gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-300italic.eot similarity index 100% rename from powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-300italic.eot rename to gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-300italic.eot diff --git a/powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-300italic.svg b/gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-300italic.svg similarity index 100% rename from powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-300italic.svg rename to gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-300italic.svg diff --git a/powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-300italic.ttf b/gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-300italic.ttf similarity index 100% rename from powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-300italic.ttf rename to gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-300italic.ttf diff --git a/powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-300italic.woff b/gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-300italic.woff similarity index 100% rename from powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-300italic.woff rename to gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-300italic.woff diff --git a/powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-300italic.woff2 b/gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-300italic.woff2 similarity index 100% rename from powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-300italic.woff2 rename to gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-300italic.woff2 diff --git a/powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-600.eot b/gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-600.eot similarity index 100% rename from powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-600.eot rename to gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-600.eot diff --git a/powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-600.svg b/gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-600.svg similarity index 100% rename from powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-600.svg rename to gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-600.svg diff --git a/powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-600.ttf b/gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-600.ttf similarity index 100% rename from powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-600.ttf rename to gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-600.ttf diff --git a/powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-600.woff b/gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-600.woff similarity index 100% rename from powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-600.woff rename to gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-600.woff diff --git a/powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-600.woff2 b/gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-600.woff2 similarity index 100% rename from powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-600.woff2 rename to gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-600.woff2 diff --git a/powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-600italic.eot b/gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-600italic.eot similarity index 100% rename from powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-600italic.eot rename to gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-600italic.eot diff --git a/powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-600italic.svg b/gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-600italic.svg similarity index 100% rename from powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-600italic.svg rename to gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-600italic.svg diff --git a/powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-600italic.ttf b/gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-600italic.ttf similarity index 100% rename from powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-600italic.ttf rename to gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-600italic.ttf diff --git a/powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-600italic.woff b/gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-600italic.woff similarity index 100% rename from powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-600italic.woff rename to gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-600italic.woff diff --git a/powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-600italic.woff2 b/gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-600italic.woff2 similarity index 100% rename from powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-600italic.woff2 rename to gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-600italic.woff2 diff --git a/powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-700.eot b/gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-700.eot similarity index 100% rename from powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-700.eot rename to gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-700.eot diff --git a/powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-700.svg b/gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-700.svg similarity index 100% rename from powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-700.svg rename to gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-700.svg diff --git a/powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-700.ttf b/gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-700.ttf similarity index 100% rename from powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-700.ttf rename to gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-700.ttf diff --git a/powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-700.woff b/gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-700.woff similarity index 100% rename from powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-700.woff rename to gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-700.woff diff --git a/powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-700.woff2 b/gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-700.woff2 similarity index 100% rename from powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-700.woff2 rename to gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-700.woff2 diff --git a/powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-italic.eot b/gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-italic.eot similarity index 100% rename from powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-italic.eot rename to gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-italic.eot diff --git a/powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-italic.svg b/gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-italic.svg similarity index 100% rename from powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-italic.svg rename to gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-italic.svg diff --git a/powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-italic.ttf b/gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-italic.ttf similarity index 100% rename from powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-italic.ttf rename to gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-italic.ttf diff --git a/powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-italic.woff b/gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-italic.woff similarity index 100% rename from powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-italic.woff rename to gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-italic.woff diff --git a/powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-italic.woff2 b/gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-italic.woff2 similarity index 100% rename from powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-italic.woff2 rename to gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-italic.woff2 diff --git a/powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-regular.eot b/gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-regular.eot similarity index 100% rename from powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-regular.eot rename to gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-regular.eot diff --git a/powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-regular.svg b/gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-regular.svg similarity index 100% rename from powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-regular.svg rename to gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-regular.svg diff --git a/powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-regular.ttf b/gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-regular.ttf similarity index 100% rename from powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-regular.ttf rename to gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-regular.ttf diff --git a/powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-regular.woff b/gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-regular.woff similarity index 100% rename from powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-regular.woff rename to gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-regular.woff diff --git a/powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-regular.woff2 b/gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-regular.woff2 similarity index 100% rename from powerdnsadmin/static/assets/fonts/source-sans-pro-v13-latin-regular.woff2 rename to gundnsadmin/static/assets/fonts/source-sans-pro-v13-latin-regular.woff2 diff --git a/powerdnsadmin/static/custom/css/custom.css b/gundnsadmin/static/custom/css/custom.css similarity index 100% rename from powerdnsadmin/static/custom/css/custom.css rename to gundnsadmin/static/custom/css/custom.css diff --git a/powerdnsadmin/static/custom/js/app-authentication-settings-editor.js b/gundnsadmin/static/custom/js/app-authentication-settings-editor.js similarity index 100% rename from powerdnsadmin/static/custom/js/app-authentication-settings-editor.js rename to gundnsadmin/static/custom/js/app-authentication-settings-editor.js diff --git a/powerdnsadmin/static/custom/js/custom.js b/gundnsadmin/static/custom/js/custom.js similarity index 100% rename from powerdnsadmin/static/custom/js/custom.js rename to gundnsadmin/static/custom/js/custom.js diff --git a/powerdnsadmin/static/img/favicon.png b/gundnsadmin/static/img/favicon.png similarity index 100% rename from powerdnsadmin/static/img/favicon.png rename to gundnsadmin/static/img/favicon.png diff --git a/powerdnsadmin/static/img/switch.png b/gundnsadmin/static/img/switch.png similarity index 100% rename from powerdnsadmin/static/img/switch.png rename to gundnsadmin/static/img/switch.png diff --git a/powerdnsadmin/static/img/user_image.png b/gundnsadmin/static/img/user_image.png similarity index 100% rename from powerdnsadmin/static/img/user_image.png rename to gundnsadmin/static/img/user_image.png diff --git a/powerdnsadmin/swagger-spec.yaml b/gundnsadmin/swagger-spec.yaml similarity index 100% rename from powerdnsadmin/swagger-spec.yaml rename to gundnsadmin/swagger-spec.yaml diff --git a/powerdnsadmin/templates/admin_edit_account.html b/gundnsadmin/templates/admin_edit_account.html similarity index 100% rename from powerdnsadmin/templates/admin_edit_account.html rename to gundnsadmin/templates/admin_edit_account.html diff --git a/powerdnsadmin/templates/admin_edit_key.html b/gundnsadmin/templates/admin_edit_key.html similarity index 100% rename from powerdnsadmin/templates/admin_edit_key.html rename to gundnsadmin/templates/admin_edit_key.html diff --git a/powerdnsadmin/templates/admin_edit_user.html b/gundnsadmin/templates/admin_edit_user.html similarity index 100% rename from powerdnsadmin/templates/admin_edit_user.html rename to gundnsadmin/templates/admin_edit_user.html diff --git a/powerdnsadmin/templates/admin_global_search.html b/gundnsadmin/templates/admin_global_search.html similarity index 100% rename from powerdnsadmin/templates/admin_global_search.html rename to gundnsadmin/templates/admin_global_search.html diff --git a/powerdnsadmin/templates/admin_history.html b/gundnsadmin/templates/admin_history.html similarity index 100% rename from powerdnsadmin/templates/admin_history.html rename to gundnsadmin/templates/admin_history.html diff --git a/powerdnsadmin/templates/admin_history_table.html b/gundnsadmin/templates/admin_history_table.html similarity index 100% rename from powerdnsadmin/templates/admin_history_table.html rename to gundnsadmin/templates/admin_history_table.html diff --git a/powerdnsadmin/templates/admin_manage_account.html b/gundnsadmin/templates/admin_manage_account.html similarity index 100% rename from powerdnsadmin/templates/admin_manage_account.html rename to gundnsadmin/templates/admin_manage_account.html diff --git a/powerdnsadmin/templates/admin_manage_keys.html b/gundnsadmin/templates/admin_manage_keys.html similarity index 100% rename from powerdnsadmin/templates/admin_manage_keys.html rename to gundnsadmin/templates/admin_manage_keys.html diff --git a/powerdnsadmin/templates/admin_manage_user.html b/gundnsadmin/templates/admin_manage_user.html similarity index 100% rename from powerdnsadmin/templates/admin_manage_user.html rename to gundnsadmin/templates/admin_manage_user.html diff --git a/powerdnsadmin/templates/admin_server_configuration.html b/gundnsadmin/templates/admin_server_configuration.html similarity index 100% rename from powerdnsadmin/templates/admin_server_configuration.html rename to gundnsadmin/templates/admin_server_configuration.html diff --git a/powerdnsadmin/templates/admin_server_statistics.html b/gundnsadmin/templates/admin_server_statistics.html similarity index 100% rename from powerdnsadmin/templates/admin_server_statistics.html rename to gundnsadmin/templates/admin_server_statistics.html diff --git a/powerdnsadmin/templates/admin_setting_authentication.html b/gundnsadmin/templates/admin_setting_authentication.html similarity index 99% rename from powerdnsadmin/templates/admin_setting_authentication.html rename to gundnsadmin/templates/admin_setting_authentication.html index c7f3e2e1..2440fbb3 100644 --- a/powerdnsadmin/templates/admin_setting_authentication.html +++ b/gundnsadmin/templates/admin_setting_authentication.html @@ -1252,7 +1252,7 @@

Settings Help

Registrations, and create a new one. Give it any name you want, and the Redirect - URI shoule be type 'Web' and of the format https://powerdnsadmin/azure/authorized + URI shoule be type 'Web' and of the format https://gundnsadmin/azure/authorized (replace the host name approriately).
  • Select the newly-created registration
    • diff --git a/powerdnsadmin/templates/admin_setting_basic.html b/gundnsadmin/templates/admin_setting_basic.html similarity index 100% rename from powerdnsadmin/templates/admin_setting_basic.html rename to gundnsadmin/templates/admin_setting_basic.html diff --git a/powerdnsadmin/templates/admin_setting_pdns.html b/gundnsadmin/templates/admin_setting_pdns.html similarity index 100% rename from powerdnsadmin/templates/admin_setting_pdns.html rename to gundnsadmin/templates/admin_setting_pdns.html diff --git a/powerdnsadmin/templates/admin_setting_records.html b/gundnsadmin/templates/admin_setting_records.html similarity index 100% rename from powerdnsadmin/templates/admin_setting_records.html rename to gundnsadmin/templates/admin_setting_records.html diff --git a/powerdnsadmin/templates/applied_change_macro.html b/gundnsadmin/templates/applied_change_macro.html similarity index 100% rename from powerdnsadmin/templates/applied_change_macro.html rename to gundnsadmin/templates/applied_change_macro.html diff --git a/powerdnsadmin/templates/base.html b/gundnsadmin/templates/base.html similarity index 99% rename from powerdnsadmin/templates/base.html rename to gundnsadmin/templates/base.html index c8708e80..dbe44715 100644 --- a/powerdnsadmin/templates/base.html +++ b/gundnsadmin/templates/base.html @@ -243,7 +243,7 @@

    diff --git a/powerdnsadmin/templates/maintenance.html b/gundnsadmin/templates/maintenance.html similarity index 100% rename from powerdnsadmin/templates/maintenance.html rename to gundnsadmin/templates/maintenance.html diff --git a/powerdnsadmin/templates/register.html b/gundnsadmin/templates/register.html similarity index 99% rename from powerdnsadmin/templates/register.html rename to gundnsadmin/templates/register.html index 0a5d6d5c..20d24f05 100644 --- a/powerdnsadmin/templates/register.html +++ b/gundnsadmin/templates/register.html @@ -190,7 +190,7 @@

    -

    Powered by PowerDNS-Admin

    +

    Powered by PowerDNS-Admin

    {% assets "js_login" -%} diff --git a/powerdnsadmin/templates/register_otp.html b/gundnsadmin/templates/register_otp.html similarity index 97% rename from powerdnsadmin/templates/register_otp.html rename to gundnsadmin/templates/register_otp.html index 683bc7ff..3cdc330b 100755 --- a/powerdnsadmin/templates/register_otp.html +++ b/gundnsadmin/templates/register_otp.html @@ -75,7 +75,7 @@
    -

    Powered by PowerDNS-Admin

    +

    Powered by PowerDNS-Admin

    diff --git a/powerdnsadmin/templates/resend_confirmation_email.html b/gundnsadmin/templates/resend_confirmation_email.html similarity index 97% rename from powerdnsadmin/templates/resend_confirmation_email.html rename to gundnsadmin/templates/resend_confirmation_email.html index c39587fe..e79dd18e 100644 --- a/powerdnsadmin/templates/resend_confirmation_email.html +++ b/gundnsadmin/templates/resend_confirmation_email.html @@ -62,7 +62,7 @@
    -

    Powered by PowerDNS-Admin

    +

    Powered by PowerDNS-Admin

    {% assets "js_login" -%} diff --git a/powerdnsadmin/templates/template.html b/gundnsadmin/templates/template.html similarity index 100% rename from powerdnsadmin/templates/template.html rename to gundnsadmin/templates/template.html diff --git a/powerdnsadmin/templates/template_add.html b/gundnsadmin/templates/template_add.html similarity index 100% rename from powerdnsadmin/templates/template_add.html rename to gundnsadmin/templates/template_add.html diff --git a/powerdnsadmin/templates/template_edit.html b/gundnsadmin/templates/template_edit.html similarity index 100% rename from powerdnsadmin/templates/template_edit.html rename to gundnsadmin/templates/template_edit.html diff --git a/powerdnsadmin/templates/user_profile.html b/gundnsadmin/templates/user_profile.html similarity index 100% rename from powerdnsadmin/templates/user_profile.html rename to gundnsadmin/templates/user_profile.html diff --git a/run.py b/run.py index 5ffcde31..39f65a5e 100755 --- a/run.py +++ b/run.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -from powerdnsadmin import create_app +from gundnsadmin import create_app if __name__ == '__main__': app = create_app() diff --git a/tests/conftest.py b/tests/conftest.py index f5de9e8d..8ac4d5a5 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -4,11 +4,11 @@ import pytest from flask_migrate import upgrade as flask_migrate_upgrade -from powerdnsadmin import create_app -from powerdnsadmin.models.api_key import ApiKey -from powerdnsadmin.models.base import db -from powerdnsadmin.models.setting import Setting -from powerdnsadmin.models.user import User +from gundnsadmin import create_app +from gundnsadmin.models.api_key import ApiKey +from gundnsadmin.models.base import db +from gundnsadmin.models.setting import Setting +from gundnsadmin.models.user import User @pytest.fixture(scope="session") diff --git a/tests/integration/api/apikey/test_admin_user.py b/tests/integration/api/apikey/test_admin_user.py index 3bc0c828..cf466d95 100644 --- a/tests/integration/api/apikey/test_admin_user.py +++ b/tests/integration/api/apikey/test_admin_user.py @@ -2,8 +2,8 @@ import json from collections import namedtuple -from powerdnsadmin.lib.validators import validate_apikey -from powerdnsadmin.lib.schema import ApiKeySchema +from gundnsadmin.lib.validators import validate_apikey +from gundnsadmin.lib.schema import ApiKeySchema from tests.conftest import user_apikey_data, admin_apikey_data diff --git a/tests/integration/api/apikey/test_user.py b/tests/integration/api/apikey/test_user.py index 34fdd861..3fff0461 100644 --- a/tests/integration/api/apikey/test_user.py +++ b/tests/integration/api/apikey/test_user.py @@ -1,8 +1,8 @@ import json from collections import namedtuple -from powerdnsadmin.lib.validators import validate_zone -from powerdnsadmin.lib.schema import DomainSchema +from gundnsadmin.lib.validators import validate_zone +from gundnsadmin.lib.schema import DomainSchema class TestIntegrationApiApiKeyUser(object): diff --git a/tests/integration/api/zone/test_admin_user.py b/tests/integration/api/zone/test_admin_user.py index f1c12a72..54d36992 100644 --- a/tests/integration/api/zone/test_admin_user.py +++ b/tests/integration/api/zone/test_admin_user.py @@ -1,8 +1,8 @@ import json from collections import namedtuple -from powerdnsadmin.lib.validators import validate_zone -from powerdnsadmin.lib.schema import DomainSchema +from gundnsadmin.lib.validators import validate_zone +from gundnsadmin.lib.schema import DomainSchema class TestIntegrationApiZoneAdminUser(object): diff --git a/tests/integration/api/zone/test_apikey_admin_user.py b/tests/integration/api/zone/test_apikey_admin_user.py index 494366f0..bd836da4 100644 --- a/tests/integration/api/zone/test_apikey_admin_user.py +++ b/tests/integration/api/zone/test_apikey_admin_user.py @@ -1,8 +1,8 @@ import json from collections import namedtuple -from powerdnsadmin.lib.validators import validate_zone -from powerdnsadmin.lib.schema import DomainSchema +from gundnsadmin.lib.validators import validate_zone +from gundnsadmin.lib.schema import DomainSchema class TestIntegrationApiZoneAdminApiKey(object): diff --git a/tests/integration/api/zone/test_apikey_user.py b/tests/integration/api/zone/test_apikey_user.py index 94ddac11..769b2219 100644 --- a/tests/integration/api/zone/test_apikey_user.py +++ b/tests/integration/api/zone/test_apikey_user.py @@ -1,8 +1,8 @@ import json from collections import namedtuple -from powerdnsadmin.lib.validators import validate_zone -from powerdnsadmin.lib.schema import DomainSchema +from gundnsadmin.lib.validators import validate_zone +from gundnsadmin.lib.schema import DomainSchema class TestIntegrationApiZoneUserApiKey(object): diff --git a/tests/integration/api/zone/test_user.py b/tests/integration/api/zone/test_user.py index 1d0751de..c69d03b5 100644 --- a/tests/integration/api/zone/test_user.py +++ b/tests/integration/api/zone/test_user.py @@ -1,8 +1,8 @@ import json from collections import namedtuple -from powerdnsadmin.lib.validators import validate_zone -from powerdnsadmin.lib.schema import DomainSchema +from gundnsadmin.lib.validators import validate_zone +from gundnsadmin.lib.schema import DomainSchema class TestIntegrationApiZoneUser(object): diff --git a/tests/unit/zone/test_admin_apikey.py b/tests/unit/zone/test_admin_apikey.py index ccef69ca..aeb43b09 100644 --- a/tests/unit/zone/test_admin_apikey.py +++ b/tests/unit/zone/test_admin_apikey.py @@ -3,13 +3,13 @@ from unittest.mock import patch from collections import namedtuple -import powerdnsadmin -from powerdnsadmin.models.setting import Setting -from powerdnsadmin.models.domain import Domain -from powerdnsadmin.models.api_key import ApiKey -from powerdnsadmin.models.role import Role -from powerdnsadmin.lib.validators import validate_zone -from powerdnsadmin.lib.schema import DomainSchema +import gundnsadmin +from gundnsadmin.models.setting import Setting +from gundnsadmin.models.domain import Domain +from gundnsadmin.models.api_key import ApiKey +from gundnsadmin.models.role import Role +from gundnsadmin.lib.validators import validate_zone +from gundnsadmin.lib.schema import DomainSchema from tests.conftest import admin_apikey_data, load_data @@ -18,44 +18,44 @@ class TestUnitApiZoneAdminApiKey(object): def common_data_mock(self, app): with app.app_context(): self.google_setting_patcher = patch( - 'powerdnsadmin.services.google.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.services.google.Setting', + spec=gundnsadmin.models.setting.Setting) self.github_setting_patcher = patch( - 'powerdnsadmin.services.github.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.services.github.Setting', + spec=gundnsadmin.models.setting.Setting) self.azure_setting_patcher = patch( - 'powerdnsadmin.services.azure.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.services.azure.Setting', + spec=gundnsadmin.models.setting.Setting) self.oidc_setting_patcher = patch( - 'powerdnsadmin.services.oidc.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.services.oidc.Setting', + spec=gundnsadmin.models.setting.Setting) self.helpers_setting_patcher = patch( - 'powerdnsadmin.lib.helper.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.lib.helper.Setting', + spec=gundnsadmin.models.setting.Setting) self.models_setting_patcher = patch( - 'powerdnsadmin.models.setting.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.models.setting.Setting', + spec=gundnsadmin.models.setting.Setting) self.domain_model_setting_patcher = patch( - 'powerdnsadmin.models.domain.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.models.domain.Setting', + spec=gundnsadmin.models.setting.Setting) self.record_model_setting_patcher = patch( - 'powerdnsadmin.models.record.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.models.record.Setting', + spec=gundnsadmin.models.setting.Setting) self.server_model_setting_patcher = patch( - 'powerdnsadmin.models.server.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.models.server.Setting', + spec=gundnsadmin.models.setting.Setting) self.mock_apikey_patcher = patch( - 'powerdnsadmin.decorators.ApiKey', - spec=powerdnsadmin.models.api_key.ApiKey) + 'gundnsadmin.decorators.ApiKey', + spec=gundnsadmin.models.api_key.ApiKey) self.mock_hist_patcher = patch( - 'powerdnsadmin.routes.api.History', - spec=powerdnsadmin.models.history.History) + 'gundnsadmin.routes.api.History', + spec=gundnsadmin.models.history.History) self.mock_setting_patcher = patch( - 'powerdnsadmin.routes.api.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.routes.api.Setting', + spec=gundnsadmin.models.setting.Setting) self.mock_decorators_setting_patcher = patch( - 'powerdnsadmin.decorators.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.decorators.Setting', + spec=gundnsadmin.models.setting.Setting) data = admin_apikey_data() api_key = ApiKey(desc=data['description'], @@ -113,8 +113,8 @@ def common_data_mock(self, app): def test_empty_get(self, client, common_data_mock, admin_apikey): - with patch('powerdnsadmin.routes.api.Domain') as mock_domain, \ - patch('powerdnsadmin.lib.utils.requests.get') as mock_get: + with patch('gundnsadmin.routes.api.Domain') as mock_domain, \ + patch('gundnsadmin.lib.utils.requests.get') as mock_get: mock_domain.return_value.domains.return_value = [] mock_domain.query.all.return_value = [] mock_get.return_value.json.return_value = [] @@ -129,8 +129,8 @@ def test_empty_get(self, client, common_data_mock, admin_apikey): def test_create_zone(self, client, common_data_mock, zone_data, admin_apikey, created_zone_data): - with patch('powerdnsadmin.lib.helper.requests.request') as mock_post, \ - patch('powerdnsadmin.routes.api.Domain') as mock_domain: + with patch('gundnsadmin.lib.helper.requests.request') as mock_post, \ + patch('gundnsadmin.routes.api.Domain') as mock_domain: mock_post.return_value.status_code = 201 mock_post.return_value.content = json.dumps(created_zone_data) mock_post.return_value.headers = {} @@ -148,7 +148,7 @@ def test_create_zone(self, client, common_data_mock, zone_data, def test_get_multiple_zones(self, client, common_data_mock, zone_data, admin_apikey): - with patch('powerdnsadmin.routes.api.Domain') as mock_domain: + with patch('gundnsadmin.routes.api.Domain') as mock_domain: test_domain = Domain(1, name=zone_data['name'].rstrip(".")) mock_domain.query.all.return_value = [test_domain] @@ -165,8 +165,8 @@ def test_get_multiple_zones(self, client, common_data_mock, zone_data, def test_delete_zone(self, client, common_data_mock, zone_data, admin_apikey): - with patch('powerdnsadmin.lib.utils.requests.request') as mock_delete, \ - patch('powerdnsadmin.routes.api.Domain') as mock_domain: + with patch('gundnsadmin.lib.utils.requests.request') as mock_delete, \ + patch('gundnsadmin.routes.api.Domain') as mock_domain: mock_domain.return_value.update.return_value = True mock_delete.return_value.status_code = 204 mock_delete.return_value.content = '' diff --git a/tests/unit/zone/test_admin_user.py b/tests/unit/zone/test_admin_user.py index c4412de4..fb930077 100644 --- a/tests/unit/zone/test_admin_user.py +++ b/tests/unit/zone/test_admin_user.py @@ -3,11 +3,11 @@ from unittest.mock import patch, MagicMock from collections import namedtuple -import powerdnsadmin -from powerdnsadmin.models.user import User -from powerdnsadmin.models.domain import Domain -from powerdnsadmin.lib.validators import validate_zone -from powerdnsadmin.lib.schema import DomainSchema +import gundnsadmin +from gundnsadmin.models.user import User +from gundnsadmin.models.domain import Domain +from gundnsadmin.lib.validators import validate_zone +from gundnsadmin.lib.schema import DomainSchema from tests.conftest import load_data @@ -16,47 +16,47 @@ class TestUnitApiZoneAdminUser(object): def common_data_mock(self, app, initial_data): self.google_setting_patcher = patch( - 'powerdnsadmin.services.google.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.services.google.Setting', + spec=gundnsadmin.models.setting.Setting) self.github_setting_patcher = patch( - 'powerdnsadmin.services.github.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.services.github.Setting', + spec=gundnsadmin.models.setting.Setting) self.azure_setting_patcher = patch( - 'powerdnsadmin.services.azure.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.services.azure.Setting', + spec=gundnsadmin.models.setting.Setting) self.oidc_setting_patcher = patch( - 'powerdnsadmin.services.oidc.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.services.oidc.Setting', + spec=gundnsadmin.models.setting.Setting) self.helpers_setting_patcher = patch( - 'powerdnsadmin.lib.helper.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.lib.helper.Setting', + spec=gundnsadmin.models.setting.Setting) self.models_setting_patcher = patch( - 'powerdnsadmin.models.setting.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.models.setting.Setting', + spec=gundnsadmin.models.setting.Setting) self.domain_model_setting_patcher = patch( - 'powerdnsadmin.models.domain.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.models.domain.Setting', + spec=gundnsadmin.models.setting.Setting) self.record_model_setting_patcher = patch( - 'powerdnsadmin.models.record.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.models.record.Setting', + spec=gundnsadmin.models.setting.Setting) self.server_model_setting_patcher = patch( - 'powerdnsadmin.models.server.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.models.server.Setting', + spec=gundnsadmin.models.setting.Setting) self.mock_user_patcher = patch( - 'powerdnsadmin.decorators.User', - spec=powerdnsadmin.models.user.User) + 'gundnsadmin.decorators.User', + spec=gundnsadmin.models.user.User) self.mock_hist_patcher = patch( - 'powerdnsadmin.routes.api.History', - spec=powerdnsadmin.models.history.History) + 'gundnsadmin.routes.api.History', + spec=gundnsadmin.models.history.History) self.mock_setting_patcher = patch( - 'powerdnsadmin.routes.api.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.routes.api.Setting', + spec=gundnsadmin.models.setting.Setting) self.mock_decorators_setting_patcher = patch( - 'powerdnsadmin.decorators.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.decorators.Setting', + spec=gundnsadmin.models.setting.Setting) self.base_route_user_patcher = patch( - 'powerdnsadmin.routes.base.User', - spec=powerdnsadmin.models.user.User) + 'gundnsadmin.routes.base.User', + spec=gundnsadmin.models.user.User) with app.app_context(): self.mock_google_setting = self.google_setting_patcher.start() @@ -120,8 +120,8 @@ def common_data_mock(self, app, initial_data): def test_empty_get(self, client, common_data_mock, basic_auth_admin_headers): - with patch('powerdnsadmin.routes.api.Domain') as mock_domain, \ - patch('powerdnsadmin.lib.helper.requests.get') as mock_get: + with patch('gundnsadmin.routes.api.Domain') as mock_domain, \ + patch('gundnsadmin.lib.helper.requests.get') as mock_get: mock_domain.return_value.domains.return_value = [] mock_domain.query.all.return_value = [] mock_get.return_value.json.return_value = [] @@ -135,8 +135,8 @@ def test_empty_get(self, client, common_data_mock, def test_create_zone(self, client, common_data_mock, zone_data, basic_auth_admin_headers, created_zone_data): - with patch('powerdnsadmin.lib.helper.requests.request') as mock_post, \ - patch('powerdnsadmin.routes.api.Domain') as mock_domain: + with patch('gundnsadmin.lib.helper.requests.request') as mock_post, \ + patch('gundnsadmin.routes.api.Domain') as mock_domain: mock_post.return_value.status_code = 201 mock_post.return_value.content = json.dumps(created_zone_data) mock_post.return_value.headers = {} @@ -154,7 +154,7 @@ def test_create_zone(self, client, common_data_mock, zone_data, def test_get_multiple_zones(self, client, common_data_mock, zone_data, basic_auth_admin_headers): - with patch('powerdnsadmin.routes.api.Domain') as mock_domain: + with patch('gundnsadmin.routes.api.Domain') as mock_domain: test_domain = Domain(1, name=zone_data['name'].rstrip(".")) mock_domain.query.all.return_value = [test_domain] @@ -170,8 +170,8 @@ def test_get_multiple_zones(self, client, common_data_mock, zone_data, def test_delete_zone(self, client, common_data_mock, zone_data, basic_auth_admin_headers): - with patch('powerdnsadmin.lib.helper.requests.request') as mock_delete, \ - patch('powerdnsadmin.routes.api.Domain') as mock_domain: + with patch('gundnsadmin.lib.helper.requests.request') as mock_delete, \ + patch('gundnsadmin.routes.api.Domain') as mock_domain: mock_domain.return_value.update.return_value = True mock_domain.query.filter.return_value = True mock_delete.return_value.status_code = 204 diff --git a/tests/unit/zone/test_user.py b/tests/unit/zone/test_user.py index f7fe3359..9d932720 100644 --- a/tests/unit/zone/test_user.py +++ b/tests/unit/zone/test_user.py @@ -3,11 +3,11 @@ from unittest.mock import patch, MagicMock from collections import namedtuple -import powerdnsadmin -from powerdnsadmin.models.user import User -from powerdnsadmin.models.domain import Domain -from powerdnsadmin.lib.validators import validate_zone -from powerdnsadmin.lib.schema import DomainSchema +import gundnsadmin +from gundnsadmin.models.user import User +from gundnsadmin.models.domain import Domain +from gundnsadmin.lib.validators import validate_zone +from gundnsadmin.lib.schema import DomainSchema from tests.conftest import load_data @@ -16,47 +16,47 @@ class TestUnitApiZoneUser(object): def common_data_mock(self, app, initial_data): self.google_setting_patcher = patch( - 'powerdnsadmin.services.google.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.services.google.Setting', + spec=gundnsadmin.models.setting.Setting) self.github_setting_patcher = patch( - 'powerdnsadmin.services.github.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.services.github.Setting', + spec=gundnsadmin.models.setting.Setting) self.azure_setting_patcher = patch( - 'powerdnsadmin.services.azure.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.services.azure.Setting', + spec=gundnsadmin.models.setting.Setting) self.oidc_setting_patcher = patch( - 'powerdnsadmin.services.oidc.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.services.oidc.Setting', + spec=gundnsadmin.models.setting.Setting) self.helpers_setting_patcher = patch( - 'powerdnsadmin.lib.helper.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.lib.helper.Setting', + spec=gundnsadmin.models.setting.Setting) self.models_setting_patcher = patch( - 'powerdnsadmin.models.setting.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.models.setting.Setting', + spec=gundnsadmin.models.setting.Setting) self.domain_model_setting_patcher = patch( - 'powerdnsadmin.models.domain.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.models.domain.Setting', + spec=gundnsadmin.models.setting.Setting) self.record_model_setting_patcher = patch( - 'powerdnsadmin.models.record.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.models.record.Setting', + spec=gundnsadmin.models.setting.Setting) self.server_model_setting_patcher = patch( - 'powerdnsadmin.models.server.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.models.server.Setting', + spec=gundnsadmin.models.setting.Setting) self.mock_user_patcher = patch( - 'powerdnsadmin.decorators.User', - spec=powerdnsadmin.models.user.User) + 'gundnsadmin.decorators.User', + spec=gundnsadmin.models.user.User) self.mock_hist_patcher = patch( - 'powerdnsadmin.routes.api.History', - spec=powerdnsadmin.models.history.History) + 'gundnsadmin.routes.api.History', + spec=gundnsadmin.models.history.History) self.mock_setting_patcher = patch( - 'powerdnsadmin.routes.api.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.routes.api.Setting', + spec=gundnsadmin.models.setting.Setting) self.mock_decorators_setting_patcher = patch( - 'powerdnsadmin.decorators.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.decorators.Setting', + spec=gundnsadmin.models.setting.Setting) self.base_route_user_patcher = patch( - 'powerdnsadmin.routes.base.User', - spec=powerdnsadmin.models.user.User) + 'gundnsadmin.routes.base.User', + spec=gundnsadmin.models.user.User) with app.app_context(): self.mock_google_setting = self.google_setting_patcher.start() @@ -120,8 +120,8 @@ def common_data_mock(self, app, initial_data): def test_create_zone(self, client, common_data_mock, zone_data, basic_auth_user_headers, created_zone_data): - with patch('powerdnsadmin.lib.helper.requests.request') as mock_post, \ - patch('powerdnsadmin.routes.api.Domain') as mock_domain: + with patch('gundnsadmin.lib.helper.requests.request') as mock_post, \ + patch('gundnsadmin.routes.api.Domain') as mock_domain: mock_post.return_value.status_code = 201 mock_post.return_value.content = json.dumps(created_zone_data) mock_post.return_value.headers = {} @@ -139,7 +139,7 @@ def test_create_zone(self, client, common_data_mock, zone_data, def test_get_multiple_zones(self, client, common_data_mock, zone_data, basic_auth_user_headers): - with patch('powerdnsadmin.routes.api.get_user_domains') as mock_user_domains: + with patch('gundnsadmin.routes.api.get_user_domains') as mock_user_domains: test_domain = Domain(1, name=zone_data['name'].rstrip(".")) mock_user_domains.return_value = [test_domain] @@ -155,9 +155,9 @@ def test_get_multiple_zones(self, client, common_data_mock, zone_data, def test_delete_zone(self, client, common_data_mock, zone_data, basic_auth_user_headers): - with patch('powerdnsadmin.lib.helper.requests.request') as mock_delete, \ - patch('powerdnsadmin.routes.api.Domain') as mock_domain, \ - patch('powerdnsadmin.routes.api.get_user_domains') as mock_user_domains: + with patch('gundnsadmin.lib.helper.requests.request') as mock_delete, \ + patch('gundnsadmin.routes.api.Domain') as mock_domain, \ + patch('gundnsadmin.routes.api.get_user_domains') as mock_user_domains: test_domain = Domain(1, name=zone_data['name'].rstrip(".")) mock_domain.return_value.update.return_value = True diff --git a/tests/unit/zone/test_user_apikey.py b/tests/unit/zone/test_user_apikey.py index b1911cef..c098c936 100644 --- a/tests/unit/zone/test_user_apikey.py +++ b/tests/unit/zone/test_user_apikey.py @@ -3,13 +3,13 @@ from unittest.mock import patch from collections import namedtuple -import powerdnsadmin -from powerdnsadmin.models.setting import Setting -from powerdnsadmin.models.domain import Domain -from powerdnsadmin.models.api_key import ApiKey -from powerdnsadmin.models.role import Role -from powerdnsadmin.lib.validators import validate_zone -from powerdnsadmin.lib.schema import DomainSchema +import gundnsadmin +from gundnsadmin.models.setting import Setting +from gundnsadmin.models.domain import Domain +from gundnsadmin.models.api_key import ApiKey +from gundnsadmin.models.role import Role +from gundnsadmin.lib.validators import validate_zone +from gundnsadmin.lib.schema import DomainSchema from tests.conftest import user_apikey_data, load_data @@ -18,44 +18,44 @@ class TestUnitApiZoneUserApiKey(object): def common_data_mock(self, app): with app.app_context(): self.google_setting_patcher = patch( - 'powerdnsadmin.services.google.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.services.google.Setting', + spec=gundnsadmin.models.setting.Setting) self.github_setting_patcher = patch( - 'powerdnsadmin.services.github.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.services.github.Setting', + spec=gundnsadmin.models.setting.Setting) self.azure_setting_patcher = patch( - 'powerdnsadmin.services.azure.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.services.azure.Setting', + spec=gundnsadmin.models.setting.Setting) self.oidc_setting_patcher = patch( - 'powerdnsadmin.services.oidc.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.services.oidc.Setting', + spec=gundnsadmin.models.setting.Setting) self.helpers_setting_patcher = patch( - 'powerdnsadmin.lib.helper.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.lib.helper.Setting', + spec=gundnsadmin.models.setting.Setting) self.models_setting_patcher = patch( - 'powerdnsadmin.models.setting.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.models.setting.Setting', + spec=gundnsadmin.models.setting.Setting) self.domain_model_setting_patcher = patch( - 'powerdnsadmin.models.domain.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.models.domain.Setting', + spec=gundnsadmin.models.setting.Setting) self.record_model_setting_patcher = patch( - 'powerdnsadmin.models.record.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.models.record.Setting', + spec=gundnsadmin.models.setting.Setting) self.server_model_setting_patcher = patch( - 'powerdnsadmin.models.server.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.models.server.Setting', + spec=gundnsadmin.models.setting.Setting) self.mock_apikey_patcher = patch( - 'powerdnsadmin.decorators.ApiKey', - spec=powerdnsadmin.models.api_key.ApiKey) + 'gundnsadmin.decorators.ApiKey', + spec=gundnsadmin.models.api_key.ApiKey) self.mock_hist_patcher = patch( - 'powerdnsadmin.routes.api.History', - spec=powerdnsadmin.models.history.History) + 'gundnsadmin.routes.api.History', + spec=gundnsadmin.models.history.History) self.mock_setting_patcher = patch( - 'powerdnsadmin.routes.api.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.routes.api.Setting', + spec=gundnsadmin.models.setting.Setting) self.mock_decorators_setting_patcher = patch( - 'powerdnsadmin.decorators.Setting', - spec=powerdnsadmin.models.setting.Setting) + 'gundnsadmin.decorators.Setting', + spec=gundnsadmin.models.setting.Setting) self.mock_google_setting = self.google_setting_patcher.start() self.mock_github_setting = self.github_setting_patcher.start() @@ -117,8 +117,8 @@ def common_data_mock(self, app): def test_create_zone(self, client, common_data_mock, zone_data, user_apikey, created_zone_data): - with patch('powerdnsadmin.lib.helper.requests.request') as mock_post, \ - patch('powerdnsadmin.routes.api.Domain') as mock_domain: + with patch('gundnsadmin.lib.helper.requests.request') as mock_post, \ + patch('gundnsadmin.routes.api.Domain') as mock_domain: mock_post.return_value.status_code = 201 mock_post.return_value.content = json.dumps(created_zone_data) mock_post.return_value.headers = {} @@ -136,7 +136,7 @@ def test_create_zone(self, client, common_data_mock, zone_data, def test_get_multiple_zones(self, client, common_data_mock, zone_data, user_apikey): - with patch('powerdnsadmin.routes.api.Domain') as mock_domain: + with patch('gundnsadmin.routes.api.Domain') as mock_domain: test_domain = Domain(1, name=zone_data['name'].rstrip(".")) mock_domain.query.all.return_value = [test_domain] @@ -152,8 +152,8 @@ def test_get_multiple_zones(self, client, common_data_mock, zone_data, def test_delete_zone(self, client, common_data_mock, zone_data, user_apikey): - with patch('powerdnsadmin.lib.utils.requests.request') as mock_delete, \ - patch('powerdnsadmin.routes.api.Domain') as mock_domain: + with patch('gundnsadmin.lib.utils.requests.request') as mock_delete, \ + patch('gundnsadmin.routes.api.Domain') as mock_domain: mock_domain.return_value.update.return_value = True mock_delete.return_value.status_code = 204 mock_delete.return_value.content = '' diff --git a/update_accounts.py b/update_accounts.py index 0578ce0f..102d19d8 100644 --- a/update_accounts.py +++ b/update_accounts.py @@ -13,9 +13,9 @@ import sys import logging -from powerdnsadmin import create_app -from powerdnsadmin.models.account import Account -from powerdnsadmin.models.setting import Setting +from gundnsadmin import create_app +from gundnsadmin.models.account import Account +from gundnsadmin.models.setting import Setting app = create_app() app.logger.setLevel(logging.INFO) diff --git a/update_zones.py b/update_zones.py index 56cde3e8..d7c3494b 100644 --- a/update_zones.py +++ b/update_zones.py @@ -13,9 +13,9 @@ import sys import logging -from powerdnsadmin import create_app -from powerdnsadmin.models.domain import Domain -from powerdnsadmin.models.setting import Setting +from gundnsadmin import create_app +from gundnsadmin.models.domain import Domain +from gundnsadmin.models.setting import Setting app = create_app() app.logger.setLevel(logging.INFO)