rubber 1.15.0 → 2.0.0.pre1

data/{lib/generators/vulcanize/templates → templates}/passenger_nginx/config/rubber/role/passenger_nginx/nginx.conf

@@ -53,8 +53,8 @@ http
 	passenger_pool_idle_time 0;
 	rails_framework_spawner_idle_time 0;
 	rails_app_spawner_idle_time 0;
-  rails_env <%= RUBBER_ENV %>;
-	passenger_friendly_error_pages <%= RUBBER_ENV == 'production' ? 'off' : 'on' %>;
+  rails_env <%= Rubber.env %>;
+	passenger_friendly_error_pages <%= Rubber.env == 'production' ? 'off' : 'on' %>;
 	
 	passenger_user <%= rubber_env.app_user %>;
 	

data/{generators/vulcanize/templates → templates}/passenger_nginx/config/rubber/role/passenger_nginx/passenger_nginx.conf

@@ -10,8 +10,8 @@
 
 
     <% if rubber_env.use_ssl_key %>
-    ssl_certificate <%= RUBBER_ROOT %>/config/<%= rubber_env.domain %>.crt;
-    ssl_certificate_key <%= RUBBER_ROOT %>/config/<%= rubber_env.domain %>.key;
+    ssl_certificate <%= Rubber.root %>/config/<%= rubber_env.domain %>.crt;
+    ssl_certificate_key <%= Rubber.root %>/config/<%= rubber_env.domain %>.key;
     <% else %>
     ssl_certificate  /etc/ssl/certs/ssl-cert-snakeoil.pem;
     ssl_certificate_key  /etc/ssl/private/ssl-cert-snakeoil.key;

data/{generators/vulcanize/templates → templates}/passenger_nginx/config/rubber/role/web_tools/nginx-tools.conf

@@ -20,13 +20,16 @@ server
   server_name <%= rubber_env.full_host %>;
 
   ssl                  on;
-  ssl_certificate    /etc/ssl/certs/ssl-cert-snakeoil.pem;
-  ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key;
-  # ssl_certificate      <%= RUBBER_ROOT %>/config/snapmylife.com.crt;
-  # ssl_certificate_key  <%= RUBBER_ROOT %>/config/snapmylife.com.key;
+  <% if rubber_env.use_ssl_key %>
+    ssl_certificate <%= Rubber.root %>/config/<%= rubber_env.domain %>.crt;
+    ssl_certificate_key <%= Rubber.root %>/config/<%= rubber_env.domain %>.key;
+  <% else %>
+    ssl_certificate  /etc/ssl/certs/ssl-cert-snakeoil.pem;
+    ssl_certificate_key  /etc/ssl/private/ssl-cert-snakeoil.key;
+  <% end %>  
 
   auth_basic            "Rubber Admin Tools";
-  auth_basic_user_file  <%= RUBBER_ROOT %>/config/<%= rubber_env.app_name %>.auth;
+  auth_basic_user_file  <%= Rubber.root %>/config/<%= rubber_env.app_name %>.auth;
 
   client_max_body_size 10M;
   root /var/www;

data/{lib/generators/vulcanize/templates → templates}/passenger_nginx/config/rubber/role/web_tools/tools-index.html

@@ -11,7 +11,9 @@
 		<h1>Rubber Admin Tools</h1>
 		<ul>
 
-      <li><a href="/munin/">Munin</a></li>
+      <% if File.exist?("/var/www/munin") %>
+        <li><a href="/munin/">Munin</a></li>
+      <% end %>
 
       <% if cruise_host = rubber_instances.for_role('cruise').first %>
         <li><a href="http://<%= cruise_host %>/cruise/">CruiseControl</a></li>
@@ -29,6 +31,10 @@
           <li><a href="/resque/">Resque</a></li>
       <% end %>
 
