41c41
< data_directory = '/var/lib/postgresql/9.1/main'		# use data in another directory
---
> data_directory = '/var/lib/postgresql/9.3/main'		# use data in another directory
43c43
< hba_file = '/etc/postgresql/9.1/main/pg_hba.conf'	# host-based authentication file
---
> hba_file = '/etc/postgresql/9.3/main/pg_hba.conf'	# host-based authentication file
45c45
< ident_file = '/etc/postgresql/9.1/main/pg_ident.conf'	# ident configuration file
---
> ident_file = '/etc/postgresql/9.3/main/pg_ident.conf'	# ident configuration file
49c49
< external_pid_file = '/var/run/postgresql/9.1-main.pid'		# write an extra PID file
---
> external_pid_file = '/var/run/postgresql/9.3-main.pid'			# write an extra PID file
59c59
< listen_addresses = 'localhost'		# what IP address(es) to listen on;
---
> #listen_addresses = 'localhost'		# what IP address(es) to listen on;
61c61
< 					# defaults to 'localhost', '*' = all
---
> 					# defaults to 'localhost'; use '*' for all
63c63
< port = 5433				# (change requires restart)
---
> port = 5434				# (change requires restart)
68c68,69
< unix_socket_directory = '/var/run/postgresql'		# (change requires restart)
---
> unix_socket_directories = '/var/run/postgresql'	# comma-separated list of directories
> 					# (change requires restart)
81c82
< #ssl_ciphers = 'ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH'	# allowed SSL ciphers
---
> #ssl_ciphers = 'DEFAULT:!LOW:!EXP:!MD5:@STRENGTH'	# allowed SSL ciphers
83a85,88
> #ssl_cert_file = 'server.crt'		# (change requires restart)
> #ssl_key_file = 'server.key'		# (change requires restart)
> #ssl_ca_file = ''			# (change requires restart)
> #ssl_crl_file = ''			# (change requires restart)
109c114
< shared_buffers = 24MB			# min 128kB
---
> shared_buffers = 128MB			# min 128kB
121a127,131
> # - Disk -
> 
> #temp_file_limit = -1			# limits per-session temp file space
> 					# in kB, or -1 for no limit
> 
130c140
< #vacuum_cost_delay = 0ms		# 0-100 milliseconds
---
> #vacuum_cost_delay = 0			# 0-100 milliseconds
144c154
< #effective_io_concurrency = 1		# 1-1000. 0 disables prefetching
---
> #effective_io_concurrency = 1		# 1-1000; 0 disables prefetching
156c166,167
< #synchronous_commit = on		# synchronization level; on, off, or local
---
> #synchronous_commit = on		# synchronization level;
> 					# off, local, remote_write, or on
183a195,197
> 				# placeholders: %p = path of file to archive
> 				#               %f = file name only
> 				# e.g. 'test ! -f /mnt/server/archivedir/%f && cp %p /mnt/server/archivedir/%f'
192c206
< # - Master Server -
---
> # - Sending Server(s) -
194c208
< # These settings are ignored on a standby server
---
> # Set these on the master and on any standby that will send replication data.
198d211
< #wal_sender_delay = 1s		# walsender cycle time, 1-10000 milliseconds
200,201c213,218
< #vacuum_defer_cleanup_age = 0	# number of xacts by which cleanup is delayed
< #replication_timeout = 60s	# in milliseconds; 0 disables
---
> #wal_sender_timeout = 60s	# in milliseconds; 0 disables
> 
> # - Master Server -
> 
> # These settings are ignored on a standby server.
> 
204a222
> #vacuum_defer_cleanup_age = 0	# number of xacts by which cleanup is delayed
208c226
< # These settings are ignored on a master server
---
> # These settings are ignored on a master server.
221a240,242
> #wal_receiver_timeout = 60s		# time that receiver waits for
> 					# communication from master
> 					# in milliseconds; 0 disables
233a255
> #enable_indexonlyscan = on
312,316c334,335
< #silent_mode = off			# Run server silently.
< 					# DO NOT USE without syslog or
< 					# logging_collector
< 					# (change requires restart)
< 
---
> # This is only relevant when logging to eventlog (win32):
> #event_source = 'PostgreSQL'
346c365
< 				 	#   debug5
---
> 					#   debug5
351c370
< 				 	#   info
---
> 					#   info
375c394
< #log_error_verbosity = default		# terse, default, or verbose messages
---
> log_error_verbosity = verbose		# terse, default, or verbose messages
377c396
< log_line_prefix = '%t '			# special values:
---
> log_line_prefix = '%t [%p-%l] %q%u@%d '			# special values:
402c421
< #log_timezone = '(defaults to server environment setting)'
---
> log_timezone = 'localtime'
413,414c432,434
< track_functions = all			# none, pl, all
< #track_activity_query_size = 1024 	# (change requires restart)
---
> #track_io_timing = off
> #track_functions = none			# none, pl, all
> #track_activity_query_size = 1024	# (change requires restart)
416c436
< #stats_temp_directory = 'pg_stat_tmp'
---
> stats_temp_directory = '/var/run/postgresql/9.3-main.pg_stat_tmp'
447a468,470
> #autovacuum_multixact_freeze_max_age = 400000000	# maximum Multixact age
> 					# before forced vacuum
> 					# (change requires restart)
471a495
> #lock_timeout = 0			# in milliseconds, 0 is disabled
473a498,499
> #vacuum_multixact_freeze_min_age = 5000000
> #vacuum_multixact_freeze_table_age = 150000000
482c508
< #timezone = '(defaults to server environment setting)'
---
> #timezone = 'localtime'
486c512
< 					#   Australia
---
> 					#   Australia (historical usage)
522a549
> 
548,549c575,589
< #exit_on_error = off				# terminate session on any error?
< #restart_after_crash = on			# reinitialize after backend crash?
---
> #exit_on_error = off			# terminate session on any error?
> #restart_after_crash = on		# reinitialize after backend crash?
> 
> 
> #------------------------------------------------------------------------------
> # CONFIG FILE INCLUDES
> #------------------------------------------------------------------------------
> 
> # These options allow settings to be loaded from files other than the
> # default postgresql.conf.
> 
> #include_dir = 'conf.d'			# include files ending in '.conf' from
> 					# directory 'conf.d'
> #include_if_exists = 'exists.conf'	# include file only if it exists
> #include = 'special.conf'		# include file
556c596
< #custom_variable_classes = ''		# list of custom variable class names
---
> # Add settings for extensions here