mirror of
				https://github.com/zulip/docker-zulip.git
				synced 2025-11-04 05:53:19 +00:00 
			
		
		
		
	Merge branch 'dev'
This commit is contained in:
		@@ -37,6 +37,7 @@ export ZULIP_USER_EMAIL="${ZULIP_USER_EMAIL:-}"
 | 
				
			|||||||
export ZULIP_USER_PASSWORD="${ZULIP_USER_PASSWORD:-zulip}"
 | 
					export ZULIP_USER_PASSWORD="${ZULIP_USER_PASSWORD:-zulip}"
 | 
				
			||||||
export ZULIP_USER_PASS="${ZULIP_USER_PASS:-$(echo $ZULIP_USER_PASSWORD)}"
 | 
					export ZULIP_USER_PASS="${ZULIP_USER_PASS:-$(echo $ZULIP_USER_PASSWORD)}"
 | 
				
			||||||
# Zulip certifcate parameters
 | 
					# Zulip certifcate parameters
 | 
				
			||||||
 | 
					ZULIP_AUTO_GENERATE_CERTS="${ZULIP_AUTO_GENERATE_CERTS:True}"
 | 
				
			||||||
ZULIP_CERTIFICATE_SUBJ="${ZULIP_CERTIFICATE_SUBJ:-}"
 | 
					ZULIP_CERTIFICATE_SUBJ="${ZULIP_CERTIFICATE_SUBJ:-}"
 | 
				
			||||||
ZULIP_CERTIFICATE_C="${ZULIP_CERTIFICATE_C:-US}"
 | 
					ZULIP_CERTIFICATE_C="${ZULIP_CERTIFICATE_C:-US}"
 | 
				
			||||||
ZULIP_CERTIFICATE_ST="${ZULIP_CERTIFICATE_ST:-Denial}"
 | 
					ZULIP_CERTIFICATE_ST="${ZULIP_CERTIFICATE_ST:-Denial}"
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user