+      <% if graphite_host = rubber_instances.for_role('graphite_web').first %>
+          <li><a href="/graphite/">Graphite</a></li>
+      <% end %>
+
 		</ul>
 	</body>
 </html>

data/{generators/vulcanize/templates → templates}/passenger_nginx/config/rubber/role/web_tools/tools-nginx.auth

@@ -1,5 +1,5 @@
 <%
-  @path = "#{RUBBER_ROOT}/config/#{rubber_env.app_name}.auth"
+  @path = "#{Rubber.root}/config/#{rubber_env.app_name}.auth"
   user = rubber_env.web_tools_user || 'admin'
   pass = rubber_env.web_tools_password || rand(1000000000).to_s
 %>

data/{lib/generators/vulcanize/templates → templates}/passenger_nginx/config/rubber/rubber-passenger_nginx.yml

@@ -10,7 +10,7 @@ max_app_connections: 20
 use_ssl_key: false
 #if you use an ssl key, put your cert and key
 # in
-# #{RUBBER_ROOT}/config/#{rubber_env.domain} .crt and .key
+# #{Rubber.root}/config/#{rubber_env.domain} .crt and .key
 #otherwise defaults to key included with linux 
 
 

data/{lib/generators/vulcanize/templates → templates}/postgresql/config/rubber/common/database.yml

@@ -1,8 +1,8 @@
 <%
-  @path = "#{RUBBER_ROOT}/config/database.yml"
+  @path = "#{Rubber.root}/config/database.yml"
 %>
 
-<%= RUBBER_ENV %>:
+<%= Rubber.env %>:
   adapter: postgresql
   encoding: unicode
   database: <%= rubber_env.db_name %>

data/{lib/generators/vulcanize/templates → templates}/postgresql/config/rubber/deploy-postgresql.rb

@@ -8,7 +8,14 @@ namespace :rubber do
     before "rubber:install_packages", "rubber:postgresql:setup_apt_sources"
 
     task :setup_apt_sources do
-      rsudo "add-apt-repository ppa:pitti/postgresql"
+      rubber.sudo_script 'configure_postgresql_repository', <<-ENDSCRIPT
+        # PostgreSQL 9.1 is the default starting in Ubuntu 11.10.
+        release=`lsb_release -sr`
+        needs_repo=`echo "$release < 11.10" | bc`
+        if [[ $needs_repo == 1 ]]; then
+          add-apt-repository ppa:pitti/postgresql
+        fi
+      ENDSCRIPT
     end
     
     after "rubber:create", "rubber:postgresql:validate_db_roles"
@@ -23,7 +30,6 @@ namespace :rubber do
     end
 
     after "rubber:bootstrap", "rubber:postgresql:bootstrap"
-  
     
     # Bootstrap the production database config.  Db bootstrap is special - the
     # user could be requiring the rails env inside some of their config
@@ -32,7 +38,7 @@ namespace :rubber do
     task :bootstrap, :roles => [:postgresql_master, :postgresql_slave] do
       
       # Conditionally bootstrap for each node/role only if that node has not
-      # been boostrapped for that role before
+      # been bootstrapped for that role before
       master_instances = rubber_instances.for_role("postgresql_master") & rubber_instances.filtered  
       master_instances.each do |ic|
         task_name = "_bootstrap_postgresql_master_#{ic.full_name}".to_sym()
@@ -40,17 +46,21 @@ namespace :rubber do
           env = rubber_cfg.environment.bind("postgresql_master", ic.name)
           exists = capture("echo $(ls #{env.postgresql_data_dir}/ 2> /dev/null)")
           if exists.strip.size == 0
-            common_bootstrap("postgresql_master")
+            common_bootstrap
             sudo "/usr/lib/postgresql/#{rubber_env.postgresql_ver}/bin/initdb -D #{rubber_env.postgresql_data_dir}", :as => 'postgres'
             sudo "#{rubber_env.postgresql_ctl} start"
             sleep 5
 
             create_user_cmd = "CREATE USER #{env.db_user} WITH NOSUPERUSER CREATEDB NOCREATEROLE"
             create_user_cmd << "PASSWORD '#{env.db_pass}'" if env.db_pass
