From ca90ec30fb0f4e862c4f873e0b7def9810a7cffe Mon Sep 17 00:00:00 2001
From: Henrik Hautakoski <henrik.hautakoski@gmail.com>
Date: Mon, 18 Jun 2018 20:23:50 +0200
Subject: [PATCH] config: drop the "conf" prefix for config files.

---
 .gitignore                                             | 1 +
 app/config/{conf.app.yml => app.yml}                   | 0
 app/config/{conf.local.sample.yml => local.sample.yml} | 0
 app/library/Services.php                               | 4 ++--
 4 files changed, 3 insertions(+), 2 deletions(-)
 rename app/config/{conf.app.yml => app.yml} (100%)
 rename app/config/{conf.local.sample.yml => local.sample.yml} (100%)

diff --git a/.gitignore b/.gitignore
index 6019872..2a486fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ node_modules/
 
 cache/
 app/config/conf.local.yml
+app/config/local.yml
 
 # Ignore transpiled files
 
diff --git a/app/config/conf.app.yml b/app/config/app.yml
similarity index 100%
rename from app/config/conf.app.yml
rename to app/config/app.yml
diff --git a/app/config/conf.local.sample.yml b/app/config/local.sample.yml
similarity index 100%
rename from app/config/conf.local.sample.yml
rename to app/config/local.sample.yml
diff --git a/app/library/Services.php b/app/library/Services.php
index 60da7ba..b3aa7ab 100644
--- a/app/library/Services.php
+++ b/app/library/Services.php
@@ -65,8 +65,8 @@ class Services extends DiDefault
         // The priority is files defined AFTER another
         // will override settings if there a multiple keys.
         $files = array(
-            'conf.app.yml',
-            'conf.local.yml'
+            'app.yml',
+            'local.yml'
         );
 
         $basePath = APP_PATH . '/app/config/';