Updated the name of the pwnedhub-config database to pwnedhub-admin.

Updated the title of all PwnedAdmin applications.
practisec · May 10, 2024 · 2c3c0a2 · 2c3c0a2
1 parent 1bf719a
commit 2c3c0a2
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 24 deletions.
diff --git a/database/cs/01-init.sql b/database/cs/01-init.sql
@@ -1,8 +1,8 @@
 -- Setup databases and users
 CREATE DATABASE IF NOT EXISTS `pwnedhub`;
 CREATE DATABASE IF NOT EXISTS `pwnedhub-test`;
-CREATE DATABASE IF NOT EXISTS `pwnedhub-config`;
+CREATE DATABASE IF NOT EXISTS `pwnedhub-admin`;
 CREATE USER 'pwnedhub'@'%' IDENTIFIED BY 'dbconnectpass';
 GRANT ALL PRIVILEGES ON `pwnedhub` . * TO 'pwnedhub'@'%';
 GRANT ALL PRIVILEGES ON `pwnedhub-test` . * TO 'pwnedhub'@'%';
-GRANT ALL PRIVILEGES ON `pwnedhub-config` . * TO 'pwnedhub'@'%';
+GRANT ALL PRIVILEGES ON `pwnedhub-admin` . * TO 'pwnedhub'@'%';
diff --git a/database/cs/04-pwnedhub-config.sql → database/cs/04-pwnedhub-admin.sql b/database/cs/04-pwnedhub-config.sql → database/cs/04-pwnedhub-admin.sql
@@ -1,9 +1,9 @@
 -- Attach to database
-USE `pwnedhub-config`;
+USE `pwnedhub-admin`;
 
 -- MySQL dump 10.13  Distrib 8.0.33, for Linux (x86_64)
 --
--- Host: localhost    Database: pwnedhub-config
+-- Host: localhost    Database: pwnedhub-admin
 -- ------------------------------------------------------
 -- Server version	8.0.33
 

diff --git a/database/ctf/01-init.sql b/database/ctf/01-init.sql
@@ -1,8 +1,8 @@
 -- Setup databases and users
 CREATE DATABASE IF NOT EXISTS `pwnedhub`;
 CREATE DATABASE IF NOT EXISTS `pwnedhub-test`;
-CREATE DATABASE IF NOT EXISTS `pwnedhub-config`;
+CREATE DATABASE IF NOT EXISTS `pwnedhub-admin`;
 CREATE USER 'pwnedhub'@'%' IDENTIFIED BY 'dbconnectpass';
 GRANT ALL PRIVILEGES ON `pwnedhub` . * TO 'pwnedhub'@'%';
 GRANT ALL PRIVILEGES ON `pwnedhub-test` . * TO 'pwnedhub'@'%';
-GRANT ALL PRIVILEGES ON `pwnedhub-config` . * TO 'pwnedhub'@'%';
+GRANT ALL PRIVILEGES ON `pwnedhub-admin` . * TO 'pwnedhub'@'%';
diff --git a/database/ctf/04-pwnedhub-config.sql → database/ctf/04-pwnedhub-admin.sql b/database/ctf/04-pwnedhub-config.sql → database/ctf/04-pwnedhub-admin.sql
@@ -1,9 +1,9 @@
 -- Attach to database
-USE `pwnedhub-config`;
+USE `pwnedhub-admin`;
 
 -- MySQL dump 10.13  Distrib 8.0.33, for Linux (x86_64)
 --
--- Host: localhost    Database: pwnedhub-config
+-- Host: localhost    Database: pwnedhub-admin
 -- ------------------------------------------------------
 -- Server version	8.0.33
 

diff --git a/database/init/01-init.sql b/database/init/01-init.sql
@@ -1,8 +1,8 @@
 -- Setup databases and users
 CREATE DATABASE IF NOT EXISTS `pwnedhub`;
 CREATE DATABASE IF NOT EXISTS `pwnedhub-test`;
-CREATE DATABASE IF NOT EXISTS `pwnedhub-config`;
+CREATE DATABASE IF NOT EXISTS `pwnedhub-admin`;
 CREATE USER 'pwnedhub'@'%' IDENTIFIED BY 'dbconnectpass';
 GRANT ALL PRIVILEGES ON `pwnedhub` . * TO 'pwnedhub'@'%';
 GRANT ALL PRIVILEGES ON `pwnedhub-test` . * TO 'pwnedhub'@'%';
-GRANT ALL PRIVILEGES ON `pwnedhub-config` . * TO 'pwnedhub'@'%';
+GRANT ALL PRIVILEGES ON `pwnedhub-admin` . * TO 'pwnedhub'@'%';
diff --git a/database/init/04-pwnedhub-config.sql → database/init/04-pwnedhub-admin.sql b/database/init/04-pwnedhub-config.sql → database/init/04-pwnedhub-admin.sql
@@ -1,9 +1,9 @@
 -- Attach to database
-USE `pwnedhub-config`;
+USE `pwnedhub-admin`;
 
 -- MySQL dump 10.13  Distrib 8.0.33, for Linux (x86_64)
 --
--- Host: localhost    Database: pwnedhub-config
+-- Host: localhost    Database: pwnedhub-admin
 -- ------------------------------------------------------
 -- Server version	8.0.33
 