+
+            create_replication_user_cmd = "CREATE USER #{env.db_replication_user} WITH NOSUPERUSER NOCREATEROLE REPLICATION"
+            create_replication_user_cmd << "PASSWORD '#{env.db_replication_pass}'" if env.db_replication_pass
+
             rubber.sudo_script "create_master_db", <<-ENDSCRIPT
               sudo -u postgres psql -c "#{create_user_cmd}"
+              sudo -u postgres psql -c "#{create_replication_user_cmd}"
               sudo -u postgres psql -c "CREATE DATABASE #{env.db_name} WITH OWNER #{env.db_user}"
-              sudo -u postgres createlang plpythonu #{env.db_name}
             ENDSCRIPT
           end
         end
@@ -64,26 +74,16 @@ namespace :rubber do
           env = rubber_cfg.environment.bind("postgresql_slave", ic.name)
           exists = capture("echo $(ls #{env.postgresql_data_dir}/ 2> /dev/null)")
           if exists.strip.size == 0
-            common_bootstrap("postgresql_slave")
-
-            source = master = rubber_instances.for_role("postgresql_master").first
+            common_bootstrap
+            master = rubber_instances.for_role("postgresql_master").first
 
-            slave_pub_key = capture("cat /root/.ssh/id_dsa.pub")
-            sudo "echo \"#{slave_pub_key}\" >> /root/.ssh/authorized_keys", :hosts => [master.full_name]
-
-            base_backup_script = <<-ENDSCRIPT
-              sudo -u postgres psql -c "SELECT pg_start_backup('rubber_create_slave')";
-              rsync -a #{env.postgresql_data_dir}/* #{ic.full_name}:#{env.postgresql_data_dir}/ --exclude postmaster.pid --exclude recovery.* --exclude trigger_file;
-              sudo -u postgres psql -c "SELECT pg_stop_backup()"
-            ENDSCRIPT
-
-            sudo base_backup_script, :hosts => [master.full_name]
+            rsudo "/usr/lib/postgresql/#{env.postgresql_ver}/bin/pg_basebackup -D #{env.postgresql_data_dir} -U #{env.db_replication_user} -h #{master.full_name}", :as => 'postgres'
 
             # Gen just the slave-specific conf.
-            rubber.run_config(:RUBBER_ENV => RUBBER_ENV, :FILE => "role/postgresql_slave/", :FORCE => true, :deploy_path => release_path)
+            rubber.run_config(:file => "role/postgresql_slave/", :force => true, :deploy_path => release_path)
 
             # Start up the server.
-            sudo "#{rubber_env.postgresql_ctl} start"
+            rsudo "#{rubber_env.postgresql_ctl} start"
             sleep 5
           end
         end
@@ -92,29 +92,8 @@ namespace :rubber do
       end
     end
 
-    after "rubber:munin:custom_install", "rubber:postgresql:install_munin_plugins"
-    after "rubber:postgresql:install_munin_plugins", "rubber:munin:restart"
-    task :install_munin_plugins, :roles => [:postgresql_master, :postgresql_slave] do
-      regular_plugins = %w[bgwriter checkpoints connections_db users xlog]
-      parameterized_plugins = %w[cache connections locks querylength scans transactions tuples]
-
-      commands = ['rm -f /etc/munin/plugins/postgres_*']
-
-      regular_plugins.each do |name|
-        commands << "ln -s /usr/share/munin/plugins/postgres_#{name} /etc/munin/plugins/postgres_#{name}"
-      end
-
-      parameterized_plugins.each do |name|
-        commands << "ln -s /usr/share/munin/plugins/postgres_#{name}_ /etc/munin/plugins/postgres_#{name}_#{rubber_env.db_name}"
-      end
-
-      rubber.sudo_script "install_postgresql_munin_plugins", <<-ENDSCRIPT
-        #{commands.join(';')}
-      ENDSCRIPT
-    end
-  
     # TODO: Make the setup/update happen just once per host
