From efaa41ba49a887b3a94c0bdc169604547e49930a Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 19 Jul 2018 00:04:09 +0900 Subject: [PATCH] =?UTF-8?q?reCAPTCHA=E3=82=92=E3=82=AA=E3=83=97=E3=82=B7?= =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .config/example.yml | 9 +++++---- docs/setup.en.md | 11 +++++------ docs/setup.ja.md | 13 ++++++------- .../app/common/views/components/signup.vue | 18 +++++++++++------- src/config/types.ts | 2 +- src/server/api/private/signup.ts | 10 ++++++---- webpack.config.ts | 2 +- 7 files changed, 35 insertions(+), 30 deletions(-) diff --git a/.config/example.yml b/.config/example.yml index 1e7f7d89e8..a9289dfd4f 100644 --- a/.config/example.yml +++ b/.config/example.yml @@ -41,10 +41,6 @@ redis: port: 6379 pass: example-pass -recaptcha: - site_key: example-site-key - secret_key: example-secret-key - # If enabled: # Server will not cache remote files (Using direct link instead). # You can save your storage. @@ -67,6 +63,11 @@ preventCache: false # port: 9200 # pass: null +# reCAPTCHA +# recaptcha: +# site_key: example-site-key +# secret_key: example-secret-key + # ServiceWorker # sw: # # Public key of VAPID diff --git a/docs/setup.en.md b/docs/setup.en.md index 5e986d8035..5a277f19bd 100644 --- a/docs/setup.en.md +++ b/docs/setup.en.md @@ -48,9 +48,9 @@ In root : 4. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)` Checkout to the [latest release](https://github.com/syuilo/misskey/releases/latest) 5. `npm install` Install misskey dependencies. -*5.* reCAPTCHA tokens +*(optional)* reCAPTCHA tokens ---------------------------------------------------------------- -Misskey requires reCAPTCHA tokens. +If you want to enable reCAPTCHA, you need to generate reCAPTCHA tokens: Please visit https://www.google.com/recaptcha/intro/ and generate keys. *(optional)* Generating VAPID keys @@ -63,13 +63,12 @@ npm install web-push -g web-push generate-vapid-keys ``` - -*6.* Make configuration file +*5.* Make configuration file ---------------------------------------------------------------- 1. `cp .config/example.yml .config/default.yml` Copy the `.config/example.yml` and rename it to `default.yml`. 2. Edit `default.yml` -*7.* Build Misskey +*6.* Build Misskey ---------------------------------------------------------------- Build misskey with the following: @@ -85,7 +84,7 @@ If you're still encountering errors about some modules, use node-gyp: 3. `node-gyp build` 4. `npm run build` -*8.* That is it. +*7.* That is it. ---------------------------------------------------------------- Well done! Now, you have an environment that run to Misskey. diff --git a/docs/setup.ja.md b/docs/setup.ja.md index a8289aeb9e..aa8d8d99fc 100644 --- a/docs/setup.ja.md +++ b/docs/setup.ja.md @@ -47,10 +47,10 @@ adduser --disabled-password --disabled-login misskey 4. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)` [最新のリリース](https://github.com/syuilo/misskey/releases/latest)を確認 5. `npm install` Misskeyの依存パッケージをインストール -*5.* reCAPTCHAトークン +*(オプション)* reCAPTCHAトークン ---------------------------------------------------------------- -MisskeyはreCAPTCHAトークンを必要とします。 -https://www.google.com/recaptcha/intro/ にアクセスしてトークンを生成してください。 +reCAPTCHAを有効にする場合、reCAPTCHAトークンを取得する必要があります。 +https://www.google.com/recaptcha/intro/ にアクセスしてトークンを取得してください。 *(オプション)* VAPIDキーペアの生成 ---------------------------------------------------------------- @@ -61,12 +61,12 @@ npm install web-push -g web-push generate-vapid-keys ``` -*6.* Make configuration file +*5.* 設定ファイルを作成する ---------------------------------------------------------------- 1. `cp .config/example.yml .config/default.yml` `.config/example.yml`をコピーし名前を`default.yml`にする。 2. `default.yml` を編集する。 -*7.* Misskeyのビルド +*6.* Misskeyのビルド ---------------------------------------------------------------- 次のコマンドでMisskeyをビルドしてください: @@ -81,8 +81,7 @@ Debianをお使いであれば、`build-essential`パッケージをインスト 3. `node-gyp build` 4. `npm run build` - -*6.* 以上です! +*7.* 以上です! ---------------------------------------------------------------- お疲れ様でした。これでMisskeyを動かす準備は整いました。 diff --git a/src/client/app/common/views/components/signup.vue b/src/client/app/common/views/components/signup.vue index 62373a59ec..8b422268e8 100644 --- a/src/client/app/common/views/components/signup.vue +++ b/src/client/app/common/views/components/signup.vue @@ -29,7 +29,7 @@

%fa:exclamation-triangle .fw% %i18n:@password-not-matched%

-
+