rubber 1.7.2 → 1.8.0

data/lib/generators/vulcanize/templates/base/config/rubber/rubber.yml

@@ -204,6 +204,13 @@ staging_roles: "web,app,db:primary=true"
 #         zone: us-east-1a # zone to create volume in, needs to match host's zone
 #         device: /dev/sdy # OS device to attach volume to
 #
+#    # Use some ephemeral volumes for raid array
+#    local_volumes:
+#      - partition_device: /dev/sdb
+#        zero: false # zeros out disk for improved performance
+#      - partition_device: /dev/sdc
+#        zero: false # zeros out disk for improved performance
+#
 #     # for raid array, you'll need to add mdadm to packages.  Likewise,
 #     # xfsprogs is needed for xfs filesystem support
 #     packages: [xfsprogs, mdadm]
@@ -211,6 +218,7 @@ staging_roles: "web,app,db:primary=true"
 #       - device: /dev/md0 # OS device to to create raid array on
 #         mount: /mnt/fast # The directory to mount this array to
 #         filesystem: xfs # the filesystem to create on array
+#         filesystem_opts: -f # the filesystem opts in mkfs
 #         raid_level: 0 # the raid level to use for the array
 #         source_devices: [/dev/sdx, /dev/sdy] # the source EBS devices we are creating raid array from
 

data/lib/generators/vulcanize/templates/mysql/config/rubber/deploy-mysql.rb

@@ -137,8 +137,8 @@ namespace :rubber do
     task :custom_install_munin, :roles => [:mysql_master, :mysql_slave] do
       rubber.sudo_script 'install_munin_mysql', <<-ENDSCRIPT
         if [ ! -f /usr/share/munin/plugins/mysql_ ]; then
-          wget -qN -O /usr/share/munin/plugins/mysql_ http://github.com/kjellm/munin-mysql/raw/master/mysql_
-          wget -qN -O /etc/munin/plugin-conf.d/mysql_.conf http://github.com/kjellm/munin-mysql/raw/master/mysql_.conf
+          wget --no-check-certificate -qN -O /usr/share/munin/plugins/mysql_ https://github.com/kjellm/munin-mysql/raw/master/mysql_
+          wget --no-check-certificate -qN -O /etc/munin/plugin-conf.d/mysql_.conf https://github.com/kjellm/munin-mysql/raw/master/mysql_.conf
         fi
       ENDSCRIPT
     end

data/lib/generators/vulcanize/templates/passenger/config/rubber/deploy-passenger.rb

@@ -11,7 +11,6 @@ namespace :rubber do
       rubber.sudo_script 'install_passenger', <<-ENDSCRIPT
         if [[ -z `ls #{rubber_env.passenger_lib} 2> /dev/null` ]]; then
           echo -en "\n\n\n\n" | passenger-install-apache2-module
-          rvm #{rubber_env.rvm_ruby} --passenger
         fi
       ENDSCRIPT
     end

data/lib/generators/vulcanize/templates/passenger/config/rubber/role/passenger/munin-passenger-sudoers.conf

@@ -2,6 +2,7 @@
   @path = '/etc/sudoers'
   @additive = ["# munin passenger start", "# munin passenger end"]
 %>
+Defaults env_keep = GEM_PATH
 
 nobody  ALL=(ALL) NOPASSWD: <%= rubber_env.rvm_gem_home %>/bin/passenger-status
 nobody  ALL=(ALL) NOPASSWD: <%= rubber_env.rvm_gem_home %>/bin/passenger-memory-stats

data/lib/generators/vulcanize/templates/passenger/config/rubber/role/passenger/passenger-apache-vhost.conf

@@ -19,7 +19,6 @@ Listen <%= port %>
   SetEnvIf User-Agent "^(.*MSIE.*)|(.*AppleWebKit.*)$" nokeepalive
 
   RailsEnv  <%= RUBBER_ENV %>
-  RailsAllowModRewrite on
 
   RewriteEngine On
   RewriteCond %{HTTP_HOST} ^<%= rubber_env.domain %>$
@@ -43,4 +42,7 @@ Listen <%= port %>
 
 </VirtualHost>
 
-<% end %>
+<% end %>
+
+# The host here needs to match ServerName.
+PassengerPreStart http://<%= rubber_env.domain %>:<%= rubber_env.passenger_listen_port %>/

data/lib/generators/vulcanize/templates/passenger/config/rubber/role/passenger/passenger.conf

@@ -10,6 +10,9 @@ PassengerUseGlobalQueue on
 # max number of rails instances per appserver
 PassengerMaxPoolSize <%= rubber_env.max_app_connections %>
 