-    def common_bootstrap(role)
+    def common_bootstrap
       # postgresql package install starts postgresql, so stop it
       rsudo "#{rubber_env.postgresql_ctl} stop" rescue nil
       
@@ -123,7 +102,7 @@ namespace :rubber do
       rubber.update_code_for_bootstrap
 
       # Gen just the conf for the given postgresql role
-      rubber.run_config(:RUBBER_ENV => RUBBER_ENV, :FILE => "role/#{role}|role/db/", :FORCE => true, :deploy_path => release_path)
+      rubber.run_config(:file => "role/db/", :force => true, :deploy_path => release_path)
 
       # reconfigure postgresql so that it sets up data dir in /mnt with correct files
       dirs = [rubber_env.postgresql_data_dir, rubber_env.postgresql_archive_dir]
@@ -133,7 +112,7 @@ namespace :rubber do
         chmod 700 #{rubber_env.postgresql_data_dir}
       ENDSCRIPT
     end
-    
+
     desc <<-DESC
       Starts the postgresql daemons
     DESC
@@ -145,16 +124,17 @@ namespace :rubber do
       Stops the postgresql daemons
     DESC
     task :stop, :roles => [:postgresql_master, :postgresql_slave] do
-      rsudo "#{rubber_env.postgresql_ctl} stop"
+      rsudo "#{rubber_env.postgresql_ctl} stop || true"
     end
   
     desc <<-DESC
       Restarts the postgresql daemons
     DESC
     task :restart, :roles => [:postgresql_master, :postgresql_slave] do
-      rsudo "#{rubber_env.postgresql_ctl} restart"
+      stop
+      start
     end
 
   end
 
-end
+end

data/{generators/vulcanize/templates → templates}/postgresql/config/rubber/role/db/crontab

@@ -10,5 +10,7 @@
   backup_db_host ||= rubber_instances.for_role('db', 'primary' => true).first
   if backup_db_host.name == rubber_env.host
 %>
-0 */3 * * * BACKUP_DIR=/mnt/db_backups DBUSER=<%= rubber_env.db_user %> DBPASS=<%= rubber_env.db_pass %> DBNAME=<%= rubber_env.db_name %> DBHOST=<%= backup_db_host.full_name %> <%= RUBBER_ROOT %>/script/cron-rake rubber:backup_db
+
+0 */3 * * * <%= Rubber.root %>/script/rubber cron --task util:backup_db --directory=/mnt/db_backups --dbuser=<%= rubber_env.db_user %> --dbpass=<%= rubber_env.db_pass %> --dbname=<%= rubber_env.db_name %> --dbhost=<%= backup_db_host.full_name %>
+
 <% end %>

data/templates/postgresql/config/rubber/role/db/pg_hba.conf

