Project

General

Profile

« Previous | Next » 

Revision 11662

Makefile, schemas/.Mac.conf: upgraded to PostgreSQL 9.3, which is needed for proper exception parsing in the auto-re-create-views functionality. this also removes the Mac 10.8 Mountain Lion quirks, such as renaming the postgres user to _postgres (which messed everything up, but is now back to normal).

View differences:

schemas/postgresql.Mac.conf
46 46
					# (change requires restart)
47 47

  
48 48
# If external_pid_file is not explicitly set, no extra PID file is written.
49
#external_pid_file = '(none)'		# write an extra PID file
49
#external_pid_file = ''			# write an extra PID file
50 50
					# (change requires restart)
51 51

  
52 52

  
......
58 58

  
59 59
listen_addresses = '*'		# what IP address(es) to listen on;
60 60
					# comma-separated list of addresses;
61
					# defaults to 'localhost', '*' = all
61
					# defaults to 'localhost'; use '*' for all
62 62
					# (change requires restart)
63
#port = 5432				# (change requires restart)
63
port = 5432				# (change requires restart)
64 64
max_connections = 100			# (change requires restart)
65 65
# Note:  Increasing max_connections costs ~400 bytes of shared memory per
66 66
# connection slot, plus lock space (see max_locks_per_transaction).
67 67
#superuser_reserved_connections = 3	# (change requires restart)
68
unix_socket_directory = '/tmp'		# (change requires restart)
69
#unix_socket_directory = ''		# (change requires restart)
68
unix_socket_directories = '/tmp'	# comma-separated list of directories
69
					# (change requires restart)
70 70
#unix_socket_group = ''			# (change requires restart)
71 71
#unix_socket_permissions = 0777		# begin with 0 to use octal notation
72 72
					# (change requires restart)
......
79 79

  
80 80
#authentication_timeout = 1min		# 1s-600s
81 81
#ssl = off				# (change requires restart)
82
#ssl_ciphers = 'ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH'	# allowed SSL ciphers
82
#ssl_ciphers = 'DEFAULT:!LOW:!EXP:!MD5:@STRENGTH'	# allowed SSL ciphers
83 83
					# (change requires restart)
84 84
#ssl_renegotiation_limit = 512MB	# amount of data between renegotiations
85
#ssl_cert_file = 'server.crt'		# (change requires restart)
86
#ssl_key_file = 'server.key'		# (change requires restart)
87
#ssl_ca_file = ''			# (change requires restart)
88
#ssl_crl_file = ''			# (change requires restart)
85 89
#password_encryption = on
86 90
#db_user_namespace = off
87 91

  
......
109 113

  
110 114
# Set to slightly less than SHMMAX = 1.4GB
111 115
shared_buffers = 1400MB			# min 128kB
112
#shared_buffers = 32MB			# min 128kB
116
#shared_buffers = 128MB			# min 128kB
113 117
					# (change requires restart)
114 118
#temp_buffers = 8MB			# min 800kB
115 119
#max_prepared_transactions = 0		# zero disables the feature
......
124 128
#maintenance_work_mem = 16MB		# min 1MB
125 129
#max_stack_depth = 2MB			# min 100kB
126 130

  
131
# - Disk -
132

  
133
#temp_file_limit = -1			# limits per-session temp file space
134
					# in kB, or -1 for no limit
135

  
127 136
# - Kernel Resource Usage -
128 137

  
129 138
#max_files_per_process = 1000		# min 25
......
132 141

  
133 142
# - Cost-Based Vacuum Delay -
134 143

  
135
#vacuum_cost_delay = 0ms		# 0-100 milliseconds
144
#vacuum_cost_delay = 0			# 0-100 milliseconds
136 145
#vacuum_cost_page_hit = 1		# 0-10000 credits
137 146
#vacuum_cost_page_miss = 10		# 0-10000 credits
138 147
#vacuum_cost_page_dirty = 20		# 0-10000 credits
......
146 155

  
147 156
# - Asynchronous Behavior -
148 157

  
149
#effective_io_concurrency = 1		# 1-1000. 0 disables prefetching
158
#effective_io_concurrency = 1		# 1-1000; 0 disables prefetching
150 159

  
151 160

  
152 161
#------------------------------------------------------------------------------
......
166 175
# <http://wiki.postgresql.org/wiki/Tuning_Your_PostgreSQL_Server#synchronous_commit>
167 176
#####
168 177
synchronous_commit = off		# immediate fsync at commit
178
#synchronous_commit = on		# synchronization level;
179
					# off, local, remote_write, or on