+# min number of rails instances per appserver (by setting this as the max, we make sure we only wait for workers to spawn on the first request)
+PassengerMinInstances <%= rubber_env.max_app_connections %>
+
 # Use PassengerMaxPoolSize for limit as we only have 1 app
 PassengerMaxInstancesPerApp 0
 
@@ -33,3 +36,6 @@ RailsFrameworkSpawnerIdleTime 0
 
 # For performances sake, don't ever unload app spawner
 RailsAppSpawnerIdleTime 0
+
+# Don't show the friendly error pages in production because it could leak information the public shouldn't see.
+PassengerFriendlyErrorPages <%= RUBBER_ENV == 'production' ? 'off' : 'on' %>

data/lib/generators/vulcanize/templates/passenger/config/rubber/rubber-passenger.yml

@@ -1,6 +1,6 @@
-passenger_version: 2.2.11
+passenger_version: 3.0.1
 passenger_root: "#{rvm_gem_home}/gems/passenger-#{passenger_version}"
-passenger_ruby: "#{ruby_prefix}/bin/passenger_ruby"
+passenger_ruby: "#{rvm_prefix}/wrappers/#{`bash -l -c 'rvm strings #{rvm_ruby}'`.strip}/ruby"
 passenger_lib: "#{passenger_root}/ext/apache2/mod_passenger.so"
 passenger_listen_port: 7000
 passenger_listen_ssl_port: 7001
@@ -11,5 +11,5 @@ role_dependencies:
 
 roles:
   passenger:
-    packages: [apache2-mpm-prefork, apache2-prefork-dev]
+    packages: [apache2-mpm-prefork, apache2-prefork-dev, libcurl4-openssl-dev]
     gems: [fastthread, rack, [passenger, "#{passenger_version}"]]

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

@@ -1,33 +1,39 @@
 
 namespace :rubber do
-  
+
   namespace :postgresql do
-    
+
     rubber.allow_optional_tasks(self)
-    
+
+    before "rubber:install_packages", "rubber:postgresql:setup_apt_sources"
+
+    task :setup_apt_sources, :roles => :redis do
+      rsudo "add-apt-repository ppa:pitti/postgresql"
+    end
+
     after "rubber:create", "rubber:postgresql:validate_db_roles"
 
     task :validate_db_roles do
       db_instances = rubber_instances.for_role("postgresql_slave")
       db_instances.each do |instance|
         if instance.role_names.find {|n| n == 'postgresql_master'}
-          fatal "Cannot have a postgresql slave and master on the same instance, please removing slave role for #{instance.name}"
+          fatal "Cannot have a postgresql slave and master on the same instance, please remove slave role for #{instance.name}"
         end
       end
     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
     # templates, which creates a catch 22 situation with the db, so we try and
     # bootstrap the db separate from the rest of the config
     task :bootstrap, :roles => [:postgresql_master, :postgresql_slave] do
-      
-      # Conditionaly bootstrap for each node/role only if that node has not
+
+      # Conditionally bootstrap for each node/role only if that node has not
       # been boostrapped for that role before
-      master_instances = rubber_instances.for_role("postgresql_master") & rubber_instances.filtered  
+      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()
         task task_name, :hosts => ic.full_name do
@@ -47,7 +53,7 @@ namespace :rubber do
         send task_name
       end
 
-#      Wait for postgresql 9.0 to be avlabel before allowing slaves
+#      Wait for postgresql 9.0 to be available before allowing slaves
 #
 #      slave_instances = rubber_instances.for_role("postgresql_slave") & rubber_instances.filtered
 #      slave_instances.each do |ic|
@@ -77,14 +83,35 @@ namespace :rubber do
 #        end
 #        send task_name
 #      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)
       # postgresql package install starts postgresql, so stop it
       rsudo "#{rubber_env.postgresql_ctl} stop" rescue nil
-      
+
       # After everything installed on machines, we need the source tree
       # on hosts in order to run rubber:config for bootstrapping the db
       rubber.update_code_for_bootstrap
@@ -104,21 +131,21 @@ namespace :rubber do
       ENDSCRIPT
       sleep 5
     end
-    
+
     desc <<-DESC
       Starts the postgresql daemons
     DESC
     task :start, :roles => [:postgresql_master, :postgresql_slave] do
       rsudo "#{rubber_env.postgresql_ctl} start"
     end
-    
+
     desc <<-DESC
       Stops the postgresql daemons
     DESC
     task :stop, :roles => [:postgresql_master, :postgresql_slave] do
       rsudo "#{rubber_env.postgresql_ctl} stop"
     end
-  
+
     desc <<-DESC
       Restarts the postgresql daemons
     DESC

