mirror of
				https://github.com/zulip/zulip.git
				synced 2025-11-04 14:03:30 +00:00 
			
		
		
		
	
				
					committed by
					
						
						Alex Vandiver
					
				
			
			
				
	
			
			
			
						parent
						
							f799190bea
						
					
				
				
					commit
					e311b372cb
				
			@@ -52,8 +52,8 @@ as well as those mentioned in the
 | 
			
		||||
[install](install.md#installer-options) documentation:
 | 
			
		||||
 | 
			
		||||
- `--postgresql-version`: Sets the version of PostgreSQL that will be
 | 
			
		||||
  installed. We currently support PostgreSQL 12, 13, 14, and 15, with 15 being
 | 
			
		||||
  the default.
 | 
			
		||||
  installed. We currently support PostgreSQL 12, 13, 14, 15, and 16, with 16
 | 
			
		||||
  being the default.
 | 
			
		||||
 | 
			
		||||
- `--postgresql-database-name=exampledbname`: With this option, you
 | 
			
		||||
  can customize the default database name. If you do not set this. The
 | 
			
		||||
 
 | 
			
		||||
@@ -1,8 +1,8 @@
 | 
			
		||||
# PostgreSQL database details
 | 
			
		||||
 | 
			
		||||
Starting with Zulip 3.0, Zulip supports a range of PostgreSQL
 | 
			
		||||
versions. PostgreSQL 15 is the current default for new installations;
 | 
			
		||||
PostgreSQL 12, 13, 14, and 15 are all supported.
 | 
			
		||||
versions. PostgreSQL 16 is the current default for new installations;
 | 
			
		||||
PostgreSQL 12, 13, 14, 15, and 16 are all supported.
 | 
			
		||||
 | 
			
		||||
Previous versions of Zulip used whatever version of PostgreSQL was
 | 
			
		||||
included with the base operating system (E.g. PostgreSQL 12 on Ubuntu
 | 
			
		||||
 
 | 
			
		||||
@@ -40,7 +40,7 @@ class zulip::profile::postgresql {
 | 
			
		||||
      mode    => '0644',
 | 
			
		||||
      content => template("zulip/postgresql/${version}/postgresql.conf.template.erb"),
 | 
			
		||||
    }
 | 
			
		||||
  } elsif $version in ['15'] {
 | 
			
		||||
  } elsif $version in ['15', '16'] {
 | 
			
		||||
    $postgresql_conf_file = "${zulip::postgresql_base::postgresql_confdir}/conf.d/zulip.conf"
 | 
			
		||||
    file { $postgresql_conf_file:
 | 
			
		||||
      ensure  => file,
 | 
			
		||||
 
 | 
			
		||||
@@ -32,7 +32,7 @@ Options:
 | 
			
		||||
      Sets the PostgreSQL database name.
 | 
			
		||||
  --postgresql-database-user=zulip
 | 
			
		||||
      Sets the PostgreSQL database user.
 | 
			
		||||
  --postgresql-version=15
 | 
			
		||||
  --postgresql-version=16
 | 
			
		||||
      Sets the version of PostgreSQL that will be installed.
 | 
			
		||||
  --postgresql-missing-dictionaries
 | 
			
		||||
      Set postgresql.missing_dictionaries, which alters the initial database.  Use with
 | 
			
		||||
@@ -152,7 +152,7 @@ read -r -a ADDITIONAL_PACKAGES <<<"${ADDITIONAL_PACKAGES:-}"
 | 
			
		||||
# e.g. zulip::profile::app_frontend for a Zulip frontend server.
 | 
			
		||||
PUPPET_CLASSES="${PUPPET_CLASSES:-zulip::profile::standalone}"
 | 
			
		||||
VIRTUALENV_NEEDED="${VIRTUALENV_NEEDED:-yes}"
 | 
			
		||||
POSTGRESQL_VERSION="${POSTGRESQL_VERSION:-15}"
 | 
			
		||||
POSTGRESQL_VERSION="${POSTGRESQL_VERSION:-16}"
 | 
			
		||||
 | 
			
		||||
if [ -n "$SELF_SIGNED_CERT" ] && [ -n "$USE_CERTBOT" ]; then
 | 
			
		||||
    set +x
 | 
			
		||||
 
 | 
			
		||||
@@ -12,7 +12,7 @@ export LC_ALL=C.UTF-8
 | 
			
		||||
export LANG=C.UTF-8
 | 
			
		||||
export LANGUAGE=C.UTF-8
 | 
			
		||||
 | 
			
		||||
LATEST_SUPPORTED_VERSION=15
 | 
			
		||||
LATEST_SUPPORTED_VERSION=16
 | 
			
		||||
UPGRADE_TO=${1:-$LATEST_SUPPORTED_VERSION}
 | 
			
		||||
UPGRADE_FROM=$(crudini --get /etc/zulip/zulip.conf postgresql version)
 | 
			
		||||
ZULIP_PATH="$(dirname "$0")/../.."
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user