Refactor config/ directory

* Get rid of early pathname requirement
* Use require_relative where approciate
* Drop unused files
* Imported new application.rb, environment.rb and environments/* from fresh Rails app
* Cleaned up boot.rb
* Load config in boot.rb
* Deduplicate environments/integration*.rb
* Move username blacklist into defaults.yml
* Ruby 1.9 Hash syntax everywhere
* Reorganize lib/diaspora/markdownify to match conventions
* Get rid of full path requires where possible
* Add dummy content to production section diaspora.yml.example to prevent warning
* Drop sqlite? method
* Move postgres? method into ConfigurationMethods
* Drop token authentication from User

1 files changed, 20 insertions, 5 deletions

diff --git a/config/defaults.yml b/config/defaults.yml
index d4b0ecde9..4c7ec4817 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -17,7 +17,7 @@ defaults:
       concurrency: 5
       retry: 10
       backtrace: 15
-      log: "log/sidekiq.log"
+      log: 'log/sidekiq.log'
     s3:
       enable: false
       key:
@@ -50,7 +50,7 @@ defaults:
     mixpanel_uid:
     chartbeat_uid:
   settings:
-    pod_name: "Diaspora*"
+    pod_name: 'Diaspora*'
     enable_registrations: true
     follow_diasporahq: true
     invitations:
@@ -61,6 +61,21 @@ defaults:
       enable: false
       suggest_email:
     typhoeus_verbose: false
+    username_blacklist:
+      - 'admin'
+      - 'administrator'
+      - 'hostmaster'
+      - 'info'
+      - 'postmaster'
+      - 'root'
+      - 'ssladmin'
+      - 'ssladministrator'
+      - 'sslwebmaster'
+      - 'sysadmin'
+      - 'webmaster'
+      - 'support'
+      - 'contact'
+      - 'example_user1dsioaioedfhgoiesajdigtoearogjaidofgjo'
   services:
     facebook:
       enable: false
@@ -109,7 +124,7 @@ production:
   i_am_a_dummy: # Remove if you add an actual override
 test:
   environment:
-    url: "http://localhost:9887/"
+    url: 'http://localhost:9887/'
     single_process_mode: true
     require_ssl: false
     assets:
@@ -127,14 +142,14 @@ test:
     enable: true
 integration1:
   environment:
-    url: "http://localhost:45789/"
+    url: 'http://localhost:45789/'
     single_process_mode: true
     assets:
       serve: true
     require_ssl: false
 integration2:
   environment:
-    url: "http://localhost:34658/"
+    url: 'http://localhost:34658/'
     single_process_mode: true
     assets:
       serve: true