@@ -0,0 +1,98 @@
+<%
+  @path = "#{rubber_env.postgresql_conf_dir}/pg_hba.conf"
+%>
+# PostgreSQL Client Authentication Configuration File
+# ===================================================
+#
+# Refer to the "Client Authentication" section in the PostgreSQL
+# documentation for a complete description of this file.  A short
+# synopsis follows.
+#
+# This file controls: which hosts are allowed to connect, how clients
+# are authenticated, which PostgreSQL user names they can use, which
+# databases they can access.  Records take one of these forms:
+#
+# local      DATABASE  USER  METHOD  [OPTIONS]
+# host       DATABASE  USER  ADDRESS  METHOD  [OPTIONS]
+# hostssl    DATABASE  USER  ADDRESS  METHOD  [OPTIONS]
+# hostnossl  DATABASE  USER  ADDRESS  METHOD  [OPTIONS]
+#
+# (The uppercase items must be replaced by actual values.)
+#
+# The first field is the connection type: "local" is a Unix-domain
+# socket, "host" is either a plain or SSL-encrypted TCP/IP socket,
+# "hostssl" is an SSL-encrypted TCP/IP socket, and "hostnossl" is a
+# plain TCP/IP socket.
+#
+# DATABASE can be "all", "sameuser", "samerole", "replication", a
+# database name, or a comma-separated list thereof. The "all"
+# keyword does not match "replication". Access to replication
+# must be enabled in a separate record (see example below).
+#
+# USER can be "all", a user name, a group name prefixed with "+", or a
+# comma-separated list thereof.  In both the DATABASE and USER fields
+# you can also write a file name prefixed with "@" to include names
+# from a separate file.
+#
+# ADDRESS specifies the set of hosts the record matches.  It can be a
+# host name, or it is made up of an IP address and a CIDR mask that is
+# an integer (between 0 and 32 (IPv4) or 128 (IPv6) inclusive) that
+# specifies the number of significant bits in the mask.  A host name
+# that starts with a dot (.) matches a suffix of the actual host name.
+# Alternatively, you can write an IP address and netmask in separate
+# columns to specify the set of hosts.  Instead of a CIDR-address, you
+# can write "samehost" to match any of the server's own IP addresses,
+# or "samenet" to match any address in any subnet that the server is
+# directly connected to.
+#
+# METHOD can be "trust", "reject", "md5", "password", "gss", "sspi",
+# "krb5", "ident", "peer", "pam", "ldap", "radius" or "cert".  Note that
+# "password" sends passwords in clear text; "md5" is preferred since
+# it sends encrypted passwords.
+#
+# OPTIONS are a set of options for the authentication in the format
+# NAME=VALUE.  The available options depend on the different
+# authentication methods -- refer to the "Client Authentication"
+# section in the documentation for a list of which options are
+# available for which authentication methods.
+#
+# Database and user names containing spaces, commas, quotes and other
+# special characters must be quoted.  Quoting one of the keywords
+# "all", "sameuser", "samerole" or "replication" makes the name lose
+# its special character, and just match a database or username with
+# that name.
+#
+# This file is read on server startup and when the postmaster receives
+# a SIGHUP signal.  If you edit the file on a running system, you have
+# to SIGHUP the postmaster for the changes to take effect.  You can
+# use "pg_ctl reload" to do that.
+
+# Put your actual configuration here
+# ----------------------------------
+#
+# If you want to allow non-local connections, you need to add more
+# "host" records.  In that case you will also need to make PostgreSQL
+# listen on a non-local interface via the listen_addresses
+# configuration parameter, or via the -i or -h command line switches.
+
+
+
+
+# DO NOT DISABLE!
+# If you change this first entry you will need to make sure that the
+# database superuser can access the database using some other method.
+# Noninteractive access to all databases is required during automatic
+# maintenance (custom daily cronjobs, replication, and similar tasks).
+#
+# Database administrative login by Unix domain socket
+local   all             postgres                                ident
+
+# TYPE  DATABASE    USER        CIDR-ADDRESS          METHOD
+<%
+  scheme = rubber_env.db_pass ? 'md5' : 'trust'
+%>
+local   all         <%= rubber_env.db_user %>                 <%= scheme %>
+host    all         all                         127.0.0.1/32  <%= scheme %>
+host    all         all                         ::1/128       <%= scheme %>
+host    replication <%= rubber_env.db_replication_user %> 10.0.0.1/8    <%= scheme %>
+host    all         <%= rubber_env.db_user %>   10.0.0.1/8    <%= scheme %>

data/{lib/generators/vulcanize/templates → templates}/postgresql/config/rubber/role/db/postgresql.conf

