massive upgrade and modernization of infrastructure code.

Dockerfile

@@ -41,7 +41,7 @@ COPY --from=bundle-builder /app/package.json /app/
 RUN mkdir /app/db
 
 WORKDIR /app
-ADD ./config.yml /app/config.yml
+ADD config/local.yml /app/config.yml
 
 VOLUME /app/db
 

config.yml → config/local.yml

@@ -2,20 +2,26 @@
 # Configuration for RPGKeeper
 #-----------------------------------------------------------------------------------------------------------------------
 
-overrideAuth: false
-secret: $SESSION_SECRET
-key: 'rpgk_session'
-auth:
-  google:
-    clientID: $CLIENT_ID
-    clientSecret: $CLIENT_SECRET
+# HTTP Server configuration
 http:
-  secure: false,
+  host: '0.0.0.0'
   port: 5678
+  secure: false
+
+# Database
 database:
-  client: 'better-sqlite3'
+  client: "better-sqlite3"
   connection:
-    filename: './db/rpgk.db'
+    filename: "db/rpgk.db"
   useNullAsDefault: true
 
+# Authentication configuration
+auth:
+  session:
+    key: 'rpgk_session'
+    secret: $SESSION_SECRET
+  google:
+    clientID: $CLIENT_ID
+    clientSecret: $CLIENT_SECRET
+
 #-----------------------------------------------------------------------------------------------------------------------

knexfile.ts

@@ -2,63 +2,27 @@
 // Knex Migration configuration
 //----------------------------------------------------------------------------------------------------------------------
 
-require('ts-node/register');
-
-//----------------------------------------------------------------------------------------------------------------------
-
-// This has to be first, for reasons
-import dotenv from 'dotenv';
-
-import knex from 'knex';
+import 'dotenv/config';
 import configUtil from '@strata-js/util-config';
+import type { Knex } from 'knex';
 
-// Managers
-import { getConfig } from './src/server/managers/database';
+import { ServerConfig } from './src/common/interfaces/config';
 
-// ---------------------------------------------------------------------------------------------------------------------
-// Configuration
-// ---------------------------------------------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------------------------------------
 
-dotenv.config();
 const env = (process.env.ENVIRONMENT ?? 'local').toLowerCase();
 configUtil.load(`./config/${ env }.yml`);
 
 //----------------------------------------------------------------------------------------------------------------------
 
-module.exports = async() =>
-{
-    const db = knex(getConfig());
-
-    // When this file is run, it expects the migrations to end in .ts, so accommodate that.
-    await db('knex_migrations')
-        .select()
-        .limit(1)
-        .then(async() =>
-        {
-            await db.update({ name: db.raw('replace(name, \'.js\', \'.ts\')') })
-                .from('knex_migrations');
-        })
-        .catch(async(error) =>
-        {
-            if(error.code !== 'SQLITE_ERROR')
-            {
-                throw error;
-            } // end if
-        });
-
-    return {
-        ...getConfig(),
-        migrations: {
-            directory: './src/server/knex/migrations',
-            extension: 'ts',
-            loadExtensions: [ '.ts' ]
-        },
-        seeds: {
-            directory: './src/server/knex/seeds',
-            loadExtensions: [ '.ts' ]
-        }
-    };
-};
+module.exports = {
+    ...configUtil.get<ServerConfig>().database ?? {},
+    migrations: {
+        directory: './src/server/knex/migrations'
+    },
+    seeds: {
+        directory: './src/server/knex/seeds'
+    }
+} satisfies Knex.Config;
 
 //----------------------------------------------------------------------------------------------------------------------
-