diff options
| author | nemsia <nemsia@nemsia.org> | 2017-05-08 13:12:41 +0200 |
|---|---|---|
| committer | nemsia <nemsia@nemsia.org> | 2017-05-08 13:12:41 +0200 |
| commit | 4ab87b703b324c09882a6a01d785310eebf33fc8 (patch) | |
| tree | edb34410e147c4668d73bfd375593bf6f3aa33c8 | |
| parent | 66241c742ace8de56a454a5860cecb0353bbfd6e (diff) | |
| parent | 1747e72792334f15456e75fcd19ca7d13c7236ea (diff) | |
| download | mastodon_ynh-4ab87b703b324c09882a6a01d785310eebf33fc8.tar.gz mastodon_ynh-4ab87b703b324c09882a6a01d785310eebf33fc8.tar.bz2 mastodon_ynh-4ab87b703b324c09882a6a01d785310eebf33fc8.zip | |
Merge remote-tracking branch 'YunoHost-Apps/master'
| -rw-r--r-- | scripts/install | 6 | ||||
| -rw-r--r-- | scripts/upgrade | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/scripts/install b/scripts/install index 7d060fd..39cbaa5 100644 --- a/scripts/install +++ b/scripts/install @@ -145,10 +145,12 @@ sudo sed -i "s@PAPERCLIP_SECRET=@PAPERCLIP_SECRET=${paperclip_secret}@g" "${fina sudo sed -i "s@SECRET_KEY_BASE=@SECRET_KEY_BASE=${secret_key_base}@g" "${final_path}/live/.env.production" sudo sed -i "s@OTP_SECRET=@OTP_SECRET=${otp_secret}@g" "${final_path}/live/.env.production" -sudo sed -i 's,SMTP_LOGIN=,SMTP_LOGIN='${admin_mastodon}'@'${domain}',' "${final_path}/live/.env.production" -sudo sed -i "s@SMTP_PASSWORD=@SMTP_PASSWORD=${admin_pass}@g" "${final_path}/live/.env.production" +sudo sed -i "s@SMTP_LOGIN=@#SMTP_LOGIN=@g" "${final_path}/live/.env.production" +sudo sed -i "s@SMTP_PASSWORD=@#SMTP_PASSWORD=@g" "${final_path}/live/.env.production" sudo sed -i "s@SMTP_SERVER=smtp.mailgun.org@SMTP_SERVER=localhost@g" "${final_path}/live/.env.production" +sudo sed -i "s@SMTP_PORT=587@SMTP_PORT=25@g" "${final_path}/live/.env.production" sudo sed -i 's,SMTP_FROM_ADDRESS=notifications@example.com,SMTP_FROM_ADDRESS='${admin_mastodon}'@'${domain}',' "${final_path}/live/.env.production" +sudo sed -i "s@#SMTP_AUTH_METHOD=plain@SMTP_AUTH_METHOD=none@g" "${final_path}/live/.env.production" sudo sed -i "s@#SMTP_OPENSSL_VERIFY_MODE=peer@SMTP_OPENSSL_VERIFY_MODE=none@g" "${final_path}/live/.env.production" # Create database diff --git a/scripts/upgrade b/scripts/upgrade index f19f3e7..ea548b9 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -65,6 +65,9 @@ COMMANDS # Restart Mastodon sudo systemctl start mastodon-*.service +# Waiting start all services +sleep 30 + # Reload Nginx sudo systemctl reload nginx |