Skip to content

Commit 3528f3a

Browse files
authored
Merge pull request #702 from nextcloud/enh/noid/strings
Enh/noid/strings
2 parents d1bebf9 + 9bc6362 commit 3528f3a

17 files changed

+110
-110
lines changed

js/app_api-adminSettings.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/app_api-adminSettings.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/Command/Daemon/AddRegistry.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function __construct(
2727

2828
protected function configure(): void {
2929
$this->setName('app_api:daemon:registry:add');
30-
$this->setDescription('Add Deploy daemon Docker registry mapping');
30+
$this->setDescription('Add deploy daemon Docker registry mapping');
3131
$this->addArgument('name', InputArgument::REQUIRED, 'Deploy daemon name');
3232
$this->addOption('registry-from', null, InputOption::VALUE_REQUIRED, 'Deploy daemon registry from URL');
3333
$this->addOption('registry-to', null, InputOption::VALUE_REQUIRED, 'Deploy daemon registry to URL');

lib/Command/Daemon/ListRegistry.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public function __construct(
2525

2626
protected function configure(): void {
2727
$this->setName('app_api:daemon:registry:list');
28-
$this->setDescription('List configured Deploy daemon Docker registry mappings');
28+
$this->setDescription('List the configured deploy daemon Docker registry mappings');
2929
$this->addArgument('name', InputArgument::REQUIRED, 'Deploy daemon name');
3030
}
3131

lib/Command/Daemon/RegisterDaemon.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,18 @@ protected function configure(): void {
3636
$this->addArgument('display-name', InputArgument::REQUIRED);
3737
$this->addArgument('accepts-deploy-id', InputArgument::REQUIRED, 'The deployment method that the daemon accepts. Can be "manual-install" or "docker-install". "docker-install" is for Docker Socket Proxy and HaRP.');
3838
$this->addArgument('protocol', InputArgument::REQUIRED, 'The protocol used to connect to the daemon. Can be "http" or "https".');
39-
$this->addArgument('host', InputArgument::REQUIRED, 'The hostname (and port) or path at which the docker socket proxy or harp or the manual-install app is/would be available. This need not be a public host, just a host accessible by the Nextcloud server. It can also be a path to the docker socket. (e.g. appapi-harp:8780, /var/run/docker.sock)');
39+
$this->addArgument('host', InputArgument::REQUIRED, 'The hostname (and port) or path at which the Docker socket proxy or HaRP or the manual-install app is/would be available. This does not need to be a public host, just a host accessible by the Nextcloud server. It can also be a path to the Docker socket. (e.g. appapi-harp:8780, /var/run/docker.sock)');
4040
$this->addArgument('nextcloud_url', InputArgument::REQUIRED);
4141

4242
// daemon-config settings
43-
$this->addOption('net', null, InputOption::VALUE_REQUIRED, 'The name of the docker network the ex-apps installed by this daemon should use. Default is "host".');
44-
$this->addOption('haproxy_password', null, InputOption::VALUE_REQUIRED, 'AppAPI Docker Socket Proxy password for HAProxy Basic auth. Only for docker socket proxy daemon.');
45-
$this->addOption('compute_device', null, InputOption::VALUE_REQUIRED, 'Compute device for GPU support (cpu|cuda|rocm)');
43+
$this->addOption('net', null, InputOption::VALUE_REQUIRED, 'The name of the Docker network the ex-apps installed by this daemon should use. Default is "host".');
44+
$this->addOption('haproxy_password', null, InputOption::VALUE_REQUIRED, 'AppAPI Docker Socket Proxy password for HAProxy Basic auth. Only for Docker Socket Proxy daemons.');
45+
$this->addOption('compute_device', null, InputOption::VALUE_REQUIRED, 'Computation device for GPU support (cpu|cuda|rocm)');
4646
$this->addOption('set-default', null, InputOption::VALUE_NONE, 'Set DaemonConfig as default');
47-
$this->addOption('harp', null, InputOption::VALUE_NONE, 'Set daemon to use HaRP for all docker and exapp communication');
48-
$this->addOption('harp_frp_address', null, InputOption::VALUE_REQUIRED, '[host]:[port] of the HaRP FRP server, default host is same as HaRP host and port is 8782');
47+
$this->addOption('harp', null, InputOption::VALUE_NONE, 'Set the daemon to use HaRP for all Docker and ExApp communication');
48+
$this->addOption('harp_frp_address', null, InputOption::VALUE_REQUIRED, '[host]:[port] of the HaRP FRP server, the default host is same as the HaRP host, port is 8782');
4949
$this->addOption('harp_shared_key', null, InputOption::VALUE_REQUIRED, 'HaRP shared key for secure communication between HaRP and AppAPI');
50-
$this->addOption('harp_docker_socket_port', null, InputOption::VALUE_REQUIRED, '\'remotePort\' of the FRP client of the remote docker socket proxy. There is one included in the harp container so this can be skipped for default setups.', '24000');
50+
$this->addOption('harp_docker_socket_port', null, InputOption::VALUE_REQUIRED, '\'remotePort\' of the FRP client of the remote Docker socket proxy. There is one included in the harp container so this can be skipped for default setups.', '24000');
5151
$this->addOption('harp_exapp_direct', null, InputOption::VALUE_NONE, 'Flag for the advanced setups only. Disables the FRP tunnel between ExApps and HaRP.');
5252

5353
$this->addUsage('harp_proxy_docker "Harp Proxy (Docker)" "docker-install" "http" "appapi-harp:8780" "http://nextcloud.local" --net nextcloud --harp --harp_frp_address "appapi-harp:8782" --harp_shared_key "some_very_secure_password" --set-default --compute_device=cuda');
@@ -82,7 +82,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
8282
}
8383

8484
if ($this->daemonConfigService->getDaemonConfigByName($name) !== null) {
85-
$output->writeln(sprintf('Skip registration, as daemon config `%s` already registered.', $name));
85+
$output->writeln(sprintf('Registration skipped, as the daemon config `%s` already exists.', $name));
8686
return 0;
8787
}
8888

@@ -115,15 +115,15 @@ protected function execute(InputInterface $input, OutputInterface $output): int
115115
]);
116116

117117
if ($daemonConfig === null) {
118-
$output->writeln('Failed to register daemon.');
118+
$output->writeln('Failed to register the daemon config.');
119119
return 1;
120120
}
121121

122122
if ($input->getOption('set-default')) {
123123
$this->config->setAppValue(Application::APP_ID, 'default_daemon_config', $daemonConfig->getName());
124124
}
125125

126-
$output->writeln('Daemon successfully registered.');
126+
$output->writeln('Daemon config successfully registered.');
127127
return 0;
128128
}
129129

