diff config/.svn/text-base/configuration.yml.example.svn-base @ 245:051f544170fe

* Update to SVN trunk revision 4993

--- a/config/.svn/text-base/configuration.yml.example.svn-base	Thu Mar 03 11:40:10 2011 +0000
+++ b/config/.svn/text-base/configuration.yml.example.svn-base	Thu Mar 03 11:42:28 2011 +0000
@@ -110,12 +110,33 @@
   # Configuration of SCM executable command.
   # Absolute path (e.g. /usr/local/bin/hg) or command name (e.g. hg.exe, bzr.exe)
   # On Windows, *.cmd, *.bat (e.g. hg.cmd, bzr.bat) does not work.
-  scm_subversion_command: svn                                       # (default: svn)
-  scm_mercurial_command:  "\"C:\Program Files\TortoiseHg\hg.exe\""  # (default: hg)
-  scm_git_command:        /usr/local/bin/git                        # (default: git)
-  scm_cvs_command:        cvs                                       # (default: cvs)
-  scm_bazaar_command:     bzr.exe                                   # (default: bzr)
-  scm_darcs_command:      darcs-1.0.9-i386-linux                    # (default: darcs)
+  # Examples:
+  # scm_subversion_command: svn                                       # (default: svn)
+  # scm_mercurial_command:  C:\Program Files\TortoiseHg\hg.exe        # (default: hg)
+  # scm_git_command:        /usr/local/bin/git                        # (default: git)
+  # scm_cvs_command:        cvs                                       # (default: cvs)
+  # scm_bazaar_command:     bzr.exe                                   # (default: bzr)
+  # scm_darcs_command:      darcs-1.0.9-i386-linux                    # (default: darcs)
+  scm_subversion_command:
+  scm_mercurial_command:
+  scm_git_command:
+  scm_cvs_command:
+  scm_bazaar_command:
+  scm_darcs_command:
+  
+  # Key used to encrypt sensitive data in the database (SCM and LDAP passwords).
+  # If you don't want to enable data encryption, just leave it blank.
+  # WARNING: losing/changing this key will make encrypted data unreadable.
+  #
+  # If you want to encrypt existing passwords in your database:
+  # * set the cipher key here in your configuration file
+  # * encrypt data using 'rake db:encrypt RAILS_ENV=production'
+  #
+  # If you have encrypted data and want to change this key, you have to:
+  # * decrypt data using 'rake db:decrypt RAILS_ENV=production' first
+  # * change the cipher key here in your configuration file
+  # * encrypt data using 'rake db:encrypt RAILS_ENV=production'
+  database_cipher_key: 
   
 # specific configuration options for production environment
 # that overrides the default ones