Merge pull request #760 from nextcloud/feat/HaRP/AIO

fix(HaRP-AIO): FRP should be always disabled for the HaRP AIO template

Author: oleksandr-nc

js/app_api-adminSettings.js

@@ -133,10 +133,10 @@
 								<NcFormBoxSwitch
 									v-model="deployConfig.harp.exapp_direct"
 									class="switch"
-									:disabled="isEdit">
+									:disabled="isEdit || isHarpAio">
 									{{ t('app_api', 'Disable FRP') }}
 								</NcFormBoxSwitch>
-								<InfoTooltip :text="t('app_api', 'Flag for advanced setups only. Disables the FRP tunnel between ExApps and HaRP.')" />
+								<InfoTooltip :text="isHarpAio ? t('app_api', 'FRP is always disabled for the All-in-One setup.') : t('app_api', 'Flag for advanced setups only. Disables the FRP tunnel between ExApps and HaRP.')" />
 							</div>
 						</div>
 						<template v-if="!isPureManual">
@@ -533,6 +533,9 @@ export default {
 		isHarp() {
 			return this.deployConfig.harp !== null
 		},
+		isHarpAio() {
+			return this.configurationTab?.id === 'harp_aio'
+		},
 		isPureManual() {
 			return this.acceptsDeployId === 'manual-install' && !this.isHarp
 		},

js/app_api-adminSettings.js.map

@@ -82,7 +82,7 @@ export const DAEMON_TEMPLATES = [
 			harp: {
 				frp_address: 'nextcloud-aio-harp:8782',
 				docker_socket_port: 24000,
-				exapp_direct: false,
+				exapp_direct: true,
 			},
 		},
 		deployConfigSettingsOpened: false,