data/lib/generators/vulcanize/templates/postgresql/config/rubber/role/db/munin-postgresql.conf

@@ -0,0 +1,7 @@
+<%
+  @path = '/etc/munin/plugin-conf.d/postgresql'
+%>
+
+[postgres_*]
+  user postgres
+  env.PGUSER postgres

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

@@ -41,16 +41,16 @@
 # The default values of these variables are driven from the -D command-line
 # option or PGDATA environment variable, represented here as ConfigDir.
 
-data_directory = '<%= rubber_env.postgresql_data_dir %>'   # use data in another directory
-          # (change requires restart)
-hba_file = '<%= rubber_env.postgresql_conf_dir %>/pg_hba.conf' # host-based authentication file
-          # (change requires restart)
-ident_file = '<%= rubber_env.postgresql_conf_dir %>/pg_ident.conf' # ident configuration file
-          # (change requires restart)
+data_directory = '<%= rubber_env.postgresql_data_dir %>'		# use data in another directory
+					# (change requires restart)
+hba_file = '<%= rubber_env.postgresql_conf_dir %>/pg_hba.conf'	# host-based authentication file
+					# (change requires restart)
+ident_file = '<%= rubber_env.postgresql_conf_dir %>/pg_ident.conf'	# ident configuration file
+					# (change requires restart)
 
 # If external_pid_file is not explicitly set, no extra PID file is written.
-external_pid_file = '<%= rubber_env.postgresql_pid_file %>'    # write an extra PID file
-          # (change requires restart)
+external_pid_file = '<%= rubber_env.postgresql_pid_file %>'		# write an extra PID file
+					# (change requires restart)
 
 
 #------------------------------------------------------------------------------
@@ -59,46 +59,48 @@ external_pid_file = '<%= rubber_env.postgresql_pid_file %>'    # write an extra
 
 # - Connection Settings -
 
-listen_addresses = '*'   # what IP address(es) to listen on;
-          # comma-separated list of addresses;
-          # defaults to 'localhost', '*' = all
-          # (change requires restart)
-port = 5432       # (change requires restart)
-max_connections = 100     # (change requires restart)
-# Note:  Increasing max_connections costs ~400 bytes of shared memory per 
+listen_addresses = '*'		# what IP address(es) to listen on;
+					# comma-separated list of addresses;
+					# defaults to 'localhost', '*' = all
+					# (change requires restart)
+port = 5432				# (change requires restart)
+max_connections = 100			# (change requires restart)
+# Note:  Increasing max_connections costs ~400 bytes of shared memory per
 # connection slot, plus lock space (see max_locks_per_transaction).
-#superuser_reserved_connections = 3 # (change requires restart)
-unix_socket_directory = '/var/run/postgresql'   # (change requires restart)
-#unix_socket_group = ''     # (change requires restart)
-#unix_socket_permissions = 0777   # begin with 0 to use octal notation
-          # (change requires restart)
-#bonjour_name = ''      # defaults to the computer name
-          # (change requires restart)
+#superuser_reserved_connections = 3	# (change requires restart)
+unix_socket_directory = '/var/run/postgresql'		# (change requires restart)
+#unix_socket_group = ''			# (change requires restart)
+#unix_socket_permissions = 0777		# begin with 0 to use octal notation
+					# (change requires restart)
+#bonjour = off				# advertise server via Bonjour
+					# (change requires restart)
+#bonjour_name = ''			# defaults to the computer name
+					# (change requires restart)
 
 # - Security and Authentication -
 
-#authentication_timeout = 1min    # 1s-600s
-#ssl = true        # (change requires restart)
-#ssl_ciphers = 'ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH'  # allowed SSL ciphers
-          # (change requires restart)
-#ssl_renegotiation_limit = 512MB  # amount of data between renegotiations
+#authentication_timeout = 1min		# 1s-600s
+#ssl = off				# (change requires restart)
+#ssl_ciphers = 'ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH'	# allowed SSL ciphers
+					# (change requires restart)
+#ssl_renegotiation_limit = 512MB	# amount of data between renegotiations
 #password_encryption = on
 #db_user_namespace = off
 
 # Kerberos and GSSAPI
 #krb_server_keyfile = ''
-#krb_srvname = 'postgres'   # (Kerberos only)
+#krb_srvname = 'postgres'		# (Kerberos only)
 #krb_caseins_users = off
 
 # - TCP Keepalives -
 # see "man 7 tcp" for details
 
