You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2022/10/05 14:22:02 UTC
[incubator-linkis-website] branch dev updated: fix: update how to vote a committer and ppmc operation flow (#528)
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-linkis-website.git
The following commit(s) were added to refs/heads/dev by this push:
new 046a8183e0 fix: update how to vote a committer and ppmc operation flow (#528)
046a8183e0 is described below
commit 046a8183e08b47bb9dddda4c14e3e41d87915639
Author: jacktao007 <79...@qq.com>
AuthorDate: Wed Oct 5 21:42:04 2022 +0800
fix: update how to vote a committer and ppmc operation flow (#528)
---
community/how-to-vote-a-committer-ppmc.md | 18 ++++++++++++++-
community/ppmc-related-permission-configuration.md | 24 ++++++++------------
.../current/how-to-vote-a-committer-ppmc.md | 11 ++++++++-
.../ppmc-related-permission-configuration.md | 26 +++++++++-------------
4 files changed, 46 insertions(+), 33 deletions(-)
diff --git a/community/how-to-vote-a-committer-ppmc.md b/community/how-to-vote-a-committer-ppmc.md
index 92fcac32f5..f8bb45fc67 100644
--- a/community/how-to-vote-a-committer-ppmc.md
+++ b/community/how-to-vote-a-committer-ppmc.md
@@ -243,7 +243,7 @@ After receiving the notification email that the account was created successfully
### 2.7 Setting up Apache ID and development environment
>Requires candidates for processing
-- Enter [Apache Account Utility Platform] (https://id.apache.org/), create a password, set up a personal email address (`forwarding email address`) and a GitHub account (`Your GitHub Username`). An organization invitation will be emailed to you shortly thereafter (within 2 hours).
+- Enter [Apache Account Utility Platform] (https://id.apache.org/), create a password, set up a personal email address (`forwarding email address`) and a GitHub account (`Your GitHub Username`).
- If you want to use `xxx@apache.org` mail service, please refer to [here](https://infra.apache.org/committer-email.html). Gmail is recommended as this forwarding mode is not easily found in most email service setups.
- Follow【Authorize GitHub 2FA wiki】(https://help.github.com/articles/configuring-two-factor-authentication-via-a-totp-mobile-app/) to enable two-factor authorization (2FA) in [Github ](http://github.com/). When you set 2FA to "off", it will be delisted from the corresponding Apache committer write permission group until you set it again. (**Note: pay attention to recovery codes like passwords!**)
- Use the [GitBox Account Linking Utility] (https://gitbox.apache.org/setup/) to obtain the write permission of the Linkis project.
@@ -277,3 +277,19 @@ The Apache Linkis(Incubating) PPMC
````
At this point, the whole process is over, and the candidate officially becomes the Committer or PPMC of the project.
+
+## 4 Workflow summary
+
+1. Send emails with ICLA attachments
+
+2. 1-2 days after receipt of the reply email, will be processed within 5 working days
+
+3. 2-Receive an Apache account creation success email within 5 days
+
+4. Use the email prompt to retrieve or reset your password
+
+5. Connect your Github account to id.apache.org or whimsy.apache.org
+
+6. Enable Github 2FA authentication
+
+7. Use gitbox.apache.org to get repository write access
\ No newline at end of file
diff --git a/community/ppmc-related-permission-configuration.md b/community/ppmc-related-permission-configuration.md
index a47c74b0a4..60b7384a33 100644
--- a/community/ppmc-related-permission-configuration.md
+++ b/community/ppmc-related-permission-configuration.md
@@ -14,24 +14,13 @@ sidebar_position: 8
### 1.2 Associate apache Id with github account
**Way 1**
-Log in to https://id.apache.org and set the [Your GitHub Username] field in LDAP to your own GitHub ID. Enter your password Click submit changes and you will receive an invitation to join the apache organization on github within four hours. You should receive an email with "asf-gitbox" in the title of your github account email.
-If the invitation has expired (7 days expired), you can try both method 1 and method 2 again. See if you can re-receive the invitation email to join ASF org in the mailbox associated with the github account (search for "asf-gitbox").
-If you haven't received an invitation yet, try the following:
-1. Delete the github accounts in methods 1 and 2 first;
-2. After waiting for 1 scan cycle (4 hours to be safe), add the github account back again;
-3. Then wait another 4 hours to see if you can re-receive the invitation email to join ASF org in the email associated with the github account (search for the email title "asf-gitbox").
+Log in to https://id.apache.org and set the [Your GitHub Username] field in LDAP to your own GitHub ID. Enter your password Click submit changes.
+
**Way 2**
-Visit https://whismy.apache.org/roster/committer/xxx (replace with your apache id) to modify the corresponding data, and you will receive an invitation to join the apache github organization within four hours.
-Pay attention to check the invitation email of the github organization inviting you to join apache. Invitation is valid for 7 days
-
-
-
-After the successful invitation, the personal github account information can be seen that the affiliated organization has apache
-
-
+Visit https://whismy.apache.org/roster/committer/xxx (replace with your apache id) to modify the corresponding data.
### 1.3 Enable 2FA authentication (login token)
>github personal account security Enable 2FA authentication (login token)
@@ -47,7 +36,7 @@ step2 Select【Set up using an app】Next step
-step3 Enter the QR code binding page, scan the code with the totp type app with the download number in advance, and enter the 6 displayed on the mobile phone as the token
+Step3 enter the qr code binding page, scan the code with the pre-downloaded totp type app (such as Google identity authenticator、Microsoft Authenticator), and input the 6 displayed on the mobile phone as the token
@@ -80,6 +69,10 @@ After successful execution, the following figure is shown. After the success, th
+After the successful invitation, the personal github account information can be seen that the affiliated organization has apache
+
+
+
### 1.5 Related Links Documentation
[github uses TOTP to enable 2FA authentication] https://docs.github.com/cn/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication
@@ -91,6 +84,7 @@ After successful execution, the following figure is shown. After the success, th
【git github &gitbox 】https://cwiki.apache.org/confluence/display/INFRA/Git%2C+GitHub+and+Gitbox
+
## 2. Configure emails and email subscriptions
### 2.1 Associate your own mailbox
diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs-community/current/how-to-vote-a-committer-ppmc.md b/i18n/zh-CN/docusaurus-plugin-content-docs-community/current/how-to-vote-a-committer-ppmc.md
index 373d71f97b..63cb4e6bdc 100644
--- a/i18n/zh-CN/docusaurus-plugin-content-docs-community/current/how-to-vote-a-committer-ppmc.md
+++ b/i18n/zh-CN/docusaurus-plugin-content-docs-community/current/how-to-vote-a-committer-ppmc.md
@@ -259,7 +259,7 @@ for more information about roles at Apache.
### 2.7 设置 Apache ID 和开发环境
-- 进入[Apache Account Utility Platform](https://id.apache.org/)，创建密码，设置个人邮箱（`转发邮箱地址`）和GitHub账号（`Your GitHub Username`）。此后不久（2 小时内）将通过电子邮件向您发送组织邀请。
+- 进入[Apache Account Utility Platform](https://id.apache.org/)，创建密码，设置个人邮箱（`转发邮箱地址`）和GitHub账号（`Your GitHub Username`）。
- 如果您想使用`xxx@apache.org`邮件服务，请参考[这里](https://infra.apache.org/committer-email.html)。推荐使用 Gmail，因为这种转发模式在大多数邮箱服务设置中都不容易找到。
- 关注【授权GitHub 2FA wiki】(https://help.github.com/articles/configuring-two-factor-authentication-via-a-totp-mobile-app/) 开启双因素授权（2FA ) 在 [Github](http://github.com/) 上。当您将 2FA 设置为“关闭”时，它将被相应的 Apache committer 写入权限组除名，直到您再次设置它。 （**注意：像对待密码一样注意恢复代码！**）
- 使用【GitBox Account Linking Utility】（https://gitbox.apache.org/setup/）获取Linkis项目的写权限。
@@ -318,3 +318,12 @@ step2 修改 linkis.xml 中的new信息
step3 更新提交后，信息会在这里呈现
https://incubator.apache.org/clutch/linkis.html
+
+## 5 操作流程总结
+1. 发送携带ICLA附件的邮件
+2. 1-2天后收到回复邮件，将在5个工作日内处理
+3. 2-5天内收到apache账户创建成功邮件
+4. 使用邮件提示内容找回密码或重置密码
+5. 登录id.apache.org或whimsy.apache.org关联github账号
+6. 开启Github的2FA认证（双英子认证）
+7. 使用gitbox.apache.org获得仓库写入权限
\ No newline at end of file
diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs-community/current/ppmc-related-permission-configuration.md b/i18n/zh-CN/docusaurus-plugin-content-docs-community/current/ppmc-related-permission-configuration.md
index e2ba7f8b5d..173011896a 100644
--- a/i18n/zh-CN/docusaurus-plugin-content-docs-community/current/ppmc-related-permission-configuration.md
+++ b/i18n/zh-CN/docusaurus-plugin-content-docs-community/current/ppmc-related-permission-configuration.md
@@ -11,26 +11,15 @@ sidebar_position: 8
2. github个人账号安全开启2FA认证
3. gitbox上开启权限申请
-### 1.2关联apache Id与github账号
+### 1.2关联apache Id与github账号
+关联apache Id与github账号后，直接进入1.3操作
**方式1**
-登陆 https://id.apache.org LDAP中的[Your GitHub Username]字段设置为自己的 GitHub ID。输入密码 点击submit changes 四小时内会收到邀请加入github 上apache organization 的组织的邀约。您的github 账号邮箱，应该会收到一封标题包含“asf-gitbox”的邮件。
-如邀约已过期（7天过期），可以尝试把方式1、方式2都再尝试一下。看看github 账号关联邮箱中，能否重新收到加入ASF org 的邀约邮件(搜索"asf-gitbox")。
-如还未收到邀约，可尝试如下：
-1. 把方式1、2中的github账号先都删掉；
-2. 等待1个扫描周期后(稳妥起见可等4个小时)，再重新把github 账号加回去；
-3. 然后再等4小时，看看github 账号关联邮箱中，能否重新收到加入ASF org 的邀约邮件(搜索邮件标题"asf-gitbox")。
+登陆 https://id.apache.org LDAP中的[Your GitHub Username]字段设置为自己的 GitHub ID。输入密码 点击submit changes 。
**方式2**
-访问https://whimsy.apache.org/roster/committer/xxx (替换成你的apache id) 修改对应的数据，四小时内会收到邀请加入apache的github组织的邀约。
-注意查收邀请加入apache的github组织的邀约邮件。邀约有效期是7天
-
-
-
-成功邀约后 个人github账户信息可以看到归属组织有了apache
-
-
+访问https://whimsy.apache.org/roster/committer/xxx (替换成你的apache id) 修改对应的数据
### 1.3 开启2FA认证（登陆令牌）
>github个人账号安全 开启2FA认证（登陆令牌）
@@ -46,7 +35,7 @@ step2 选择【Set up using an app】 下一步
-step3 进入二维码绑定页面，使用事先下载号的totp类型app 扫码，录入手机端显示的6为令牌
+step3 进入二维码绑定页面，使用事先下载好的totp类型app（如：Google 身份验证器、Microsoft Authenticator）扫码，录入手机端显示的6为令牌
@@ -79,6 +68,11 @@ step3 mfa status校验
+
+成功邀约后 个人github账户信息可以看到归属组织有了apache
+
+
+
### 1.5 相关链接文档
【github使用TOTP启用2FA认证】https://docs.github.com/cn/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org