lib/Command/Daemon/RemoveRegistry.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function __construct(
2727

2828
protected function configure(): void {
2929
$this->setName('app_api:daemon:registry:remove');
30-
$this->setDescription('Remove Deploy daemon Docker registry mapping');
30+
$this->setDescription('Remove deploy daemon Docker registry mapping');
3131
$this->addArgument('name', InputArgument::REQUIRED, 'Deploy daemon name');
3232
$this->addOption('registry-from', null, InputOption::VALUE_REQUIRED, 'Deploy daemon registry from URL');
3333
$this->addOption('registry-to', null, InputOption::VALUE_REQUIRED, 'Deploy daemon registry to URL');

lib/Service/ExAppsPageService.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function provideAppApiState(IInitialState $initialState): void {
5353
$this->dockerActions->initGuzzleClient($daemonConfig);
5454
$daemonConfigAccessible = $this->dockerActions->ping($this->dockerActions->buildDockerUrl($daemonConfig));
5555
if (!$daemonConfigAccessible) {
56-
$this->logger->warning(sprintf('Deploy daemon "%s" is not accessible by Nextcloud. Please verify its configuration', $daemonConfig->getName()));
56+
$this->logger->warning(sprintf('Deploy daemon "%s" is not accessible by Nextcloud. Please check its configuration', $daemonConfig->getName()));
5757
}
5858
}
5959
}

lib/Settings/Admin.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function getForm(): TemplateResponse {
4646
$daemonConfigAccessible = $this->dockerActions->ping($this->dockerActions->buildDockerUrl($daemonConfig));
4747
$adminInitialData['daemon_config_accessible'] = $daemonConfigAccessible;
4848
if (!$daemonConfigAccessible) {
49-
$this->logger->error(sprintf('Deploy daemon "%s" is not accessible by Nextcloud. Please verify its configuration', $daemonConfig->getName()));
49+
$this->logger->error(sprintf('Deploy daemon "%s" is not accessible by Nextcloud. Please check its configuration', $daemonConfig->getName()));
5050
}
5151
}
5252
}