-#tcp_keepalives_idle = 0    # TCP_KEEPIDLE, in seconds;
-          # 0 selects the system default
-#tcp_keepalives_interval = 0    # TCP_KEEPINTVL, in seconds;
-          # 0 selects the system default
-#tcp_keepalives_count = 0   # TCP_KEEPCNT;
-          # 0 selects the system default
+#tcp_keepalives_idle = 0		# TCP_KEEPIDLE, in seconds;
+					# 0 selects the system default
+#tcp_keepalives_interval = 0		# TCP_KEEPINTVL, in seconds;
+					# 0 selects the system default
+#tcp_keepalives_count = 0		# TCP_KEEPCNT;
+					# 0 selects the system default
 
 
 #------------------------------------------------------------------------------
@@ -107,42 +109,42 @@ unix_socket_directory = '/var/run/postgresql'   # (change requires restart)
 
 # - Memory -
 
-shared_buffers = 28MB     # min 128kB
-          # (change requires restart)
-#temp_buffers = 8MB     # min 800kB
-#max_prepared_transactions = 0    # zero disables the feature
-          # (change requires restart)
+shared_buffers = 28MB			# min 128kB
+					# (change requires restart)
+#temp_buffers = 8MB			# min 800kB
+#max_prepared_transactions = 0		# zero disables the feature
+					# (change requires restart)
 # Note:  Increasing max_prepared_transactions costs ~600 bytes of shared memory
 # per transaction slot, plus lock space (see max_locks_per_transaction).
 # It is not advisable to set max_prepared_transactions nonzero unless you
 # actively intend to use prepared transactions.
-#work_mem = 1MB       # min 64kB
-#maintenance_work_mem = 16MB    # min 1MB
-#max_stack_depth = 2MB      # min 100kB
+#work_mem = 1MB				# min 64kB
+#maintenance_work_mem = 16MB		# min 1MB
+#max_stack_depth = 2MB			# min 100kB
 
 # - Kernel Resource Usage -
 
-#max_files_per_process = 1000   # min 25
-          # (change requires restart)
-#shared_preload_libraries = ''    # (change requires restart)
+#max_files_per_process = 1000		# min 25
+					# (change requires restart)
+#shared_preload_libraries = ''		# (change requires restart)
 
 # - Cost-Based Vacuum Delay -
 
-#vacuum_cost_delay = 0ms    # 0-100 milliseconds
-#vacuum_cost_page_hit = 1   # 0-10000 credits
-#vacuum_cost_page_miss = 10   # 0-10000 credits
-#vacuum_cost_page_dirty = 20    # 0-10000 credits
-#vacuum_cost_limit = 200    # 1-10000 credits
+#vacuum_cost_delay = 0ms		# 0-100 milliseconds
+#vacuum_cost_page_hit = 1		# 0-10000 credits
+#vacuum_cost_page_miss = 10		# 0-10000 credits
+#vacuum_cost_page_dirty = 20		# 0-10000 credits
+#vacuum_cost_limit = 200		# 1-10000 credits
 
 # - Background Writer -
 
-#bgwriter_delay = 200ms     # 10-10000ms between rounds
-#bgwriter_lru_maxpages = 100    # 0-1000 max buffers written/round
-#bgwriter_lru_multiplier = 2.0    # 0-10.0 multipler on buffers scanned/round
+#bgwriter_delay = 200ms			# 10-10000ms between rounds
+#bgwriter_lru_maxpages = 100		# 0-1000 max buffers written/round
+#bgwriter_lru_multiplier = 2.0		# 0-10.0 multipler on buffers scanned/round
 
 # - Asynchronous Behavior -
 
-#effective_io_concurrency = 1   # 1-1000. 0 disables prefetching
+#effective_io_concurrency = 1		# 1-1000. 0 disables prefetching
 
 
 #------------------------------------------------------------------------------
@@ -151,37 +153,58 @@ shared_buffers = 28MB     # min 128kB
 
 # - Settings -
 
-#fsync = on       # turns forced synchronization on or off
-#synchronous_commit = on    # immediate fsync at commit
-#wal_sync_method = fsync    # the default is the first option 
-          # supported by the operating system:
-          #   open_datasync
-          #   fdatasync
-          #   fsync
-          #   fsync_writethrough
-          #   open_sync
-#full_page_writes = on      # recover from partial page writes
-#wal_buffers = 64kB     # min 32kB
-          # (change requires restart)
-#wal_writer_delay = 200ms   # 1-10000 milliseconds
-
-#commit_delay = 0     # range 0-100000, in microseconds
-#commit_siblings = 5      # range 1-1000
+#wal_level = minimal			# minimal, archive, or hot_standby
+					# (change requires restart)
+#fsync = on				# turns forced synchronization on or off
+#synchronous_commit = on		# immediate fsync at commit
+#wal_sync_method = fsync		# the default is the first option
+					# supported by the operating system:
+					#   open_datasync
+					#   fdatasync
+					#   fsync
+					#   fsync_writethrough
+					#   open_sync
+#full_page_writes = on			# recover from partial page writes
+#wal_buffers = 64kB			# min 32kB
+					# (change requires restart)
+#wal_writer_delay = 200ms		# 1-10000 milliseconds
+
+#commit_delay = 0			# range 0-100000, in microseconds
+#commit_siblings = 5			# range 1-1000
 
 # - Checkpoints -
 
