Skip to content

Commit a25d78a

Browse files
authored
install/ubuntu: Use package.groonga.org instead of PPA (#438)
Installation from package.groonga.org is recommended. Reference: https://groonga.org/docs/install/ubuntu.html
1 parent bdc24f9 commit a25d78a

9 files changed

Lines changed: 25 additions & 32 deletions

_po/ja/install/ubuntu.po

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,12 @@ msgstr ""
5959

6060
msgid ""
6161
"```console\n"
62-
"$ sudo apt install -y software-properties-common\n"
63-
"$ sudo add-apt-repository -y universe\n"
64-
"$ sudo add-apt-repository -y ppa:groonga/ppa\n"
62+
"$ sudo apt install -y -V ca-certificates lsb-release wget\n"
63+
"$ wget https://packages.groonga.org/ubuntu/groonga-apt-source-latest-"
64+
"$(lsb_release --codename --short).deb\n"
65+
"$ sudo apt install -y -V ./groonga-apt-source-latest-$(lsb_release --"
66+
"codename --short).deb\n"
67+
"$ rm -f groonga-apt-source-latest-$(lsb_release --codename --short).deb\n"
6568
"$ sudo apt update\n"
6669
"Ubuntu 22.04:\n"
6770
"$ sudo apt install -y -V postgresql-14-pgroonga\n"
@@ -137,10 +140,11 @@ msgstr ""
137140
msgid ""
138141
"```console\n"
139142
"$ sudo apt install -y -V ca-certificates lsb-release wget\n"
140-
"$ wget https://packages.groonga.org/ubuntu/groonga-apt-source-latest-$"
141-
"(lsb_release --codename --short).deb\n"
143+
"$ wget https://packages.groonga.org/ubuntu/groonga-apt-source-latest-"
144+
"$(lsb_release --codename --short).deb\n"
142145
"$ sudo apt install -y -V ./groonga-apt-source-latest-$(lsb_release --"
143146
"codename --short).deb\n"
147+
"$ rm -f groonga-apt-source-latest-$(lsb_release --codename --short).deb\n"
144148
"$ sudo wget -O /usr/share/keyrings/pgdg.asc https://www.postgresql.org/media/"
145149
"keys/ACCC4CF8.asc\n"
146150
"$ (echo \"Types: deb\"; \\\n"

_po/ja/reference/streaming-replication-wal-resource-manager.po

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,9 +226,6 @@ msgstr "プライマリーとスタンバイでPGroongaをインストールし
226226

227227
msgid ""
228228
"```bash\n"
229-
"sudo apt install -y software-properties-common\n"
230-
"sudo add-apt-repository -y universe\n"
231-
"sudo add-apt-repository -y ppa:groonga/ppa\n"
232229
"sudo apt install -y lsb-release\n"
233230
"wget https://packages.groonga.org/ubuntu/groonga-apt-source-latest-"
234231
"$(lsb_release --codename --short).deb\n"

_po/ja/reference/streaming-replication.po

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -248,14 +248,12 @@ msgstr "プライマリーとスタンバイでPGroongaをインストールし
248248

249249
msgid ""
250250
"```bash\n"
251-
"sudo apt install -y software-properties-common\n"
252-
"sudo add-apt-repository -y universe\n"
253-
"sudo add-apt-repository -y ppa:groonga/ppa\n"
254-
"sudo apt install -y wget lsb-release\n"
251+
"sudo apt install -y lsb-release\n"
255252
"wget https://packages.groonga.org/ubuntu/groonga-apt-source-latest-"
256253
"$(lsb_release --codename --short).deb\n"
257254
"sudo apt install -y -V ./groonga-apt-source-latest-$(lsb_release --codename "
258255
"--short).deb\n"
256+
"rm -f groonga-apt-source-latest-$(lsb_release --codename --short).deb\n"
259257
"sudo apt update\n"
260258
"sudo apt install -y -V postgresql-15-pgdg-pgroonga\n"
261259
"```"

install/ubuntu.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@ If you're using Ubuntu 22.04, install `postgresql-14-pgroonga` package:
2323
If you're using Ubuntu 24.04, install `postgresql-16-pgroonga` package:
2424

2525
```console
26-
$ sudo apt install -y software-properties-common
27-
$ sudo add-apt-repository -y universe
28-
$ sudo add-apt-repository -y ppa:groonga/ppa
26+
$ sudo apt install -y -V ca-certificates lsb-release wget
27+
$ wget https://packages.groonga.org/ubuntu/groonga-apt-source-latest-$(lsb_release --codename --short).deb
28+
$ sudo apt install -y -V ./groonga-apt-source-latest-$(lsb_release --codename --short).deb
29+
$ rm -f groonga-apt-source-latest-$(lsb_release --codename --short).deb
2930
$ sudo apt update
3031
Ubuntu 22.04:
3132
$ sudo apt install -y -V postgresql-14-pgroonga
@@ -65,6 +66,7 @@ You can use the following instruction to install PGroonga for the PostgreSQL pac
6566
$ sudo apt install -y -V ca-certificates lsb-release wget
6667
$ wget https://packages.groonga.org/ubuntu/groonga-apt-source-latest-$(lsb_release --codename --short).deb
6768
$ sudo apt install -y -V ./groonga-apt-source-latest-$(lsb_release --codename --short).deb
69+
$ rm -f groonga-apt-source-latest-$(lsb_release --codename --short).deb
6870
$ sudo wget -O /usr/share/keyrings/pgdg.asc https://www.postgresql.org/media/keys/ACCC4CF8.asc
6971
$ (echo "Types: deb"; \
7072
echo "URIs: http://apt.postgresql.org/pub/repos/apt"; \

ja/install/ubuntu.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@ Ubuntu 22.04を使っている場合は`postgresql-14-pgroonga`パッケージ
2323
Ubuntu 24.04を使っている場合は`postgresql-16-pgroonga`パッケージをインストールしてください。
2424

2525
```console
26-
$ sudo apt install -y software-properties-common
27-
$ sudo add-apt-repository -y universe
28-
$ sudo add-apt-repository -y ppa:groonga/ppa
26+
$ sudo apt install -y -V ca-certificates lsb-release wget
27+
$ wget https://packages.groonga.org/ubuntu/groonga-apt-source-latest-$(lsb_release --codename --short).deb
28+
$ sudo apt install -y -V ./groonga-apt-source-latest-$(lsb_release --codename --short).deb
29+
$ rm -f groonga-apt-source-latest-$(lsb_release --codename --short).deb
2930
$ sudo apt update
3031
Ubuntu 22.04:
3132
$ sudo apt install -y -V postgresql-14-pgroonga
@@ -65,6 +66,7 @@ UbuntuでPostgreSQL Global Development Groupが提供するPostgreSQLパッケ
6566
$ sudo apt install -y -V ca-certificates lsb-release wget
6667
$ wget https://packages.groonga.org/ubuntu/groonga-apt-source-latest-$(lsb_release --codename --short).deb
6768
$ sudo apt install -y -V ./groonga-apt-source-latest-$(lsb_release --codename --short).deb
69+
$ rm -f groonga-apt-source-latest-$(lsb_release --codename --short).deb
6870
$ sudo wget -O /usr/share/keyrings/pgdg.asc https://www.postgresql.org/media/keys/ACCC4CF8.asc
6971
$ (echo "Types: deb"; \
7072
echo "URIs: http://apt.postgresql.org/pub/repos/apt"; \

ja/reference/streaming-replication-wal-resource-manager.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,6 @@ sudo apt install -y postgresql-16
105105
プライマリーとスタンバイでPGroongaをインストールします。
106106

107107
```bash
108-
sudo apt install -y software-properties-common
109-
sudo add-apt-repository -y universe
110-
sudo add-apt-repository -y ppa:groonga/ppa
111108
sudo apt install -y lsb-release
112109
wget https://packages.groonga.org/ubuntu/groonga-apt-source-latest-$(lsb_release --codename --short).deb
113110
sudo apt install -y -V ./groonga-apt-source-latest-$(lsb_release --codename --short).deb

ja/reference/streaming-replication.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,10 @@ sudo apt install -y postgresql-15
113113
プライマリーとスタンバイでPGroongaをインストールします。
114114

115115
```bash
116-
sudo apt install -y software-properties-common
117-
sudo add-apt-repository -y universe
118-
sudo add-apt-repository -y ppa:groonga/ppa
119-
sudo apt install -y wget lsb-release
116+
sudo apt install -y lsb-release
120117
wget https://packages.groonga.org/ubuntu/groonga-apt-source-latest-$(lsb_release --codename --short).deb
121118
sudo apt install -y -V ./groonga-apt-source-latest-$(lsb_release --codename --short).deb
119+
rm -f groonga-apt-source-latest-$(lsb_release --codename --short).deb
122120
sudo apt update
123121
sudo apt install -y -V postgresql-15-pgdg-pgroonga
124122
```

reference/streaming-replication-wal-resource-manager.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,6 @@ This is a PGroonga specific step.
105105
Install PGroonga on both primary and standbys.
106106

107107
```bash
108-
sudo apt install -y software-properties-common
109-
sudo add-apt-repository -y universe
110-
sudo add-apt-repository -y ppa:groonga/ppa
111108
sudo apt install -y lsb-release
112109
wget https://packages.groonga.org/ubuntu/groonga-apt-source-latest-$(lsb_release --codename --short).deb
113110
sudo apt install -y -V ./groonga-apt-source-latest-$(lsb_release --codename --short).deb

reference/streaming-replication.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,10 @@ This is a PGroonga specific step.
113113
Install PGroonga on both primary and standbys.
114114

115115
```bash
116-
sudo apt install -y software-properties-common
117-
sudo add-apt-repository -y universe
118-
sudo add-apt-repository -y ppa:groonga/ppa
119-
sudo apt install -y wget lsb-release
116+
sudo apt install -y lsb-release
120117
wget https://packages.groonga.org/ubuntu/groonga-apt-source-latest-$(lsb_release --codename --short).deb
121118
sudo apt install -y -V ./groonga-apt-source-latest-$(lsb_release --codename --short).deb
119+
rm -f groonga-apt-source-latest-$(lsb_release --codename --short).deb
122120
sudo apt update
123121
sudo apt install -y -V postgresql-15-pgdg-pgroonga
124122
```

0 commit comments

Comments
 (0)