Project

General

Profile

« Previous | Next » 

Revision 6503

root Makefile: $(postgresReload-*): Confirm the operation before continuing, since it involves changing PostgreSQL config files in nontrivial ways. Added instructions for setting kernel.shmmax to at least 4GB minus 1 byte on Linux, to work with the shared_buffers setting in postgresql.conf.

View differences:

Makefile
167 167
sleep 2
168 168
endef
169 169

  
170
confirmPostgresReload = $(call confirm,Modifying postgresql.conf and pg_hba.conf)
171

  
170 172
define postgresReload-Linux
173
@$(confirmPostgresReload)
174
@echo $(emph)'kernel.shmmax must be set to at least 4GB minus 1 byte:'$(endEmph)
175
@echo 'Append the following to /etc/sysctl.conf:'
176
@echo 'kernel.shmmax=4294967295'
177
@$(wait)
171 178
chmod a+r schemas/*.conf || $(asBien) chmod a+r schemas/*.conf
172 179
$(asAdmin) mv -n $(linuxPostgresDir)/postgresql.conf $(linuxPostgresDir)/postgresql.conf.old
173 180
$(asAdmin) cp --preserve=timestamps schemas/postgresql.conf $(linuxPostgresDir)/postgresql.conf
......
178 185
endef
179 186

  
180 187
define postgresReload-Darwin
188
@$(confirmPostgresReload)
181 189
chmod a+r schemas/*.conf
182 190
$(asAdmin) mv -n $(macPostgresDir)/data/postgresql.conf $(macPostgresDir)/data/postgresql.conf.old
183 191
$(asAdmin) cp schemas/postgresql.Mac.conf $(macPostgresDir)/data/postgresql.conf
......
202 210
	$(if $(nonApacheOnPort80),$(editApachePortsConf))
203 211
	-sudo apache2ctl restart
204 212
	-sudo pip install psycopg2
205
	$(postgresReload-Linux)
213
	-$(MAKE) $(postgresReload-Linux)
206 214
# run pg_version inline because it needs postgresql to be installed first
207 215
# ignore errors if conf files already edited
208 216

  
......
213 221
	@echo 'Run the installer in it'
214 222
	@$(wait)
215 223
	$(foreach lib,$(macPostgresLibs),$(call macUsePostgresLib,$(lib)))
216
	$(postgresReload-Darwin)
224
	-$(MAKE) $(postgresReload-Darwin)
217 225

  
218 226
postgres-: _always ; # other OSes
219 227

  

Also available in: Unified diff