-#checkpoint_segments = 3    # in logfile segments, min 1, 16MB each
-#checkpoint_timeout = 5min    # range 30s-1h
-#checkpoint_completion_target = 0.5 # checkpoint target duration, 0.0 - 1.0
-#checkpoint_warning = 30s   # 0 disables
+#checkpoint_segments = 3		# in logfile segments, min 1, 16MB each
+#checkpoint_timeout = 5min		# range 30s-1h
+#checkpoint_completion_target = 0.5	# checkpoint target duration, 0.0 - 1.0
+#checkpoint_warning = 30s		# 0 disables
 
 # - Archiving -
 
-#archive_mode = off   # allows archiving to be done
-        # (change requires restart)
-#archive_command = 'cp -i %p <%= rubber_env.postgresql_archive_dir %>/%f </dev/null'   # command to use to archive a logfile segment
-#archive_timeout = 300    # force a logfile segment switch after this
-        # number of seconds; 0 disables
+#archive_mode = off		# allows archiving to be done
+				# (change requires restart)
+#archive_command = ''		# command to use to archive a logfile segment
+#archive_timeout = 0		# force a logfile segment switch after this
+				# number of seconds; 0 disables
+
+# - Streaming Replication -
+
+#max_wal_senders = 0		# max number of walsender processes
+				# (change requires restart)
+#wal_sender_delay = 200ms	# walsender cycle time, 1-10000 milliseconds
+#wal_keep_segments = 0		# in logfile segments, 16MB each; 0 disables
+#vacuum_defer_cleanup_age = 0	# number of xacts by which cleanup is delayed
+
+# - Standby Servers -
+
+#hot_standby = off			# "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 = 30s	# max delay before canceling queries
+					# when reading streaming WAL;
+					# -1 allows indefinite delay
 
 
 #------------------------------------------------------------------------------
@@ -194,6 +217,7 @@ shared_buffers = 28MB     # min 128kB
 #enable_hashagg = on
 #enable_hashjoin = on
 #enable_indexscan = on
+#enable_material = on
 #enable_mergejoin = on
 #enable_nestloop = on
 #enable_seqscan = on
@@ -202,30 +226,31 @@ shared_buffers = 28MB     # min 128kB
 
 # - Planner Cost Constants -
 
-#seq_page_cost = 1.0      # measured on an arbitrary scale
-#random_page_cost = 4.0     # same scale as above
-#cpu_tuple_cost = 0.01      # same scale as above
-#cpu_index_tuple_cost = 0.005   # same scale as above
-#cpu_operator_cost = 0.0025   # same scale as above
+#seq_page_cost = 1.0			# measured on an arbitrary scale
+#random_page_cost = 4.0			# same scale as above
+#cpu_tuple_cost = 0.01			# same scale as above
+#cpu_index_tuple_cost = 0.005		# same scale as above
+#cpu_operator_cost = 0.0025		# same scale as above
 #effective_cache_size = 128MB
 
 # - Genetic Query Optimizer -
 
 #geqo = on
 #geqo_threshold = 12
-#geqo_effort = 5      # range 1-10
-#geqo_pool_size = 0     # selects default based on effort
-#geqo_generations = 0     # selects default based on effort
-#geqo_selection_bias = 2.0    # range 1.5-2.0
+#geqo_effort = 5			# range 1-10
+#geqo_pool_size = 0			# selects default based on effort
+#geqo_generations = 0			# selects default based on effort
+#geqo_selection_bias = 2.0		# range 1.5-2.0
+#geqo_seed = 0.0			# range 0.0-1.0
 
 # - Other Planner Options -
 
-#default_statistics_target = 100  # range 1-10000
-#constraint_exclusion = partition # on, off, or partition
-#cursor_tuple_fraction = 0.1    # range 0.0-1.0
+#default_statistics_target = 100	# range 1-10000
+#constraint_exclusion = partition	# on, off, or partition
+#cursor_tuple_fraction = 0.1		# range 0.0-1.0
 #from_collapse_limit = 8
