Add config.php at root; include configuration overhaul and then fixes to the installer #156

resources/stubs/installer/config.stub

@@ -0,0 +1,60 @@
+<?php
+/**
+ * This file overrides any of the config files in the /config directory.
+ * The root key is the name of the file, and then the structure within.
+ * The config is merged, so only include what you want to override
+ */
+
+return [
+
+    # overrides app.php
+    'app' => [
+        'name' => '$SITE_NAME$',
+        'url' => '$SITE_URL$',
+
+        # Don't forget to change these when live
+        'env' => 'dev',
+        'debug' => true,
+    ],
+
+    # overrides phpvms.php
+    'phpvms' => [
+        'skin' => 'default',
+        'vacentral_api_key' => '',
+    ],
+
+    # overrides cache.php
+    'cache' => [
+        'default' => '$CACHE_DRIVER$',
+        'prefix' => 'phpvms_',
+    ],
+
+    # overrides database.php
+    'database' => [
+        'default' => '$DB_CONN$',
+        'connections' => [
+            'mysql' => [
+                'host' => '$DB_HOST$',
+                'port' => $DB_PORT$,
+                'database' => '$DB_NAME$',
+                'username' => '$DB_USER$',
+                'password' => '$DB_PASS$',
+                'prefix' => '$DB_PREFIX$',
+            ],
+        ],
+    ],
+
+    # overrides mail.php
+    'mail' => [
+        'driver' => 'smtp',
+        'host' => '',
+        'port' => 587,
+        'from' => [
+            'name' => '',
+            'address' => '',
+        ],
+        'username' => '',
+        'password' => '',
+    ],
+
+];

resources/stubs/installer/env.stub

@@ -0,0 +1,3 @@
+<?php exit(); ?>
+
+APP_KEY=base64:$APP_KEY$

resources/stubs/modules/env.stub

@@ -1,48 +0,0 @@
-<?php exit(); ?>
-
-#
-# Before you go live, remember to change the APP_ENV to production
-# and APP_DEBUG to false. Adjust logging to taste
-#
-
-APP_ENV=$APP_ENV$
-APP_URL=http://localhost
-APP_SKIN=default
-APP_KEY=base64:$APP_KEY$
-APP_DEBUG=true
-APP_LOCALE=en
-APP_ANALYTICS_DISABLED=false
-
-PHPVMS_INSTALLED=true
-PHPVMS_VA_NAME="phpvms"
-VACENTRAL_API_KEY=
-CHECKWX_API_KEY=
-
-APP_LOG=daily
-APP_LOG_LEVEL=debug
-APP_LOG_MAX_FILES=3
-
-DB_CONNECTION=$DB_CONN$
-DB_HOST=$DB_HOST$
-DB_PORT=$DB_PORT$
-DB_DATABASE=$DB_NAME$
-DB_USERNAME=$DB_USER$
-DB_PASSWORD=$DB_PASS$
-DB_EMULATE_PREPARES=$DB_EMULATE_PREPARES$
-DB_PREFIX=
-
-MAIL_DRIVER=smtp
-MAIL_FROM_ADDRESS=no-reply@phpvms.net
-MAIL_FROM_NAME="phpVMS Admin"
-MAIL_HOST=
-MAIL_PORT=
-MAIL_ENCRYPTION=
-MAIL_USERNAME=
-MAIL_PASSWORD=
-
-CACHE_ENABLED=false
-CACHE_DRIVER=$CACHE_DRIVER$
-CACHE_PREFIX=phpvms
-
-SESSION_DRIVER=file
-QUEUE_DRIVER=$QUEUE_DRIVER$