169 180
#wal_sync_method = fsync		# the default is the first option
170 181
					# supported by the operating system:
171 182
					#   open_datasync
......
185 196

  
186 197
checkpoint_segments = 32		# in logfile segments, min 1, 16MB each
187 198
#checkpoint_segments = 3		# in logfile segments, min 1, 16MB each
199
checkpoint_completion_target = 0.9	# checkpoint target duration, 0.0 - 1.0
188 200
#checkpoint_timeout = 5min		# range 30s-1h
189
checkpoint_completion_target = 0.9	# checkpoint target duration, 0.0 - 1.0
190 201
#checkpoint_completion_target = 0.5	# checkpoint target duration, 0.0 - 1.0
191 202
#checkpoint_warning = 30s		# 0 disables
192 203

  
......
195 206
#archive_mode = off		# allows archiving to be done
196 207
				# (change requires restart)
197 208
#archive_command = ''		# command to use to archive a logfile segment
209
				# placeholders: %p = path of file to archive
210
				#               %f = file name only
211
				# e.g. 'test ! -f /mnt/server/archivedir/%f && cp %p /mnt/server/archivedir/%f'
198 212
#archive_timeout = 0		# force a logfile segment switch after this
199 213
				# number of seconds; 0 disables
200 214

  
......
203 217
# REPLICATION
204 218
#------------------------------------------------------------------------------
205 219

  
206
# - Master Server -
220
# - Sending Server(s) -
207 221

  
208
# These settings are ignored on a standby server
222
# Set these on the master and on any standby that will send replication data.
209 223

  
210 224
#max_wal_senders = 0		# max number of walsender processes
211 225
				# (change requires restart)
212
#wal_sender_delay = 1s		# walsender cycle time, 1-10000 milliseconds
213 226
#wal_keep_segments = 0		# in logfile segments, 16MB each; 0 disables
214
#vacuum_defer_cleanup_age = 0	# number of xacts by which cleanup is delayed
215
#replication_timeout = 60s	# in milliseconds; 0 disables
227
#wal_sender_timeout = 60s	# in milliseconds; 0 disables
228

  
229
# - Master Server -
230

  
231
# These settings are ignored on a standby server.
232

  
216 233
#synchronous_standby_names = ''	# standby servers that provide sync rep
217 234
				# comma-separated list of application_name
218 235
				# from standby(s); '*' = all
236
#vacuum_defer_cleanup_age = 0	# number of xacts by which cleanup is delayed
219 237

  
220 238
# - Standby Servers -
221 239

  
222
# These settings are ignored on a master server
240
# These settings are ignored on a master server.
223 241

  
224 242
#hot_standby = off			# "on" allows queries during recovery
225 243
					# (change requires restart)
......
233 251
					# 0 disables
234 252
#hot_standby_feedback = off		# send info from standby to prevent
235 253
					# query conflicts
254
#wal_receiver_timeout = 60s		# time that receiver waits for
255
					# communication from master
256
					# in milliseconds; 0 disables
236 257

  
237 258

  
238 259
#------------------------------------------------------------------------------
......
245 266
#enable_hashagg = on
246 267
#enable_hashjoin = on
247 268
#enable_indexscan = on
269
#enable_indexonlyscan = on
248 270
#enable_material = on
249 271
#enable_mergejoin = on
250 272
#enable_nestloop = on
......
288 310

  
289 311
# - Where to Log -
290 312

  
291
#log_destination = 'stderr'		# Valid values are combinations of
313
log_destination = 'stderr'		# Valid values are combinations of
292 314
					# stderr, csvlog, syslog, and eventlog,
293 315
					# depending on platform.  csvlog
294 316
					# requires logging_collector to be on.
295 317

  
296 318
# This is used when logging to stderr:
297
#logging_collector = off		# Enable capturing of stderr and csvlog
319
logging_collector = on		# Enable capturing of stderr and csvlog
298 320
					# into log files. Required to be on for