-#join_collapse_limit = 8    # 1 disables collapsing of explicit 
-          # JOIN clauses
+#join_collapse_limit = 8		# 1 disables collapsing of explicit
+					# JOIN clauses
 
 
 #------------------------------------------------------------------------------
@@ -234,93 +259,91 @@ shared_buffers = 28MB     # min 128kB
 
 # - Where to Log -
 
-#log_destination = 'stderr'   # Valid values are combinations of
-          # stderr, csvlog, syslog and eventlog,
-          # depending on platform.  csvlog
-          # requires logging_collector to be on.
+#log_destination = 'stderr'		# Valid values are combinations of
+					# stderr, csvlog, syslog, and eventlog,
+					# depending on platform.  csvlog
+					# requires logging_collector to be on.
 
 # This is used when logging to stderr:
-#logging_collector = off    # Enable capturing of stderr and csvlog
-          # into log files. Required to be on for
-          # csvlogs.
-          # (change requires restart)
+#logging_collector = off		# Enable capturing of stderr and csvlog
+					# into log files. Required to be on for
+					# csvlogs.
+					# (change requires restart)
 
 # These are only used if logging_collector is on:
-#log_directory = 'pg_log'   # directory where log files are written,
-          # 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
-          # same name as the new log file will be
-          # truncated rather than appended to.
-          # But such truncation only occurs on
-          # time-driven rotation, not on restarts
-          # or size-driven rotation.  Default is
-          # off, meaning append to existing files
-          # in all cases.
-#log_rotation_age = 1d      # Automatic rotation of logfiles will
-          # happen after that time.  0 disables.
-#log_rotation_size = 10MB   # Automatic rotation of logfiles will 
-          # happen after that much log output.
-          # 0 disables.
+#log_directory = 'pg_log'		# directory where log files are written,
+					# 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
+					# same name as the new log file will be
+					# truncated rather than appended to.
+					# But such truncation only occurs on
+					# time-driven rotation, not on restarts
+					# or size-driven rotation.  Default is
+					# off, meaning append to existing files
+					# in all cases.
+#log_rotation_age = 1d			# Automatic rotation of logfiles will
+					# happen after that time.  0 disables.
+#log_rotation_size = 10MB		# Automatic rotation of logfiles will
+					# happen after that much log output.
+					# 0 disables.
 
 # These are relevant when logging to syslog:
 #syslog_facility = 'LOCAL0'
 #syslog_ident = 'postgres'
 
-#silent_mode = off      # Run server silently.
-          # DO NOT USE without syslog or
-          # logging_collector
-          # (change requires restart)
+#silent_mode = off			# Run server silently.
+					# DO NOT USE without syslog or
+					# logging_collector
+					# (change requires restart)
 
 
 # - When to Log -
 
-#client_min_messages = notice   # values in order of decreasing detail:
-          #   debug5
-          #   debug4
-          #   debug3
-          #   debug2
-          #   debug1
-          #   log
-          #   notice
-          #   warning
-          #   error
-
-#log_min_messages = warning   # values in order of decreasing detail:
-          #   debug5
-          #   debug4
-          #   debug3
-          #   debug2
-          #   debug1
-          #   info
-          #   notice
-          #   warning
-          #   error
-          #   log
-          #   fatal
-          #   panic
-
-#log_error_verbosity = default    # terse, default, or verbose messages
-
-#log_min_error_statement = error  # values in order of decreasing detail:
-          #   debug5
-          #   debug4
-          #   debug3
-          #   debug2
-          #   debug1
-          #   info
-          #   notice
-          #   warning
-          #   error
-          #   log
-          #   fatal
-          #   panic (effectively off)
-
-log_min_duration_statement = 1  # -1 is disabled, 0 logs all statements
-          # and their durations, > 0 logs only
-          # statements running at least this number
-          # of milliseconds
+#client_min_messages = notice		# values in order of decreasing detail:
+					#   debug5
+					#   debug4
+					#   debug3
+					#   debug2
+					#   debug1
+					#   log
+					#   notice
+					#   warning
+					#   error
+
+#log_min_messages = warning		# values in order of decreasing detail:
+					#   debug5
+					#   debug4
+					#   debug3
+					#   debug2
+					#   debug1
+					#   info
+					#   notice
+					#   warning
+					#   error
+					#   log
+					#   fatal
+					#   panic
+
+#log_min_error_statement = error	# values in order of decreasing detail:
+				 	#   debug5
+					#   debug4
+					#   debug3
+					#   debug2
+					#   debug1
+				 	#   info
+					#   notice
+					#   warning
+					#   error
+					#   log
+					#   fatal
+					#   panic (effectively off)
+
+log_min_duration_statement = 1	# -1 is disabled, 0 logs all statements
+					# and their durations, > 0 logs only
+					# statements running at least this number
+					# of milliseconds
 
 
 # - What to Log -
