This is an automated email from the ASF dual-hosted git repository. trohrmann pushed a commit to branch release-1.12 in repository https://gitbox.apache.org/repos/asf/flink.git
commit 93b07566c75e856f5d701dd2ab28af818b2a17e6 Author: Till Rohrmann <[email protected]> AuthorDate: Tue Nov 24 18:30:16 2020 +0100 [FLINK-20342][docs] Group ssl and kerberos documentation page under security --- docs/dev/connectors/kafka.md | 2 +- docs/dev/connectors/kafka.zh.md | 2 +- docs/ops/config.md | 4 ++-- docs/ops/config.zh.md | 4 ++-- docs/ops/jobmanager_high_availability.md | 2 +- docs/ops/jobmanager_high_availability.zh.md | 2 +- docs/ops/security/index.md | 24 ++++++++++++++++++++++++ docs/ops/security/index.zh.md | 24 ++++++++++++++++++++++++ docs/ops/{ => security}/security-kerberos.md | 4 ++-- docs/ops/{ => security}/security-kerberos.zh.md | 4 ++-- docs/ops/{ => security}/security-ssl.md | 4 ++-- docs/ops/{ => security}/security-ssl.zh.md | 4 ++-- 12 files changed, 64 insertions(+), 16 deletions(-) diff --git a/docs/dev/connectors/kafka.md b/docs/dev/connectors/kafka.md index 74f03e4..a0a818e 100644 --- a/docs/dev/connectors/kafka.md +++ b/docs/dev/connectors/kafka.md @@ -544,7 +544,7 @@ When using standalone Flink deployment, you can also use `SASL_SSL`; please see A mismatch in service name between client and server configuration will cause the authentication to fail. For more information on Flink configuration for Kerberos security, please see [here]({{ site.baseurl}}/ops/config.html). -You can also find [here]({{ site.baseurl}}/ops/security-kerberos.html) further details on how Flink internally setups Kerberos-based security. +You can also find [here]({{ site.baseurl}}/ops/security/security-kerberos.html) further details on how Flink internally setups Kerberos-based security. ## Upgrading to the Latest Connector Version diff --git a/docs/dev/connectors/kafka.zh.md b/docs/dev/connectors/kafka.zh.md index 7c48571..afdbc90 100644 --- a/docs/dev/connectors/kafka.zh.md +++ b/docs/dev/connectors/kafka.zh.md @@ -463,7 +463,7 @@ Flink 通过 Kafka 连接器提供了一流的支持，可以对 Kerberos 配置 - 将 `security.protocol` 设置为 `SASL_PLAINTEXT`（默认为 `NONE`）：用于与 Kafka broker 进行通信的协议。使用独立 Flink 部署时，也可以使用 `SASL_SSL`；请在[此处](https://kafka.apache.org/documentation/#security_configclients)查看如何为 SSL 配置 Kafka 客户端。 - 将 `sasl.kerberos.service.name` 设置为 `kafka`（默认为 `kafka`）：此值应与用于 Kafka broker 配置的 `sasl.kerberos.service.name` 相匹配。客户端和服务器配置之间的服务名称不匹配将导致身份验证失败。 -有关 Kerberos 安全性 Flink 配置的更多信息，请参见[这里]({% link ops/config.zh.md %})。你也可以在[这里]({% link ops/security-kerberos.zh.md %})进一步了解 Flink 如何在内部设置基于 kerberos 的安全性。 +有关 Kerberos 安全性 Flink 配置的更多信息，请参见[这里]({% link ops/config.zh.md %})。你也可以在[这里]({% link ops/security/security-kerberos.zh.md %})进一步了解 Flink 如何在内部设置基于 kerberos 的安全性。 <a name="upgrading-to-the-latest-connector-version"></a> diff --git a/docs/ops/config.md b/docs/ops/config.md index d39a677..bc9b5ac 100644 --- a/docs/ops/config.md +++ b/docs/ops/config.md @@ -175,7 +175,7 @@ Options for configuring Flink's security and secure interaction with external sy ### SSL -Flink's network connections can be secured via SSL. Please refer to the [SSL Setup Docs]({% link ops/security-ssl.md %}) for detailed setup guide and background. +Flink's network connections can be secured via SSL. Please refer to the [SSL Setup Docs]({% link ops/security/security-ssl.md %}) for detailed setup guide and background. {% include generated/security_ssl_section.html %} @@ -190,7 +190,7 @@ These options are necessary when connecting to a secured ZooKeeper quorum. **Kerberos-based Authentication / Authorization** -Please refer to the [Flink and Kerberos Docs]({% link ops/security-kerberos.md %}) for a setup guide and a list of external system to which Flink can authenticate itself via Kerberos. +Please refer to the [Flink and Kerberos Docs]({% link ops/security/security-kerberos.md %}) for a setup guide and a list of external system to which Flink can authenticate itself via Kerberos. {% include generated/security_auth_kerberos_section.html %} diff --git a/docs/ops/config.zh.md b/docs/ops/config.zh.md index 0b2e4ba..6a14f49 100644 --- a/docs/ops/config.zh.md +++ b/docs/ops/config.zh.md @@ -175,7 +175,7 @@ Options for configuring Flink's security and secure interaction with external sy ### SSL -Flink's network connections can be secured via SSL. Please refer to the [SSL Setup Docs]({% link ops/security-ssl.zh.md %}) for detailed setup guide and background. +Flink's network connections can be secured via SSL. Please refer to the [SSL Setup Docs]({% link ops/security/security-ssl.zh.md %}) for detailed setup guide and background. {% include generated/security_ssl_section.html %} @@ -190,7 +190,7 @@ These options are necessary when connecting to a secured ZooKeeper quorum. **Kerberos-based Authentication / Authorization** -Please refer to the [Flink and Kerberos Docs]({% link ops/security-kerberos.zh.md %}) for a setup guide and a list of external system to which Flink can authenticate itself via Kerberos. +Please refer to the [Flink and Kerberos Docs]({% link ops/security/security-kerberos.zh.md %}) for a setup guide and a list of external system to which Flink can authenticate itself via Kerberos. {% include generated/security_auth_kerberos_section.html %} diff --git a/docs/ops/jobmanager_high_availability.md b/docs/ops/jobmanager_high_availability.md index e9bf405..f0b1fa6 100644 --- a/docs/ops/jobmanager_high_availability.md +++ b/docs/ops/jobmanager_high_availability.md @@ -302,7 +302,7 @@ zookeeper.sasl.login-context-name: Client # default is "Client". The value need </pre> For more information on Flink configuration for Kerberos security, please see [here]({% link ops/config.md %}). -You can also find [here]({% link ops/security-kerberos.md %}) further details on how Flink internally setups Kerberos-based security. +You can also find [here]({% link ops/security/security-kerberos.md %}) further details on how Flink internally setups Kerberos-based security. ## Zookeeper Versions diff --git a/docs/ops/jobmanager_high_availability.zh.md b/docs/ops/jobmanager_high_availability.zh.md index fab035c..cfdeb9f 100644 --- a/docs/ops/jobmanager_high_availability.zh.md +++ b/docs/ops/jobmanager_high_availability.zh.md @@ -302,7 +302,7 @@ zookeeper.sasl.login-context-name: Client # default is "Client". The value need </pre> For more information on Flink configuration for Kerberos security, please see [here]({% link ops/config.zh.md %}). -You can also find [here]({% link ops/security-kerberos.zh.md %}) further details on how Flink internally setups Kerberos-based security. +You can also find [here]({% link ops/security/security-kerberos.zh.md %}) further details on how Flink internally setups Kerberos-based security. ## Zookeeper Versions diff --git a/docs/ops/security/index.md b/docs/ops/security/index.md new file mode 100644 index 0000000..010b21a --- /dev/null +++ b/docs/ops/security/index.md @@ -0,0 +1,24 @@ +--- +title: "Security" +nav-id: security +nav-parent_id: ops +nav-pos: 7 +--- +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> diff --git a/docs/ops/security/index.zh.md b/docs/ops/security/index.zh.md new file mode 100644 index 0000000..010b21a --- /dev/null +++ b/docs/ops/security/index.zh.md @@ -0,0 +1,24 @@ +--- +title: "Security" +nav-id: security +nav-parent_id: ops +nav-pos: 7 +--- +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> diff --git a/docs/ops/security-kerberos.md b/docs/ops/security/security-kerberos.md similarity index 99% rename from docs/ops/security-kerberos.md rename to docs/ops/security/security-kerberos.md index 98b034b..3720abf 100644 --- a/docs/ops/security-kerberos.md +++ b/docs/ops/security/security-kerberos.md @@ -1,7 +1,7 @@ --- title: "Kerberos Authentication Setup and Configuration" -nav-parent_id: ops -nav-pos: 8 +nav-parent_id: security +nav-pos: 2 nav-title: Kerberos --- <!-- diff --git a/docs/ops/security-kerberos.zh.md b/docs/ops/security/security-kerberos.zh.md similarity index 99% rename from docs/ops/security-kerberos.zh.md rename to docs/ops/security/security-kerberos.zh.md index 3d09b05..ae9f537 100644 --- a/docs/ops/security-kerberos.zh.md +++ b/docs/ops/security/security-kerberos.zh.md @@ -1,7 +1,7 @@ --- title: "Kerberos Authentication Setup and Configuration" -nav-parent_id: ops -nav-pos: 8 +nav-parent_id: security +nav-pos: 2 nav-title: Kerberos --- <!-- diff --git a/docs/ops/security-ssl.md b/docs/ops/security/security-ssl.md similarity index 99% rename from docs/ops/security-ssl.md rename to docs/ops/security/security-ssl.md index b5ed299..b7805c4 100644 --- a/docs/ops/security-ssl.md +++ b/docs/ops/security/security-ssl.md @@ -1,7 +1,7 @@ --- title: "SSL Setup" -nav-parent_id: ops -nav-pos: 7 +nav-parent_id: security +nav-pos: 1 --- <!-- Licensed to the Apache Software Foundation (ASF) under one diff --git a/docs/ops/security-ssl.zh.md b/docs/ops/security/security-ssl.zh.md similarity index 99% rename from docs/ops/security-ssl.zh.md rename to docs/ops/security/security-ssl.zh.md index 386c0a6..7b57f71 100644 --- a/docs/ops/security-ssl.zh.md +++ b/docs/ops/security/security-ssl.zh.md @@ -1,7 +1,7 @@ --- title: "SSL 设置" -nav-parent_id: ops -nav-pos: 7 +nav-parent_id: security +nav-pos: 1 --- <!-- Licensed to the Apache Software Foundation (ASF) under one
