reverted to rails 1.1.6 since there were problems reported
This commit is contained in:
parent
1877f66f17
commit
7378ce9610
|
@ -1,31 +1,38 @@
|
||||||
development:
|
|
||||||
adapter: mysql
|
|
||||||
host: localhost
|
|
||||||
socket: /var/run/mysqld/mysqld.sock
|
|
||||||
database: instiki_dev
|
|
||||||
username: root
|
|
||||||
password:
|
|
||||||
|
|
||||||
test:
|
|
||||||
adapter: mysql
|
|
||||||
host: localhost
|
|
||||||
socket: /var/run/mysqld/mysqld.sock
|
|
||||||
database: instiki_test
|
|
||||||
username: root
|
|
||||||
password:
|
|
||||||
|
|
||||||
# "Out of the box", Instiki stores it's data in sqlite3 database. Other options are listed below.
|
# "Out of the box", Instiki stores it's data in sqlite3 database. Other options are listed below.
|
||||||
|
|
||||||
|
development:
|
||||||
|
adapter: sqlite3
|
||||||
|
database: db/development.db.sqlite3
|
||||||
|
|
||||||
|
test:
|
||||||
|
adapter: sqlite3
|
||||||
|
database: db/test.db.sqlite3
|
||||||
|
|
||||||
production:
|
production:
|
||||||
adapter: sqlite3
|
adapter: sqlite3
|
||||||
database: db/production.db.sqlite3
|
database: db/production.db.sqlite3
|
||||||
|
|
||||||
# MySQL (default setup). Versions 4.1 and 5.0 are recommended.
|
# MySQL (default setup). Versions 4.1 and 5.0 are recommended.
|
||||||
#
|
#
|
||||||
|
# Install the MySQL driver:
|
||||||
|
# gem install mysql
|
||||||
|
# On MacOS X:
|
||||||
|
# gem install mysql -- --include=/usr/local/lib
|
||||||
|
# On Windows:
|
||||||
|
# There is no gem for Windows. Install mysql.so from RubyForApache.
|
||||||
|
# http://rubyforge.org/projects/rubyforapache
|
||||||
|
#
|
||||||
|
# And be sure to use new-style password hashing:
|
||||||
|
# http://dev.mysql.com/doc/refman/5.0/en/old-client.html
|
||||||
|
|
||||||
|
|
||||||
# Get the fast C bindings:
|
# Get the fast C bindings:
|
||||||
# gem install mysql
|
# gem install mysql
|
||||||
# (on OS X: gem install mysql -- --include=/usr/local/lib)
|
# (on OS X: gem install mysql -- --include=/usr/local/lib)
|
||||||
# And be sure to use new-style password hashing:
|
# And be sure to use new-style password hashing:
|
||||||
# http://dev.mysql.com/doc/refman/5.0/en/old-client.html
|
# http://dev.mysql.com/doc/refman/5.0/en/old-client.html
|
||||||
|
|
||||||
mysql_example:
|
mysql_example:
|
||||||
adapter: mysql
|
adapter: mysql
|
||||||
database: instiki_development
|
database: instiki_development
|
||||||
|
@ -33,10 +40,10 @@ mysql_example:
|
||||||
password:
|
password:
|
||||||
socket: /path/to/your/mysql.sock
|
socket: /path/to/your/mysql.sock
|
||||||
|
|
||||||
# Connect on a TCP socket. If omitted, the adapter will connect on the
|
# Connect on a TCP socket. If omitted, the adapter will connect on the
|
||||||
# domain socket given by socket instead.
|
# domain socket given by socket instead.
|
||||||
#host: localhost
|
#host: localhost
|
||||||
#port: 3306
|
#port: 3306
|
||||||
|
|
||||||
# Warning: The database defined as 'test' will be erased and
|
# Warning: The database defined as 'test' will be erased and
|
||||||
# re-generated from your development database when you run 'rake'.
|
# re-generated from your development database when you run 'rake'.
|
||||||
|
@ -48,12 +55,13 @@ mysql_example:
|
||||||
password:
|
password:
|
||||||
socket: /path/to/your/mysql.sock
|
socket: /path/to/your/mysql.sock
|
||||||
|
|
||||||
# PostgreSQL versions 7.4 - 8.1
|
# PostgreSQL versions 7.4 - 8.2
|
||||||
#
|
#
|
||||||
# Get the C bindings:
|
# Get the C bindings:
|
||||||
# gem install postgres
|
# gem install postgres
|
||||||
# or use the pure-Ruby bindings on Windows:
|
# or use the pure-Ruby bindings (the only know way on Windows):
|
||||||
# gem install postgres-pr
|
# gem install postgres-pr
|
||||||
|
|
||||||
postgresql_example:
|
postgresql_example:
|
||||||
adapter: postgresql
|
adapter: postgresql
|
||||||
database: instiki_development
|
database: instiki_development
|
||||||
|
|
|
@ -11,7 +11,7 @@ Rails::Initializer.run do |config|
|
||||||
|
|
||||||
# Enable page/fragment caching by setting a file-based store
|
# Enable page/fragment caching by setting a file-based store
|
||||||
# (remember to create the caching directory and make it readable to the application)
|
# (remember to create the caching directory and make it readable to the application)
|
||||||
config.action_controller.fragment_cache_store = :file_store, "#{RAILS_ROOT}/cache"
|
#config.action_controller.fragment_cache_store = :file_store, "#{RAILS_ROOT}/cache"
|
||||||
|
|
||||||
# Activate observers that should always be running
|
# Activate observers that should always be running
|
||||||
config.active_record.observers = :page_observer
|
config.active_record.observers = :page_observer
|
||||||
|
|
Loading…
Reference in a new issue