@@ -333,32 +356,35 @@ log_min_duration_statement = 1  # -1 is disabled, 0 logs all statements
 #log_connections = off
 #log_disconnections = off
 #log_duration = off
+#log_error_verbosity = default		# terse, default, or verbose messages
 #log_hostname = off
-log_line_prefix = '%t '     # special values:
-          #   %u = user name
-          #   %d = database name
-          #   %r = remote host and port
-          #   %h = remote host
-          #   %p = process ID
-          #   %t = timestamp without milliseconds
-          #   %m = timestamp with milliseconds
-          #   %i = command tag
-          #   %c = session ID
-          #   %l = session line number
-          #   %s = session start timestamp
-          #   %v = virtual transaction ID
-          #   %x = transaction ID (0 if none)
-          #   %q = stop here in non-session
-          #        processes
-          #   %% = '%'
-          # 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
-          # than the specified size in kilobytes;
-          # -1 disables, 0 logs all temp files
-#log_timezone = unknown     # actually, defaults to TZ environment
-          # setting
+log_line_prefix = '%t'			# special values:
+					#   %a = application name
+					#   %u = user name
+					#   %d = database name
+					#   %r = remote host and port
+					#   %h = remote host
+					#   %p = process ID
+					#   %t = timestamp without milliseconds
+					#   %m = timestamp with milliseconds
+					#   %i = command tag
+					#   %e = SQL state
+					#   %c = session ID
+					#   %l = session line number
+					#   %s = session start timestamp
+					#   %v = virtual transaction ID
+					#   %x = transaction ID (0 if none)
+					#   %q = stop here in non-session
+					#        processes
+					#   %% = '%'
+					# 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
+					# than the specified size in kilobytes;
+					# -1 disables, 0 logs all temp files
+#log_timezone = unknown			# actually, defaults to TZ environment
+					# setting
 
 
 #------------------------------------------------------------------------------
@@ -369,8 +395,8 @@ log_line_prefix = '%t '     # special values:
 
 #track_activities = on
 track_counts = on
-#track_functions = none     # none, pl, all
-#track_activity_query_size = 1024
+#track_functions = none			# none, pl, all
+#track_activity_query_size = 1024 	# (change requires restart)
 #update_process_title = on
 #stats_temp_directory = 'pg_stat_tmp'
 
@@ -387,28 +413,29 @@ track_counts = on
 # AUTOVACUUM PARAMETERS
 #------------------------------------------------------------------------------
 
-autovacuum = on      # Enable autovacuum subprocess?  'on'
-          # requires track_counts to also be on.
-#log_autovacuum_min_duration = -1 # -1 disables, 0 logs all actions and
-          # their durations, > 0 logs only
-          # actions running at least this number
-          # of milliseconds.
-#autovacuum_max_workers = 3   # max number of autovacuum subprocesses
-#autovacuum_naptime = 1min    # time between autovacuum runs
-#autovacuum_vacuum_threshold = 50 # min number of row updates before
-          # vacuum
-#autovacuum_analyze_threshold = 50  # min number of row updates before 
-          # analyze
-#autovacuum_vacuum_scale_factor = 0.2 # fraction of table size before vacuum
-#autovacuum_analyze_scale_factor = 0.1  # fraction of table size before analyze
-#autovacuum_freeze_max_age = 200000000  # maximum XID age before forced vacuum
-          # (change requires restart)
-#autovacuum_vacuum_cost_delay = 20ms  # default vacuum cost delay for
-          # autovacuum, in milliseconds;
-          # -1 means use vacuum_cost_delay
-#autovacuum_vacuum_cost_limit = -1  # default vacuum cost limit for
-          # autovacuum, -1 means use
-          # vacuum_cost_limit
+autovacuum = on			# Enable autovacuum subprocess?  'on'
+					# requires track_counts to also be on.
+#log_autovacuum_min_duration = -1	# -1 disables, 0 logs all actions and
+					# their durations, > 0 logs only
+					# actions running at least this number
+					# of milliseconds.
+#autovacuum_max_workers = 3		# max number of autovacuum subprocesses
+					# (change requires restart)
+#autovacuum_naptime = 1min		# time between autovacuum runs
+#autovacuum_vacuum_threshold = 50	# min number of row updates before
+					# vacuum
+#autovacuum_analyze_threshold = 50	# min number of row updates before
+					# analyze
+#autovacuum_vacuum_scale_factor = 0.2	# fraction of table size before vacuum
+#autovacuum_analyze_scale_factor = 0.1	# fraction of table size before analyze
+#autovacuum_freeze_max_age = 200000000	# maximum XID age before forced vacuum
+					# (change requires restart)
+#autovacuum_vacuum_cost_delay = 20ms	# default vacuum cost delay for
+					# autovacuum, in milliseconds;
+					# -1 means use vacuum_cost_delay
+#autovacuum_vacuum_cost_limit = -1	# default vacuum cost limit for
+					# autovacuum, -1 means use
+					# vacuum_cost_limit
 
 
 #------------------------------------------------------------------------------
