From 35a096d524e20865742f6926c9a3407bd45da2dd Mon Sep 17 00:00:00 2001 From: tamaina Date: Sat, 23 Dec 2023 17:51:46 +0900 Subject: [PATCH] v3.2.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit nodesourceの変更を適用 --- CHANGELOG.md | 19 ++++++++++++++++++- README.en.md | 2 +- README.md | 2 +- ubuntu.sh | 12 ++++++++++-- update.ubuntu.sh | 2 +- 5 files changed, 31 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 37f9a9b..017f5ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,21 @@ # v3 For Misskey v13 production and later RC (since 13.0.0-rc.10) +The English version is available at https://github.com/joinmisskey/bash-install/releases . + +## v3.2.1 +Node.jsのダウンロード元(nodesource提供)が変更になりました。 +次のコマンドを実行し、Node.jsをアップデートしてください。 + +``` +curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /usr/share/keyrings/nodesource.gpg +NODE_MAJOR=20 echo "deb [signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list + +sudo apt install -y nodejs +``` + +※Misskey v2023.12.0以降ではNode.jsの要求バージョンが上がったため必須となります。 + ## v3.2.0 - systemd環境ではjemallocを使用するようにしました。 `sudo apt install libjemalloc-dev`を実行し、`/etc/systemd/system/example.com.service`の`Environment="NODE_ENV=production"`の下に`Environment="LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.2"`を書き足してください。arm64環境では`x86_64`を`aarch64`にしてください. @@ -15,7 +30,9 @@ Node.js v20をインストールするように変更しました。 まず、次のコマンドでv20をインストールします。 ``` -curl -sL https://deb.nodesource.com/setup_20.x | sudo -E bash - +curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /usr/share/keyrings/nodesource.gpg +NODE_MAJOR=20 echo "deb [signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list + sudo apt install -y nodejs ``` diff --git a/README.en.md b/README.en.md index c66400c..332308f 100644 --- a/README.en.md +++ b/README.en.md @@ -1,4 +1,4 @@ -# Misskey install shell script v3.2.0 +# Misskey install shell script v3.2.1 Install Misskey with one shell script! You can install misskey on an Ubuntu server just by answering some questions. diff --git a/README.md b/README.md index cba8500..4758798 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Misskey install shell script v3.2.0 +# Misskey install shell script v3.2.1 Misskeyを簡単にインストールするためのシェルスクリプトができました！ diff --git a/ubuntu.sh b/ubuntu.sh index 4b966e9..82e992b 100644 --- a/ubuntu.sh +++ b/ubuntu.sh @@ -18,7 +18,8 @@ # DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -version="3.2.0"; +version="3.2.1"; +NODE_MAJOR="20"; tput setaf 4; echo ""; @@ -386,6 +387,11 @@ else fi fi +tput setaf 3; +echo "Process: mkdir -p /usr/share/keyrings;"; +tput setaf 7; +sudo mkdir -p /usr/share/keyrings; + tput setaf 3; echo "Process: add misskey user ($misskey_user);"; tput setaf 7; @@ -544,7 +550,9 @@ if [ $method == "systemd" ]; then tput setaf 3; echo "Process: prepare node.js;" tput setaf 7; - curl -sL https://deb.nodesource.com/setup_20.x | sudo -E bash -; + curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /usr/share/keyrings/nodesource.gpg; + echo "deb [signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list; + else tput setaf 3; echo "Process: prepare docker;" diff --git a/update.ubuntu.sh b/update.ubuntu.sh index 840b4ad..3ca30c0 100644 --- a/update.ubuntu.sh +++ b/update.ubuntu.sh @@ -18,7 +18,7 @@ # DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -version="3.2.0"; +version="3.2.1"; tput setaf 2; echo "Check: root user;";