From ff6e722f0c49bf43313915b487f2f27aec2bd50b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E5=91=A8=E9=83=A8=E8=90=BD?=
<laozhoubuluo@gmail.com>
Date: Mon, 1 Apr 2024 21:42:29 +0800
Subject: [PATCH 1/2] docs: optimize pgroonga installation
---
docs/notice-for-admins.md | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/docs/notice-for-admins.md b/docs/notice-for-admins.md
index 5c2eb9b966..15ca9ef17e 100644
--- a/docs/notice-for-admins.md
+++ b/docs/notice-for-admins.md
@@ -31,9 +31,9 @@ psql (PostgreSQL) 16.1
In this case, your PostgreSQL major version is `16`.
-There are official installation instructions for many operating systems on <https://pgroonga.github.io/install>, so please follow the instructions on this page. However, since many users are using Ubuntu, and there are no instructions for Arch Linux and Fedora, we explicitly list the instructions for Ubuntu, Arch Linux and Fedora here. Please keep in mind that this is not official information and the procedures may change.
+There are official installation instructions for many operating systems on <https://pgroonga.github.io/install>, so please follow the instructions on this page. However, since many users are using Ubuntu or Debian, and there are no instructions for Arch Linux and Fedora, we explicitly list the instructions for Ubuntu, Debian, Arch Linux and Fedora here. Please keep in mind that this is not official information and the procedures may change.
-##### Ubuntu
+##### Ubuntu 22.04 LTS or 20.04 LTS
1. Install subdependencies and add apt repository
```sh
@@ -43,8 +43,23 @@ There are official installation instructions for many operating systems on <http
sudo apt install -y wget lsb-release
wget https://packages.groonga.org/ubuntu/groonga-apt-source-latest-$(lsb_release --codename --short).deb
sudo apt install -y -V ./groonga-apt-source-latest-$(lsb_release --codename --short).deb
- echo "deb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release --codename --short)-pgdg main" | sudo tee /etc/apt/sources.list.d/pgdg.list
- wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
+ sudo apt update
+ ```
+2. Install PGroonga
+ ```sh
+ # Please replace "16" with your PostgreSQL major version
+ sudo apt install postgresql-16-pgdg-pgroonga
+ ```
+
+##### Debian 12 or 11
+
+1. Install subdependencies and add apt repository
+ ```sh
+ sudo apt install -y -V ca-certificates lsb-release wget
+ wget https://apache.jfrog.io/artifactory/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb
+ sudo apt install -y -V ./apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb
+ wget https://packages.groonga.org/debian/groonga-apt-source-latest-$(lsb_release --codename --short).deb
+ sudo apt install -y -V ./groonga-apt-source-latest-$(lsb_release --codename --short).deb
sudo apt update
```
2. Install PGroonga
From 01158d7dd5d5c5a2bb8fe66a8f78cd15ed86801b Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Fri, 5 Apr 2024 05:17:13 +0900
Subject: [PATCH 2/2] docs: update notice-for-admins.md
---
docs/notice-for-admins.md | 28 +++++++++++++++++-----------
1 file changed, 17 insertions(+), 11 deletions(-)
diff --git a/docs/notice-for-admins.md b/docs/notice-for-admins.md
index 15ca9ef17e..944b5703d8 100644
--- a/docs/notice-for-admins.md
+++ b/docs/notice-for-admins.md
@@ -31,11 +31,11 @@ psql (PostgreSQL) 16.1
In this case, your PostgreSQL major version is `16`.
-There are official installation instructions for many operating systems on <https://pgroonga.github.io/install>, so please follow the instructions on this page. However, since many users are using Ubuntu or Debian, and there are no instructions for Arch Linux and Fedora, we explicitly list the instructions for Ubuntu, Debian, Arch Linux and Fedora here. Please keep in mind that this is not official information and the procedures may change.
+There are official installation instructions for many operating systems on <https://pgroonga.github.io/install>, so please follow the instructions on this page. However, since many users are using Ubuntu LTS or Debian, and there are no instructions for Arch Linux and Fedora, we explicitly list the instructions for Ubuntu LTS, Debian, Arch Linux and Fedora here. Please keep in mind that this is not official information and the procedures may change.
-##### Ubuntu 22.04 LTS or 20.04 LTS
+##### Ubuntu LTS
-1. Install subdependencies and add apt repository
+1. Install subdependencies
```sh
sudo apt install -y software-properties-common
sudo add-apt-repository -y universe
@@ -43,29 +43,35 @@ There are official installation instructions for many operating systems on <http
sudo apt install -y wget lsb-release
wget https://packages.groonga.org/ubuntu/groonga-apt-source-latest-$(lsb_release --codename --short).deb
sudo apt install -y -V ./groonga-apt-source-latest-$(lsb_release --codename --short).deb
- sudo apt update
```
-2. Install PGroonga
+2. Install PGroonga (replace `16` with your PostgreSQL version)
```sh
- # Please replace "16" with your PostgreSQL major version
sudo apt install postgresql-16-pgdg-pgroonga
+
+ # Depending on your PostgreSQL installation method,
+ # the above command may fail and you need to run
+ # the following instead:
+ # sudo apt install postgresql-16-pgroonga
```
-##### Debian 12 or 11
+##### Debian
-1. Install subdependencies and add apt repository
+1. Install subdependencies
```sh
sudo apt install -y -V ca-certificates lsb-release wget
wget https://apache.jfrog.io/artifactory/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb
sudo apt install -y -V ./apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb
wget https://packages.groonga.org/debian/groonga-apt-source-latest-$(lsb_release --codename --short).deb
sudo apt install -y -V ./groonga-apt-source-latest-$(lsb_release --codename --short).deb
- sudo apt update
```
-2. Install PGroonga
+2. Install PGroonga (replace `16` with your PostgreSQL version)
```sh
- # Please replace "16" with your PostgreSQL major version
sudo apt install postgresql-16-pgdg-pgroonga
+
+ # Depending on your PostgreSQL installation method,
+ # the above command may fail and you need to run
+ # the following instead:
+ # sudo apt install postgresql-16-pgroonga
```
##### Arch Linux