Update deployed state to what's currently running

5 files changed, 7 insertions, 98 deletions

diff --git a/config/database.mysql-sample.yml b/config/database.mysql-sample.yml
deleted file mode 100644
index bdb5311..0000000
--- a/config/database.mysql-sample.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-# MySQL.  Versions 4.1 and 5.0 are recommended.
-#
-# Install the MySQL driver:
-#   gem install mysql
-# On Mac OS X:
-#   sudo gem install mysql -- --with-mysql-dir=/usr/local/mysql
-# On Mac OS X Leopard:
-#   sudo env ARCHFLAGS="-arch i386" gem install mysql -- --with-mysql-config=/usr/local/mysql/bin/mysql_config
-#       This sets the ARCHFLAGS environment variable to your native architecture
-# On Windows:
-#   gem install mysql
-#       Choose the win32 build.
-#       Install MySQL and put its /bin directory on your path.
-#
-# And be sure to use new-style password hashing:
-#   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
-development:
-  adapter: mysql
-  encoding: utf8
-  database: mysql_development
-  pool: 5
-  username: root
-  password:
-  socket: /opt/local/var/run/mysql5/mysqld.sock
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
-  adapter: mysql
-  encoding: utf8
-  database: mysql_test
-  pool: 5
-  username: root
-  password:
-  socket: /opt/local/var/run/mysql5/mysqld.sock
-
-production:
-  adapter: mysql
-  encoding: utf8
-  database: mysql_production
-  pool: 5
-  username: root
-  password: 
-  socket: /opt/local/var/run/mysql5/mysqld.sock
diff --git a/config/database.psql-sample.yml b/config/database.psql-sample.yml
deleted file mode 100644
index db7276e..0000000
--- a/config/database.psql-sample.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-# PostgreSQL. Versions 7.4 and 8.x are supported.
-#
-# Install the ruby-postgres driver:
-#   gem install ruby-postgres
-# On Mac OS X:
-#   gem install ruby-postgres -- --include=/usr/local/pgsql
-# On Windows:
-#   gem install ruby-postgres
-#       Choose the win32 build.
-#       Install PostgreSQL and put its /bin directory on your path.
-development:
-  adapter: postgresql
-  encoding: unicode
-  database: psql_development
-  pool: 5
-  username: psql
-  password:
-
-  # Connect on a TCP socket. Omitted by default since the client uses a
-  # domain socket that doesn't need configuration. Windows does not have
-  # domain sockets, so uncomment these lines.
-  #host: localhost
-  #port: 5432
-
-  # Schema search path. The server defaults to $user,public
-  #schema_search_path: myapp,sharedapp,public
-
-  # Minimum log levels, in increasing order:
-  #   debug5, debug4, debug3, debug2, debug1,
-  #   log, notice, warning, error, fatal, and panic
-  # The server defaults to notice.
-  #min_messages: warning
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
-  adapter: postgresql
-  encoding: unicode
-  database: psql_test
-  pool: 5
-  username: psql
-  password:
-
-production:
-  adapter: postgresql
-  encoding: unicode
-  database: psql_production
-  pool: 5
-  username: psql
-  password:
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 3195745..1768ab7 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -9,7 +9,7 @@ config.action_controller.consider_all_requests_local = false
 config.action_controller.perform_caching             = true
 
 # See everything in the log (default is :info)
-# config.log_level = :debug
+config.log_level = :info
 
 # Use a different logger for distributed setups
 # config.logger = SyslogLogger.new
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 2663948..fca8c11 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -24,6 +24,7 @@ de:
     formats:
       default: "%A, %e. %B %Y, %H:%M Uhr"
       short: "%e. %B, %H:%M Uhr"
+      ccc: "%e. %B %Y, %H:%M Uhr"
       long: "%A, %e. %B %Y, %H:%M Uhr"
       time: "%H:%M"
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 81fa48e..2458d4d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -7,4 +7,8 @@ en:
   sponsors: sponsors
   hello: "Hello world"
   show_tag_headline: "Pages tagged with:"
-  old_ccc_de: the old ccc.de
\ No newline at end of file
+  old_ccc_de: the old ccc.de
+
+  time:
+    formats:
+      ccc: "%d %B, %Y %H:%M"