Resolve Concelier/Excititor merge conflicts
This commit is contained in:
		
							
								
								
									
										0
									
								
								etc/secrets/.gitkeep
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								etc/secrets/.gitkeep
									
									
									
									
									
										Normal file
									
								
							
							
								
								
									
										3
									
								
								etc/secrets/notify-web-dev.secret.example
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								etc/secrets/notify-web-dev.secret.example
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,3 @@ | ||||
| # Replace this file with the actual client secret for the notify-web-dev Authority client. | ||||
| # Store the secret with restrictive permissions (chmod 600) and mount/read-only in deployments. | ||||
| NOTIFY_WEB_DEV_CLIENT_SECRET=change-me-dev | ||||
							
								
								
									
										3
									
								
								etc/secrets/notify-web.secret.example
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								etc/secrets/notify-web.secret.example
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,3 @@ | ||||
| # Replace this file with the production client secret for the notify-web Authority client. | ||||
| # Keep outside source control and mount via secrets manager in Kubernetes/offline kit bundles. | ||||
| NOTIFY_WEB_CLIENT_SECRET=change-me-prod | ||||
		Reference in New Issue
	
	Block a user