@@ -156,16 +156,16 @@ shared_buffers = 384MB			# min 128kB
 wal_level = hot_standby			# minimal, archive, or hot_standby
 					# (change requires restart)
 #fsync = on				# turns forced synchronization on or off
-#synchronous_commit = on		# immediate fsync at commit
+#synchronous_commit = on		# synchronization level; on, off, or local
 #wal_sync_method = fsync		# the default is the first option
 					# supported by the operating system:
 					#   open_datasync
-					#   fdatasync
+					#   fdatasync (default on Linux)
 					#   fsync
 					#   fsync_writethrough
 					#   open_sync
 #full_page_writes = on			# recover from partial page writes
-#wal_buffers = 64kB			# min 32kB
+#wal_buffers = -1			# min 32kB, -1 sets based on shared_buffers
 					# (change requires restart)
 #wal_writer_delay = 200ms		# 1-10000 milliseconds
 
@@ -190,10 +190,17 @@ wal_level = hot_standby			# minimal, archive, or hot_standby
 <%- if rubber_instances[rubber_env.host].role_names.include?('postgresql_master') %>
 # - Streaming Replication -
 
-# Set the maximum number of concurrent connections from the standby servers.
+#------------------------------------------------------------------------------
+# REPLICATION
+#------------------------------------------------------------------------------
+
+# - Master Server -
+
+# These settings are ignored on a standby server
+
 max_wal_senders = 5		# max number of walsender processes
 				# (change requires restart)
-#wal_sender_delay = 200ms	# walsender cycle time, 1-10000 milliseconds
+#wal_sender_delay = 1s		# walsender cycle time, 1-10000 milliseconds
 
 # To prevent the primary server from removing the WAL segments required for
 # the standby server before shipping them, set the minimum number of segments
@@ -202,24 +209,36 @@ max_wal_senders = 5		# max number of walsender processes
 # online-backup and the startup of streaming replication. If you enable WAL
 # archiving to an archive directory accessible from the standby, this may
 # not be necessary.
-wal_keep_segments = 128		# in logfile segments, 16MB each -- 128 = 2GB; 0 disables
+wal_keep_segments = 128		# in logfile segments, 16MB each; 0 disables
 #vacuum_defer_cleanup_age = 0	# number of xacts by which cleanup is delayed
+#replication_timeout = 60s	# in milliseconds; 0 disables
+#synchronous_standby_names = ''	# standby servers that provide sync rep
+				# comma-separated list of application_name
+				# from standby(s); '*' = all
+
+<%- if rubber_env.postgresql_synchronous_replication %>
+synchronous_standby_names = '<%= rubber_env.app_name %>'
 <%- end %>
 
-<%- if rubber_instances[rubber_env.host].role_names.include?('postgresql_slave') %>
+<%- else %>
 # - Standby Servers -
 
-hot_standby = on	# "on" allows queries during recovery
+# These settings are ignored on a master server
+
+hot_standby = on			# "on" allows queries during recovery
 					# (change requires restart)
 #max_standby_archive_delay = 30s	# max delay before canceling queries
 					# when reading WAL from archive;
 					# -1 allows indefinite delay
-max_standby_streaming_delay = 30min	# max delay before canceling queries
+max_standby_streaming_delay = 10min	# max delay before canceling queries
 					# when reading streaming WAL;
 					# -1 allows indefinite delay
+#wal_receiver_status_interval = 10s	# send replies at least this often
+					# 0 disables
+hot_standby_feedback = on		# send info from standby to prevent
+					# query conflicts
 <%- end %>
 
-
 #------------------------------------------------------------------------------
 # QUERY TUNING
 #------------------------------------------------------------------------------
@@ -288,7 +307,9 @@ max_standby_streaming_delay = 30min	# max delay before canceling queries
 					# can be absolute or relative to PGDATA
 #log_filename = 'postgresql-%Y-%m-%d_%H%M%S.log'	# log file name pattern,
 					# can include strftime() escapes