@@ -417,17 +444,18 @@ autovacuum = on      # Enable autovacuum subprocess?  'on'
 
 # - Statement Behavior -
 
-#search_path = '"$user",public'   # schema names
-#default_tablespace = ''    # a tablespace name, '' uses the default
-#temp_tablespaces = ''      # a list of tablespace names, '' uses
-          # only default tablespace
+#search_path = '"$user",public'		# schema names
+#default_tablespace = ''		# a tablespace name, '' uses the default
+#temp_tablespaces = ''			# a list of tablespace names, '' uses
+					# only default tablespace
 #check_function_bodies = on
 #default_transaction_isolation = 'read committed'
 #default_transaction_read_only = off
 #session_replication_role = 'origin'
-#statement_timeout = 0      # in milliseconds, 0 is disabled
+#statement_timeout = 0			# in milliseconds, 0 is disabled
 #vacuum_freeze_min_age = 50000000
 #vacuum_freeze_table_age = 150000000
+#bytea_output = 'hex'			# hex, escape
 #xmlbinary = 'base64'
 #xmloption = 'content'
 
@@ -435,25 +463,25 @@ autovacuum = on      # Enable autovacuum subprocess?  'on'
 
 datestyle = 'iso, mdy'
 #intervalstyle = 'postgres'
-#timezone = unknown     # actually, defaults to TZ environment
-          # setting
+#timezone = unknown			# actually, defaults to TZ environment
+					# setting
 #timezone_abbreviations = 'Default'     # Select the set of available time zone
-          # abbreviations.  Currently, there are
-          #   Default
-          #   Australia
-          #   India
-          # You can create your own file in
-          # share/timezonesets/.
-#extra_float_digits = 0     # min -15, max 2
-#client_encoding = sql_ascii    # actually, defaults to database
-          # encoding
+					# abbreviations.  Currently, there are
+					#   Default
+					#   Australia
+					#   India
+					# You can create your own file in
+					# share/timezonesets/.
+#extra_float_digits = 0			# min -15, max 3
+#client_encoding = sql_ascii		# actually, defaults to database
+					# encoding
 
 # These settings are initialized by initdb, but they can be changed.
-lc_messages = 'en_US.UTF-8'     # locale for system error message
-          # strings
-lc_monetary = 'en_US.UTF-8'     # locale for monetary formatting
-lc_numeric = 'en_US.UTF-8'      # locale for number formatting
-lc_time = 'en_US.UTF-8'       # locale for time formatting
+lc_messages = 'en_US.UTF-8'			# locale for system error message
+					# strings
+lc_monetary = 'en_US.UTF-8'			# locale for monetary formatting
+lc_numeric = 'en_US.UTF-8'			# locale for number formatting
+lc_time = 'en_US.UTF-8'				# locale for time formatting
 
 # default configuration for text search
 default_text_search_config = 'pg_catalog.english'
@@ -469,8 +497,8 @@ default_text_search_config = 'pg_catalog.english'
 #------------------------------------------------------------------------------
 
 #deadlock_timeout = 1s
-#max_locks_per_transaction = 64   # min 10
-          # (change requires restart)
+#max_locks_per_transaction = 64		# min 10
+					# (change requires restart)
 # 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.
@@ -482,12 +510,11 @@ default_text_search_config = 'pg_catalog.english'
 
 # - Previous PostgreSQL Versions -
 
-#add_missing_from = off
 #array_nulls = on
-#backslash_quote = safe_encoding  # on, off, or safe_encoding
+#backslash_quote = safe_encoding	# on, off, or safe_encoding
 #default_with_oids = off
 #escape_string_warning = on
-#regex_flavor = advanced    # advanced, extended, or basic
+#lo_compat_privileges = off
 #sql_inheritance = on
 #standard_conforming_strings = off
 #synchronize_seqscans = on
@@ -501,4 +528,4 @@ default_text_search_config = 'pg_catalog.english'
 # CUSTOMIZED OPTIONS
 #------------------------------------------------------------------------------
 
-#custom_variable_classes = ''   # list of custom variable class names
+#custom_variable_classes = ''		# list of custom variable class names