299 321
					# csvlogs.
300 322
					# (change requires restart)
......
324 346
#syslog_facility = 'LOCAL0'
325 347
#syslog_ident = 'postgres'
326 348

  
327
#silent_mode = off			# Run server silently.
328
					# DO NOT USE without syslog or
329
					# logging_collector
330
					# (change requires restart)
349
# This is only relevant when logging to eventlog (win32):
350
#event_source = 'PostgreSQL'
331 351

  
332

  
333 352
# - When to Log -
334 353

  
335 354
#client_min_messages = notice		# values in order of decreasing detail:
......
389 408
#log_duration = off
390 409
#log_error_verbosity = default		# terse, default, or verbose messages
391 410
#log_hostname = off
392
#log_line_prefix = ''			# special values:
411
log_line_prefix = '%t '			# special values:
393 412
					#   %a = application name
394 413
					#   %u = user name
395 414
					#   %d = database name
......
414 433
#log_temp_files = -1			# log temporary files equal or larger
415 434
					# than the specified size in kilobytes;
416 435
					# -1 disables, 0 logs all temp files
417
#log_timezone = '(defaults to server environment setting)'
436
log_timezone = 'US/Pacific'
418 437

  
419 438

  
420 439
#------------------------------------------------------------------------------
......
425 444

  
426 445
#track_activities = on
427 446
#track_counts = on
447
#track_io_timing = off
428 448
#track_functions = none			# none, pl, all
429 449
#track_activity_query_size = 1024 	# (change requires restart)
430 450
#update_process_title = on
......
446 466
#autovacuum = on			# Enable autovacuum subprocess?  'on'
447 467
					# requires track_counts to also be on.
448 468
log_autovacuum_min_duration = 0	# -1 disables, 0 logs all actions and
469
#log_autovacuum_min_duration = -1	# -1 disables, 0 logs all actions and
449 470
					# their durations, > 0 logs only
450 471
					# actions running at least this number
451 472
					# of milliseconds.
......
484 505
#default_transaction_deferrable = off
485 506
#session_replication_role = 'origin'
486 507
#statement_timeout = 0			# in milliseconds, 0 is disabled
508
#lock_timeout = 0			# in milliseconds, 0 is disabled
487 509
#vacuum_freeze_min_age = 50000000
488 510
#vacuum_freeze_table_age = 150000000
489 511
#bytea_output = 'hex'			# hex, escape
......
494 516

  
495 517
datestyle = 'iso, mdy'
496 518
#intervalstyle = 'postgres'
497
#timezone = '(defaults to server environment setting)'
519
timezone = 'US/Pacific'
498 520
#timezone_abbreviations = 'Default'     # Select the set of available time zone
499 521
					# abbreviations.  Currently, there are
500 522
					#   Default
......
507 529
					# encoding
508 530

  
509 531
# These settings are initialized by initdb, but they can be changed.
510
lc_messages = 'en_US.UTF-8'			# locale for system error message
532
lc_messages = 'C'			# locale for system error message
511 533
					# strings
512
lc_monetary = 'en_US.UTF-8'			# locale for monetary formatting
513
lc_numeric = 'en_US.UTF-8'			# locale for number formatting
514
lc_time = 'en_US.UTF-8'				# locale for time formatting
534
lc_monetary = 'C'			# locale for monetary formatting
535
lc_numeric = 'C'			# locale for number formatting
536
lc_time = 'C'				# locale for time formatting
515 537

  
516 538
# default configuration for text search
517 539
default_text_search_config = 'pg_catalog.english'
......
535 557
#max_pred_locks_per_transaction = 64	# min 10
536 558
					# (change requires restart)
537 559

  
560

  
538 561
#------------------------------------------------------------------------------
539 562
# VERSION/PLATFORM COMPATIBILITY
540 563
#------------------------------------------------------------------------------
......
560 583
# ERROR HANDLING
561 584
#------------------------------------------------------------------------------
562 585

  
563
#exit_on_error = off				# terminate session on any error?
564
#restart_after_crash = on			# reinitialize after backend crash?
586
#exit_on_error = off			# terminate session on any error?
587
#restart_after_crash = on		# reinitialize after backend crash?
565 588

  
566 589

  
567 590
#------------------------------------------------------------------------------
591
# CONFIG FILE INCLUDES
592
#------------------------------------------------------------------------------
593

  
594
# These options allow settings to be loaded from files other than the
595
# default postgresql.conf.
596

  
597
#include_dir = 'conf.d'			# include files ending in '.conf' from
598
					# directory 'conf.d'