-#log_truncate_on_rotation = off		# If on, an existing log file of the
+#log_file_mode = 0600			# creation mode for log files,
+					# begin with 0 to use octal notation
+#log_truncate_on_rotation = off		# If on, an existing log file with the
 					# same name as the new log file will be
 					# truncated rather than appended to.
 					# But such truncation only occurs on
@@ -371,7 +392,7 @@ log_min_duration_statement = 200	# -1 is disabled, 0 logs all statements
 #log_duration = off
 #log_error_verbosity = default		# terse, default, or verbose messages
 #log_hostname = off
-log_line_prefix = '%t'			# special values:
+log_line_prefix = '%t '			# special values:
 					#   %a = application name
 					#   %u = user name
 					#   %d = database name
@@ -393,11 +414,10 @@ log_line_prefix = '%t'			# special values:
 					# e.g. '<%u%%%d> '
 #log_lock_waits = off			# log lock waits >= deadlock_timeout
 #log_statement = 'none'			# none, ddl, mod, all
-#log_temp_files = -1			# log temporary files equal or larger
+log_temp_files = 0			# log temporary files equal or larger
 					# than the specified size in kilobytes;
 					# -1 disables, 0 logs all temp files
-#log_timezone = unknown			# actually, defaults to TZ environment
-					# setting
+#log_timezone = '(defaults to server environment setting)'
 
 
 #------------------------------------------------------------------------------
@@ -464,11 +484,12 @@ autovacuum = on			# Enable autovacuum subprocess?  'on'
 #check_function_bodies = on
 #default_transaction_isolation = 'read committed'
 #default_transaction_read_only = off
+#default_transaction_deferrable = off
 #session_replication_role = 'origin'
 #statement_timeout = 0			# in milliseconds, 0 is disabled
 #vacuum_freeze_min_age = 50000000
 #vacuum_freeze_table_age = 150000000
-#bytea_output = 'hex'			# hex, escape
+bytea_output = 'hex'			# hex, escape
 #xmlbinary = 'base64'
 #xmloption = 'content'
 
@@ -476,8 +497,7 @@ autovacuum = on			# Enable autovacuum subprocess?  'on'
 
 datestyle = 'iso, mdy'
 #intervalstyle = 'postgres'
-#timezone = unknown			# actually, defaults to TZ environment
-					# setting
+#timezone = '(defaults to server environment setting)'
 #timezone_abbreviations = 'Default'     # Select the set of available time zone
 					# abbreviations.  Currently, there are
 					#   Default
@@ -515,7 +535,8 @@ default_text_search_config = 'pg_catalog.english'
 # Note:  Each lock table slot uses ~270 bytes of shared memory, and there are
 # max_locks_per_transaction * (max_connections + max_prepared_transactions)
 # lock table slots.
-
+#max_pred_locks_per_transaction = 64	# min 10
+					# (change requires restart)
 
 #------------------------------------------------------------------------------
 # VERSION/PLATFORM COMPATIBILITY
@@ -528,8 +549,9 @@ default_text_search_config = 'pg_catalog.english'
 #default_with_oids = off
 #escape_string_warning = on
 #lo_compat_privileges = off
+#quote_all_identifiers = off
 #sql_inheritance = on
-#standard_conforming_strings = off
+standard_conforming_strings = off
 #synchronize_seqscans = on
 
 # - Other Platforms and Clients -
@@ -537,6 +559,14 @@ default_text_search_config = 'pg_catalog.english'
 #transform_null_equals = off
 
 
+#------------------------------------------------------------------------------
+# ERROR HANDLING
+#------------------------------------------------------------------------------
+
+#exit_on_error = off				# terminate session on any error?
+#restart_after_crash = on			# reinitialize after backend crash?
+
+
 #------------------------------------------------------------------------------
 # CUSTOMIZED OPTIONS
 #------------------------------------------------------------------------------