Skip to content
Snippets Groups Projects
Commit cfb13044 authored by Robert Marshall's avatar Robert Marshall
Browse files

Merge branch 'cb-default-to-pg16' into 'master'

parents 43bafd3b 31d62c27
No related branches found
No related tags found
No related merge requests found
......@@ -58,16 +58,6 @@
make "world -j #{workers}", env: env
make 'install-world', env: env
# NOTE: There are several dependencies which require these files in these
# locations and have dependency on `postgresql_new`. So when this block is
# changed to be in the `postgresql` software definition for default PG
# version changes, change those dependencies to `postgresql`.
block 'link bin files' do
Dir.glob("#{prefix}/bin/*").each do |bin_file|
link bin_file, "#{install_dir}/embedded/bin/#{File.basename(bin_file)}"
end
end
end
# exclude headers and static libraries from package
......
......@@ -60,6 +60,16 @@
libpq = 'libpq.so.5'
link "#{prefix}/lib/#{libpq}", "#{install_dir}/embedded/lib/#{libpq}"
# NOTE: There are several dependencies which require these files in these
# locations and have dependency on `postgresql_new`. So when this block is
# changed to be in the `postgresql` software definition for default PG
# version changes, change those dependencies to `postgresql`.
block 'link bin files' do
Dir.glob("#{prefix}/bin/*").each do |bin_file|
link bin_file, "#{install_dir}/embedded/bin/#{File.basename(bin_file)}"
end
end
end
# exclude headers and static libraries from package
......
......@@ -48,7 +48,7 @@
#### Automatic restart when the PostgreSQL version changes
By default, Linux package installations automatically restart PostgreSQL when the underlying
version changes, as suggested by the [upstream documentation](https://www.postgresql.org/docs/14/upgrading.html).
version changes, as suggested by the [upstream documentation](https://www.postgresql.org/docs/16/upgrading.html).
This behavior can be controlled using the `auto_restart_on_version_change` setting
available for `postgresql` and `geo-postgresql`.
......@@ -82,7 +82,7 @@
Linux package installations automatically enable SSL on the PostgreSQL server, but it will accept
both encrypted and unencrypted connections by default. Enforcing SSL requires
using the `hostssl` configuration in `pg_hba.conf`. For more details, see the
[`pg_hba.conf` documentation](https://www.postgresql.org/docs/14/auth-pg-hba-conf.html).
[`pg_hba.conf` documentation](https://www.postgresql.org/docs/16/auth-pg-hba-conf.html).
SSL support depends on the following files:
......@@ -101,7 +101,7 @@
the files for you, but if the paths are customized, you *must* ensure that the
`gitlab-psql` can access the directory in the files are placed in.
For more details, see the [PostgreSQL documentation](https://www.postgresql.org/docs/11/ssl-tcp.html).
For more details, see the [PostgreSQL documentation](https://www.postgresql.org/docs/16/ssl-tcp.html).
Note that `server.crt` and `server.key` may be different from the default SSL
certificates used to access GitLab. For example, suppose the external hostname
......
......@@ -755,7 +755,7 @@
end
def default_version
PGVersion.parse(version_from_manifest('postgresql'))
PGVersion.parse(version_from_manifest('postgresql_new')) || PGVersion.parse(version_from_manifest('postgresql'))
end
def new_version
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment