diff options
| author | magikcypress <cyp@rouquin.me> | 2017-04-13 17:19:53 +0200 |
|---|---|---|
| committer | magikcypress <cyp@rouquin.me> | 2017-04-13 17:20:31 +0200 |
| commit | 4f11bfe432c675fe33a22cb6a6b8e08eb3c13234 (patch) | |
| tree | b60bc9d6bf00e036d0ebe270b31fd910d46fe2b8 | |
| parent | 0032a39e309ba07570e52901fe630d702f17c91d (diff) | |
| download | mastodon_ynh-4f11bfe432c675fe33a22cb6a6b8e08eb3c13234.tar.gz mastodon_ynh-4f11bfe432c675fe33a22cb6a6b8e08eb3c13234.tar.bz2 mastodon_ynh-4f11bfe432c675fe33a22cb6a6b8e08eb3c13234.zip | |
[fix] add smtp login & pass
| -rw-r--r-- | manifest.json | 9 | ||||
| -rw-r--r-- | scripts/install | 5 |
2 files changed, 13 insertions, 1 deletions
diff --git a/manifest.json b/manifest.json index 23184f6..22ce245 100644 --- a/manifest.json +++ b/manifest.json @@ -50,6 +50,15 @@ }, "example": "john" }, + { + "name": "passwd", + "type": "password", + "ask": { + "en": "Add password for the Admin YunoHost", + "fr": "Ajouter le mot de passe l'Administrateur YunoHost" + }, + "example": "adminpassword" + }, { "name": "is_public", "ask": { diff --git a/scripts/install b/scripts/install index 3258465..9c100c2 100644 --- a/scripts/install +++ b/scripts/install @@ -16,6 +16,7 @@ TRAP_ON # Active trap to stop the script if an error is detected. domain=$YNH_APP_ARG_DOMAIN path=$YNH_APP_ARG_PATH admin_mastodon=$YNH_APP_ARG_ADMIN +admin_pass=$YNH_APP_ARG_PASSWD is_public=$YNH_APP_ARG_IS_PUBLIC app=$YNH_APP_INSTANCE_NAME @@ -33,8 +34,8 @@ CHECK_FINALPATH ynh_app_setting_set $app domain $domain ynh_app_setting_set $app path $path ynh_app_setting_set $app admin $admin_mastodon +ynh_app_setting_set $app pass $admin_pass ynh_app_setting_set $app is_public $is_public -# ynh_app_setting_set $app language $language # Create user unix sudo adduser $app --home /opt/$app --gecos "First Last,RoomNumber,WorkPhone,HomePhone" --disabled-password --disabled-login @@ -140,6 +141,8 @@ sudo sed -i "s@PAPERCLIP_SECRET=@PAPERCLIP_SECRET=$(head -n32 /dev/urandom | tr sudo sed -i "s@SECRET_KEY_BASE=@SECRET_KEY_BASE=$(head -n32 /dev/urandom | tr -dc -d 'A-Za-z0-9' | head -c32)@g" "${final_path}/live/.env.production" sudo sed -i "s@OTP_SECRET=@OTP_SECRET=$(head -n32 /dev/urandom | tr -dc -d 'A-Za-z0-9' | head -c32)@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},' "${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_FROM_ADDRESS=notifications@example.com,SMTP_FROM_ADDRESS='${admin_mastodon}'@'${domain}',' "${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" |