From 356667f98904b77e230cd7e4fca7ac6805264c6c Mon Sep 17 00:00:00 2001
From: Matt Scott <matt@azorian.solutions>
Date: Fri, 10 Mar 2023 16:34:55 -0500
Subject: [PATCH] Tweaked PR to include the latest asset build changes for CSS
 minimizer. Also updated the default session storage to use SQLAlchemy instead
 of the file system.

---
 configs/development.py          | 2 +-
 configs/docker_config.py        | 2 +-
 powerdnsadmin/assets.py         | 2 +-
 powerdnsadmin/default_config.py | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configs/development.py b/configs/development.py
index 103656a..6d1dd0d 100644
--- a/configs/development.py
+++ b/configs/development.py
@@ -24,7 +24,7 @@ CAPTCHA_SESSION_KEY = 'captcha_image'
 
 #Server side sessions tracking
 #Set to TRUE for CAPTCHA, or enable another stateful session tracking system
-SESSION_TYPE = 'filesystem'
+SESSION_TYPE = 'sqlalchemy'
 
 ### DATABASE - MySQL
 #SQLALCHEMY_DATABASE_URI = 'mysql://{}:{}@{}/{}'.format(
diff --git a/configs/docker_config.py b/configs/docker_config.py
index 347bc26..f934548 100644
--- a/configs/docker_config.py
+++ b/configs/docker_config.py
@@ -4,7 +4,7 @@ PORT = 80
 SQLALCHEMY_DATABASE_URI = 'sqlite:////data/powerdns-admin.db'
 SESSION_COOKIE_SAMESITE = 'Lax'
 CSRF_COOKIE_HTTPONLY = True
-SESSION_TYPE = 'filesystem'
+SESSION_TYPE = 'sqlalchemy'
 
 legal_envvars = (
     'SECRET_KEY',
diff --git a/powerdnsadmin/assets.py b/powerdnsadmin/assets.py
index 52e8d26..0db26d1 100644
--- a/powerdnsadmin/assets.py
+++ b/powerdnsadmin/assets.py
@@ -38,7 +38,7 @@ css_main = Bundle(
   'node_modules/admin-lte/dist/css/adminlte.css',
   'custom/css/custom.css',
   'node_modules/bootstrap-datepicker/dist/css/bootstrap-datepicker.css',
-  filters=('cssmin', 'cssrewrite'),
+  filters=('rcssmin', 'cssrewrite'),
   output='generated/main.css')
 
 js_main = Bundle(
diff --git a/powerdnsadmin/default_config.py b/powerdnsadmin/default_config.py
index 07de0f3..55d28ef 100644
--- a/powerdnsadmin/default_config.py
+++ b/powerdnsadmin/default_config.py
@@ -9,7 +9,7 @@ BIND_ADDRESS = '0.0.0.0'
 PORT = 9191
 HSTS_ENABLED = False
 
-SESSION_TYPE = 'filesystem'
+SESSION_TYPE = 'sqlalchemy'
 SESSION_COOKIE_SAMESITE = 'Lax'
 CSRF_COOKIE_HTTPONLY = True