lib/SetupChecks/DaemonCheck.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public function run(): SetupResult {
6262
$this->dockerActions->initGuzzleClient($daemonConfig);
6363
$daemonConfigAccessible = $this->dockerActions->ping($this->dockerActions->buildDockerUrl($daemonConfig));
6464
if (!$daemonConfigAccessible) {
65-
$this->logger->error(sprintf('Deploy daemon "%s" is not accessible by Nextcloud. Please verify its configuration', $daemonConfig->getName()));
65+
$this->logger->error(sprintf('Deploy daemon "%s" is not accessible by Nextcloud. Please check its configuration', $daemonConfig->getName()));
6666
return SetupResult::error(
6767
$this->l10n->t('AppAPI default deploy daemon "%s" is not accessible. Please check the daemon configuration.', ['daemon' => $daemonConfig->getName()]),
6868
"https://docs.nextcloud.com/server/$serverVer/admin_manual/exapps_management/AppAPIAndExternalApps.html#setup-deploy-daemon",
@@ -71,7 +71,7 @@ public function run(): SetupResult {
7171

7272
if (!boolval($daemonConfig->getDeployConfig()['harp'] ?? false)) {
7373
return SetupResult::warning(
74-
$this->l10n->t('AppAPI default deploy daemon is not using HaRP. Please consider upgrading to it for better performance.'),
74+
$this->l10n->t('The AppAPI default deploy daemon is not using HaRP. Please consider switching to HaRP for better performance.'),
7575
// todo: update link
7676
"https://github.com/nextcloud/HaRP/",
7777
);

src/components/AdminSettings.vue

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
<p>{{ t('app_api', 'The AppAPI Project is an exciting initiative that aims to revolutionize the way applications are developed for Nextcloud through the use of docker containers. Allowing for greater programming language choice and allowing computationally expensive tasks to be offloaded to a different server.') }}</p>
1313
</div>
1414
<NcSettingsSection
15-
:name="t('app_api', 'Deploy Daemons')"
16-
:description="t('app_api', 'Deploy Daemon (DaemonConfig) is an ExApps orchestration daemon.')"
17-
:aria-label="t('app_api', 'Deploy Daemons. Deploy Daemon (DaemonConfig) is an ExApps orchestration daemon.')"
15+
:name="t('app_api', 'Deploy daemons')"
16+
:description="t('app_api', 'A deploy daemon (DaemonConfig) is an ExApps orchestration daemon.')"
17+
:aria-label="t('app_api', 'Deploy daemons. A deploy daemon (DaemonConfig) is an ExApps orchestration daemon.')"
1818
doc-url="https://docs.nextcloud.com/server/latest/admin_manual/exapps_management/AppAPIAndExternalApps.html#setup-deploy-daemon">
1919
<NcNoteCard v-if="state.default_daemon_config !== '' && !state?.daemon_config_accessible" type="error">
20-
<p>{{ t('app_api', 'Default Deploy Daemon is not accessible. Please verify its configuration') }}</p>
20+
<p>{{ t('app_api', 'Default deploy daemon is not accessible. Please check its configuration') }}</p>
2121
</NcNoteCard>
2222
<DaemonConfigList :daemons.sync="daemons" :default-daemon.sync="default_daemon_config" :save-options="saveOptions" />
2323
</NcSettingsSection>
@@ -33,10 +33,10 @@
3333
</NcSettingsSection>
3434
<NcSettingsSection
3535
:name="t('app_api', 'ExApp container restart policy')"
36-
:description="t('app_api', 'Specify container restart policy, e.g. \'always\' to ensure ExApp running after daemon server reboot')"
36+
:description="t('app_api', 'Choose the container restart policy, e.g. \'always\' to ensure ExApps will be running after a daemon server reboot')"
3737
:aria-label="t('app_api', 'ExApp container restart policy')">
3838
<NcNoteCard type="info">
39-
{{ t('app_api', 'This settings changes are reflected only for newly created containers') }}
39+
{{ t('app_api', 'This settings changes are effective only for newly created containers') }}
4040
</NcNoteCard>
4141
<NcSelect
4242
v-model="state.container_restart_policy"

0 commit comments

Comments
 (0)