diff --git a/pwnedadmin/config.py b/pwnedadmin/config.py
@@ -11,7 +11,7 @@ class BaseConfig(object):
 
     # database
     DATABASE_HOST = os.environ.get('DATABASE_HOST', 'localhost')
-    SQLALCHEMY_DATABASE_URI = f"mysql://pwnedhub:dbconnectpass@{DATABASE_HOST}/pwnedhub-config"
+    SQLALCHEMY_DATABASE_URI = f"mysql://pwnedhub:dbconnectpass@{DATABASE_HOST}/pwnedhub-admin"
     SQLALCHEMY_TRACK_MODIFICATIONS = False
 
 

diff --git a/pwnedadmin/templates/config.html b/pwnedadmin/templates/config.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-    <title>Config</title>
+    <title>PwnedAdmin | Config</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <style>html{visibility:hidden;opacity:0;}</style><!-- FOUC fix 1/2 -->
     <link rel="stylesheet" type="text/css" href="{{ url_for('common.static', filename='css/fontawesome.css') }}">

diff --git a/pwnedadmin/templates/emails.html b/pwnedadmin/templates/emails.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-    <title>Inbox</title>
+    <title>PwnedAdmin | Inbox</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <style>html{visibility:hidden;opacity:0;}</style><!-- FOUC fix 1/2 -->
     <link rel="stylesheet" type="text/css" href="{{ url_for('common.static', filename='css/fontawesome.css') }}">

diff --git a/pwnedapi/config.py b/pwnedapi/config.py
@@ -13,7 +13,7 @@ class BaseConfig(object):
     DATABASE_HOST = os.environ.get('DATABASE_HOST', 'localhost')
     SQLALCHEMY_DATABASE_URI = f"mysql://pwnedhub:dbconnectpass@{DATABASE_HOST}/pwnedhub-test"
     SQLALCHEMY_BINDS = {
-        'config': f"mysql://pwnedhub:dbconnectpass@{DATABASE_HOST}/pwnedhub-config"
+        'admin': f"mysql://pwnedhub:dbconnectpass@{DATABASE_HOST}/pwnedhub-admin"
     }
     SQLALCHEMY_TRACK_MODIFICATIONS = False
 

diff --git a/pwnedapi/models.py b/pwnedapi/models.py
@@ -11,7 +11,7 @@
 
 class Config(db.Model):
     __tablename__ = 'configs'
-    __bind_key__ = 'config'
+    __bind_key__ = 'admin'
     id = db.Column(db.Integer, primary_key=True)
     name = db.Column(db.String(255), nullable=False)
     value = db.Column(db.Boolean, nullable=False)
@@ -30,7 +30,7 @@ def __repr__(self):
 
 class Email(db.Model):
     __tablename__ = 'emails'
-    __bind_key__ = 'config'
+    __bind_key__ = 'admin'
     id = db.Column(db.Integer, primary_key=True)
     created = db.Column(db.DateTime, nullable=False, default=get_current_utc_time)
     sender = db.Column(db.String(255), nullable=False)

diff --git a/pwnedhub/config.py b/pwnedhub/config.py
@@ -15,7 +15,7 @@ class BaseConfig(object):
     DATABASE_HOST = os.environ.get('DATABASE_HOST', 'localhost')
     SQLALCHEMY_DATABASE_URI = f"mysql://pwnedhub:dbconnectpass@{DATABASE_HOST}/pwnedhub"
     SQLALCHEMY_BINDS = {
-        'config': f"mysql://pwnedhub:dbconnectpass@{DATABASE_HOST}/pwnedhub-config"
+        'admin': f"mysql://pwnedhub:dbconnectpass@{DATABASE_HOST}/pwnedhub-admin"
     }
     SQLALCHEMY_TRACK_MODIFICATIONS = False
 

diff --git a/pwnedhub/models.py b/pwnedhub/models.py
@@ -7,7 +7,7 @@
 
 class Config(db.Model):
     __tablename__ = 'configs'
-    __bind_key__ = 'config'
+    __bind_key__ = 'admin'
     id = db.Column(db.Integer, primary_key=True)
     name = db.Column(db.String(255), nullable=False)
     value = db.Column(db.Boolean, nullable=False)
@@ -26,7 +26,7 @@ def __repr__(self):
 
 class Email(db.Model):
     __tablename__ = 'emails'
-    __bind_key__ = 'config'
+    __bind_key__ = 'admin'
     id = db.Column(db.Integer, primary_key=True)
     created = db.Column(db.DateTime, nullable=False, default=get_current_utc_time)
     sender = db.Column(db.String(255), nullable=False)

diff --git a/pwnedsso/config.py b/pwnedsso/config.py
@@ -12,9 +12,6 @@ class BaseConfig(object):
     # database
     DATABASE_HOST = os.environ.get('DATABASE_HOST', 'localhost')
     SQLALCHEMY_DATABASE_URI = f"mysql://pwnedhub:dbconnectpass@{DATABASE_HOST}/pwnedhub"
-    SQLALCHEMY_BINDS = {
-        'config': f"mysql://pwnedhub:dbconnectpass@{DATABASE_HOST}/pwnedhub-config"
-    }
     SQLALCHEMY_TRACK_MODIFICATIONS = False