Fix things

.gitignore

@@ -1 +1 @@
-config/config_override.inc.php
+config/config.inc.php

config/config.inc.php

@@ -1,80 +0,0 @@
-<?php
-
-/*
- * MySQL server and database settings
- */
-
-define("MYSQL_HOST", "localhost");
-define("MYSQL_USER", "vmail");
-define("MYSQL_PASSWORD", "vmail");
-define("MYSQL_DATABASE", "vmail");
-
-
-/*
- * Database table names
- */
-
-// Table names
-define("DBT_USERS", "users");
-define("DBT_DOMAINS", "domains");
-define("DBT_ALIASES", "aliases");
-
-// Users table columns
-define("DBC_USERS_ID", "id");
-define("DBC_USERS_USERNAME", "username");
-define("DBC_USERS_DOMAIN", "domain");
-define("DBC_USERS_PASSWORD", "password");
-// define("DBC_USERS_MAILBOXLIMIT", "mailbox_limit");		// (Optional)
-
-// Domains table columns
-define("DBC_DOMAINS_ID", "id");
-define("DBC_DOMAINS_DOMAIN", "domain");
-
-// Aliases table columns
-define("DBC_ALIASES_ID", "id");
-define("DBC_ALIASES_SOURCE", "source");
-define("DBC_ALIASES_DESTINATION", "destination");
-
-
-/*
- * Frontend paths
- */
-
-define("FRONTEND_BASE_PATH", "http://webmum.localhost.local/");
-define("SUBDIR", "");
-
-
-/*
- * Admin e-mail address
- */
-
-$admins = array("serveradmin@trashserver.net", "thomas@trashserver.net");
-
-/*
- * Minimal password length
- */
-
-define("MIN_PASS_LENGTH", 8);
-
-/*
- * Write log file? Failed login attempts will be written to the logfile.
- * You can mointor the logfile with fail2ban and ban attackers' IP-addresses.
- * Make sure that PHP has permission to create the log directory and webmum.log (write permissions for php user)
- *
- * Default: Do not write logfile
- */
-
-// define("WRITE_LOG", true);
-// define("WRITE_LOG_PATH","/srv/http/webmum/webmum/log/");
-
-
-
-/*
- * Frontend options
- */
-
-// Separator for email lists
-define("FRONTEND_EMAIL_SEPARATOR_TEXT", ', '); // possible values: ', ' (default), '; ', PHP_EOL (newline)
-define("FRONTEND_EMAIL_SEPARATOR_FORM", ','); // possible values: ',' (default), ';', PHP_EOL (newline)
-
-?>

include/php/default.inc.php

@@ -1,11 +1,11 @@
 <?php
 
 // Include config
-if(file_exists('config/config_override.inc.php')){
-	require_once 'config/config_override.inc.php';
+if(file_exists('config/config.inc.php')){
+	require_once 'config/config.inc.php';
 }
 else{
-	require_once 'config/config.inc.php';
+	require_once 'config/config.inc.php.example';
 }