merge: fix make sure that signToActivityPubGet defaults to true (#352)
Reviewed-on: https://git.joinsharkey.org/Sharkey/Sharkey/pulls/352 Reviewed-by: dakkar <dakkar@noreply.git.joinshakrey.org>
This commit is contained in:
		
						commit
						0d766a6310
					
				
					 1 changed files with 2 additions and 2 deletions
				
			
		| 
						 | 
					@ -149,7 +149,7 @@ export type Config = {
 | 
				
			||||||
	inboxJobMaxAttempts: number | undefined;
 | 
						inboxJobMaxAttempts: number | undefined;
 | 
				
			||||||
	proxyRemoteFiles: boolean | undefined;
 | 
						proxyRemoteFiles: boolean | undefined;
 | 
				
			||||||
	customMOTD: string[] | undefined;
 | 
						customMOTD: string[] | undefined;
 | 
				
			||||||
	signToActivityPubGet: boolean | undefined;
 | 
						signToActivityPubGet: boolean;
 | 
				
			||||||
	checkActivityPubGetSignature: boolean | undefined;
 | 
						checkActivityPubGetSignature: boolean | undefined;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	version: string;
 | 
						version: string;
 | 
				
			||||||
| 
						 | 
					@ -265,7 +265,7 @@ export function loadConfig(): Config {
 | 
				
			||||||
		inboxJobMaxAttempts: config.inboxJobMaxAttempts,
 | 
							inboxJobMaxAttempts: config.inboxJobMaxAttempts,
 | 
				
			||||||
		proxyRemoteFiles: config.proxyRemoteFiles,
 | 
							proxyRemoteFiles: config.proxyRemoteFiles,
 | 
				
			||||||
		customMOTD: config.customMOTD,
 | 
							customMOTD: config.customMOTD,
 | 
				
			||||||
		signToActivityPubGet: config.signToActivityPubGet,
 | 
							signToActivityPubGet: config.signToActivityPubGet ?? true,
 | 
				
			||||||
		checkActivityPubGetSignature: config.checkActivityPubGetSignature,
 | 
							checkActivityPubGetSignature: config.checkActivityPubGetSignature,
 | 
				
			||||||
		mediaProxy: externalMediaProxy ?? internalMediaProxy,
 | 
							mediaProxy: externalMediaProxy ?? internalMediaProxy,
 | 
				
			||||||
		externalMediaProxyEnabled: externalMediaProxy !== null && externalMediaProxy !== internalMediaProxy,
 | 
							externalMediaProxyEnabled: externalMediaProxy !== null && externalMediaProxy !== internalMediaProxy,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue