Skip to content
This repository was archived by the owner on May 9, 2023. It is now read-only.

Commit bad15f6

Browse files
authored
Merge pull request #98 from meilisearch/bump-meilisearch-v1.0.0
Changes related to the next Meilisearch release (v1.0.0)
2 parents e04757b + 1fda450 commit bad15f6

File tree

5 files changed

+20
-15
lines changed

5 files changed

+20
-15
lines changed

scripts/first-login/000-set-meili-env.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ MEILISEARCH_ENVIRONMENT='development'
1818
MEILISEARCH_SERVER_PROVIDER=provider_name
1919
USE_API_KEY='false'
2020
MEILISEARCH_MASTER_KEY=''
21-
MEILI_DUMPS_DIR='/var/opt/meilisearch/dumps'
21+
MEILI_DUMP_DIR='/var/opt/meilisearch/dumps'
2222
DOMAIN_NAME=''
2323
USE_SSL='false'
2424
USE_CERTBOT='false'
@@ -32,7 +32,7 @@ exit_with_message() {
3232
echo 'export MEILISEARCH_ENVIRONMENT='$MEILISEARCH_ENVIRONMENT > /var/opt/meilisearch/env
3333
echo 'export USE_API_KEY='$USE_API_KEY >> /var/opt/meilisearch/env
3434
echo 'export MEILISEARCH_MASTER_KEY='$MEILISEARCH_MASTER_KEY >> /var/opt/meilisearch/env
35-
echo 'export MEILI_DUMPS_DIR='$MEILI_DUMPS_DIR >> /var/opt/meilisearch/env
35+
echo 'export MEILI_DUMP_DIR='$MEILI_DUMP_DIR >> /var/opt/meilisearch/env
3636
echo 'export DOMAIN_NAME='$DOMAIN_NAME >> /var/opt/meilisearch/env
3737
echo 'export USE_SSL='$USE_SSL >> /var/opt/meilisearch/env
3838
echo 'export USE_CERTBOT='$USE_CERTBOT >> /var/opt/meilisearch/env

scripts/first-login/001-setup-prod.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,9 @@ After=systemd-user-sessions.service
3838
3939
[Service]
4040
Type=simple
41-
ExecStart=/usr/bin/meilisearch --db-path /var/lib/meilisearch/data.ms --env $MEILISEARCH_ENVIRONMENT --dumps-dir $MEILI_DUMPS_DIR
4241
Environment="MEILI_SERVER_PROVIDER=$MEILISEARCH_SERVER_PROVIDER"
42+
Environment="MEILI_DUMP_DIR=$MEILI_DUMP_DIR"
43+
ExecStart=/usr/bin/meilisearch --db-path /var/lib/meilisearch/data.ms --env $MEILISEARCH_ENVIRONMENT --dump-dir $MEILI_DUMP_DIR
4344
4445
[Install]
4546
WantedBy=default.target
@@ -56,9 +57,10 @@ After=systemd-user-sessions.service
5657
5758
[Service]
5859
Type=simple
59-
ExecStart=/usr/bin/meilisearch --db-path /var/lib/meilisearch/data.ms --env $MEILISEARCH_ENVIRONMENT --dumps-dir $MEILI_DUMPS_DIR
6060
Environment="MEILI_MASTER_KEY=$MEILISEARCH_MASTER_KEY"
6161
Environment="MEILI_SERVER_PROVIDER=$MEILISEARCH_SERVER_PROVIDER"
62+
Environment="MEILI_DUMP_DIR=$MEILI_DUMP_DIR"
63+
ExecStart=/usr/bin/meilisearch --db-path /var/lib/meilisearch/data.ms --env $MEILISEARCH_ENVIRONMENT --dump-dir $MEILI_DUMP_DIR
6264
6365
[Install]
6466
WantedBy=default.target

scripts/providers/aws/cloud-config.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ users:
99
- name: root
1010
shell: /bin/bash
1111

12-
packages:
12+
packages:
1313
- git
1414
- curl
1515
- ufw
@@ -28,8 +28,9 @@ write_files:
2828
2929
[Service]
3030
Type=simple
31-
ExecStart=/usr/bin/meilisearch --db-path /var/lib/meilisearch/data.ms --env development --dumps-dir MEILI_DUMPS_DIR
3231
Environment="MEILI_SERVER_PROVIDER=aws"
32+
Environment="MEILI_DUMP_DIR=/var/opt/meilisearch/dumps"
33+
ExecStart=/usr/bin/meilisearch --db-path /var/lib/meilisearch/data.ms --env development --dump-dir $MEILI_DUMP_DIR
3334
Restart=on-failure
3435
RestartSec=5s
3536
@@ -64,13 +65,13 @@ write_files:
6465
meilisearch-setup
6566
6667
runcmd:
67-
- wget --directory-prefix=/usr/bin/ -O /usr/bin/meilisearch https://github.com/meilisearch/meilisearch/releases/download/v0.30.5/meilisearch-linux-amd64
68+
- wget --directory-prefix=/usr/bin/ -O /usr/bin/meilisearch https://github.com/meilisearch/meilisearch/releases/download/v1.0.0/meilisearch-linux-amd64
6869
- chmod 755 /usr/bin/meilisearch
6970
- systemctl enable meilisearch.service
7071
- ufw --force enable
7172
- ufw allow 'Nginx Full'
7273
- ufw allow 'OpenSSH'
73-
- curl https://raw.githubusercontent.com/meilisearch/cloud-scripts/v0.30.5/scripts/deploy-meilisearch.sh | bash -s v0.30.5 aws
74+
- curl https://raw.githubusercontent.com/meilisearch/cloud-scripts/v1.0.0/scripts/deploy-meilisearch.sh | bash -s v1.0.0 aws
7475

7576
power_state:
7677
mode: reboot

scripts/providers/digitalocean/cloud-config.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ users:
99
- name: root
1010
shell: /bin/bash
1111

12-
packages:
12+
packages:
1313
- git
1414
- curl
1515
- ufw
@@ -28,8 +28,9 @@ write_files:
2828
2929
[Service]
3030
Type=simple
31-
ExecStart=/usr/bin/meilisearch --db-path /var/lib/meilisearch/data.ms --env development --dumps-dir MEILI_DUMPS_DIR
3231
Environment="MEILI_SERVER_PROVIDER=digitalocean"
32+
Environment="MEILI_DUMP_DIR=/var/opt/meilisearch/dumps"
33+
ExecStart=/usr/bin/meilisearch --db-path /var/lib/meilisearch/data.ms --env development --dump-dir $MEILI_DUMP_DIR
3334
Restart=on-failure
3435
RestartSec=5s
3536
@@ -65,13 +66,13 @@ write_files:
6566
6667
runcmd:
6768
- apt-get purge droplet-agent* -y
68-
- wget --directory-prefix=/usr/bin/ -O /usr/bin/meilisearch https://github.com/meilisearch/meilisearch/releases/download/v0.30.5/meilisearch-linux-amd64
69+
- wget --directory-prefix=/usr/bin/ -O /usr/bin/meilisearch https://github.com/meilisearch/meilisearch/releases/download/v1.0.0/meilisearch-linux-amd64
6970
- chmod 755 /usr/bin/meilisearch
7071
- systemctl enable meilisearch.service
7172
- ufw --force enable
7273
- ufw allow 'Nginx Full'
7374
- ufw allow 'OpenSSH'
74-
- curl https://raw.githubusercontent.com/meilisearch/cloud-scripts/v0.30.5/scripts/deploy-meilisearch.sh | bash -s v0.30.5 digitalocean
75+
- curl https://raw.githubusercontent.com/meilisearch/cloud-scripts/v1.0.0/scripts/deploy-meilisearch.sh | bash -s v1.0.0 digitalocean
7576
- curl https://raw.githubusercontent.com/digitalocean/marketplace-partners/master/scripts/90-cleanup.sh | bash
7677
- curl https://raw.githubusercontent.com/digitalocean/marketplace-partners/master/scripts/99-img-check.sh | bash
7778

scripts/providers/gcp/cloud-config.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@ write_files:
2929
3030
[Service]
3131
Type=simple
32-
ExecStart=/usr/bin/meilisearch --db-path /var/lib/meilisearch/data.ms --env development --dumps-dir MEILI_DUMPS_DIR
3332
Environment="MEILI_SERVER_PROVIDER=gcp"
33+
Environment="MEILI_DUMP_DIR=/var/opt/meilisearch/dumps"
34+
ExecStart=/usr/bin/meilisearch --db-path /var/lib/meilisearch/data.ms --env development --dump-dir $MEILI_DUMP_DIR
3435
Restart=on-failure
3536
RestartSec=5s
3637
@@ -65,13 +66,13 @@ write_files:
6566
meilisearch-setup
6667
6768
runcmd:
68-
- wget --directory-prefix=/usr/bin/ -O /usr/bin/meilisearch https://github.com/meilisearch/meilisearch/releases/download/v0.30.5/meilisearch-linux-amd64
69+
- wget --directory-prefix=/usr/bin/ -O /usr/bin/meilisearch https://github.com/meilisearch/meilisearch/releases/download/v1.0.0/meilisearch-linux-amd64
6970
- chmod 755 /usr/bin/meilisearch
7071
- systemctl enable meilisearch.service
7172
- ufw --force enable
7273
- ufw allow 'Nginx Full'
7374
- ufw allow 'OpenSSH'
74-
- curl https://raw.githubusercontent.com/meilisearch/cloud-scripts/v0.30.5/scripts/deploy-meilisearch.sh | bash -s v0.30.5 gcp
75+
- curl https://raw.githubusercontent.com/meilisearch/cloud-scripts/v1.0.0/scripts/deploy-meilisearch.sh | bash -s v1.0.0 gcp
7576

7677
power_state:
7778
mode: reboot

0 commit comments

Comments
 (0)