599
#include_if_exists = 'exists.conf'	# include file only if it exists
600
#include = 'special.conf'		# include file
601

  
602

  
603
#------------------------------------------------------------------------------
568 604
# CUSTOMIZED OPTIONS
569 605
#------------------------------------------------------------------------------
570 606

  
571
#custom_variable_classes = ''		# list of custom variable class names
607
# Add settings for extensions here
schemas/pg_hba.Mac.conf
72 72
# listen on a non-local interface via the listen_addresses
73 73
# configuration parameter, or via the -i or -h command line switches.
74 74

  
75
# CAUTION: Configuring the system for local "trust" authentication
76
# allows any local user to connect as any PostgreSQL user, including
77
# the database superuser.  If you do not trust all your local users,
78
# use another authentication method.
79 75

  
80

  
81 76
# Database administrative login by UNIX sockets
82
local   all         postgres                          ident map=postgres
77
local   all         postgres                          ident
83 78
host    all         postgres    127.0.0.1/32          md5
84 79
host    all         postgres    ::1/128               md5
85 80

  
86 81
# TYPE  DATABASE        USER            ADDRESS                 METHOD
87 82

  
88 83
# "local" is for Unix domain socket connections only
89
#local   all             all                                     trust
84
#local   all             all                                     md5
90 85
# IPv4 local connections:
91
#host    all             all             127.0.0.1/32            trust
86
#host    all             all             127.0.0.1/32            md5
92 87
# IPv6 local connections:
93
#host    all             all             ::1/128                 trust
88
#host    all             all             ::1/128                 md5
94 89
# Allow replication connections from localhost, by a user with the
95 90
# replication privilege.
96
#local   replication     postgres                                trust
97
#host    replication     postgres        127.0.0.1/32            trust
98
#host    replication     postgres        ::1/128                 trust
91
#local   replication     postgres                                md5
92
#host    replication     postgres        127.0.0.1/32            md5
93
#host    replication     postgres        ::1/128                 md5
99 94

  
100 95
local   template1,vegbien  public_           trust
101 96
host    template1,vegbien  public_ 0.0.0.0/0 trust
lib/common.Makefile
87 87
remote := $(remote_user)@$(remote_host):$(remote_basepath)/$(localDirName)/
88 88

  
89 89
# DB
90
postgres := $(if $(isMac),_)postgres
90
postgres := postgres
91 91
asAdmin := sudo -E -u $(postgres)
92 92
psqlOpts := --set ON_ERROR_STOP=1 --quiet
93 93
psqlAsAdmin := $(asAdmin) psql -U postgres $(psqlOpts)
Makefile
142 142
asBien := sudo -E -u bien
143 143
pgVersion = "$$(env minor=1 bin/pg_version)"
144 144

  
145
linuxPostgresDir := /etc/postgresql/9.1/main
145
linuxPostgresDir := /etc/postgresql/9.3/main
146 146
define pg_ctl-Linux
147 147
$(asAdmin) /etc/init.d/postgresql $(1)
148 148
endef
149 149

  
150
macPostgresDir := /Library/PostgreSQL/9.1
150
macPostgresDir := /Library/PostgreSQL/9.3
151 151
define macUsePostgresLib
152 152
sudo mv $(libDest) $(libDest).old||sudo rm -f $(libDest)
153 153
sudo ln -s $(macPostgresDir)/lib/$(1) $(libDest)
......
160 160
macPostgresLibs := $(macPostgresLibs:%=%.dylib)
161 161

  
162 162
define pg_ctl-Darwin
163
$(asAdmin) pg_ctl -D $(macPostgresDir)/data -l $(macPostgresDir)/postgres.log $(1)
163
$(asAdmin) pg_ctl -D $(macPostgresDir)/data -l $(macPostgresDir)/data/postgres.log $(1)
164 164
sleep 2
165 165
endef
166 166

  

Also available in: Unified diff