diff options
| author | nemsia <nemsia@nemsia.org> | 2018-06-12 23:26:56 +0200 |
|---|---|---|
| committer | nemsia <nemsia@nemsia.org> | 2018-06-12 23:26:56 +0200 |
| commit | 29c54691fe2d7f105b346ac23d38b86b3c187f3a (patch) | |
| tree | 11d63d1cc387ea9ad3552bffb70fe50df16f9794 /scripts/restore | |
| parent | 4d552172643c981e10490e21e4c343baad5a933e (diff) | |
| parent | ae04282b9e5bb3a2dff513b1c37c0ff54fd95db4 (diff) | |
| download | mastodon_ynh-29c54691fe2d7f105b346ac23d38b86b3c187f3a.tar.gz mastodon_ynh-29c54691fe2d7f105b346ac23d38b86b3c187f3a.tar.bz2 mastodon_ynh-29c54691fe2d7f105b346ac23d38b86b3c187f3a.zip | |
Merge branch 'testing-2.4' of https://github.com/YunoHost-Apps/mastodon_ynh into YunoHost-Apps-testing-2.4
Diffstat (limited to 'scripts/restore')
| -rw-r--r-- | scripts/restore | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/scripts/restore b/scripts/restore index a800966..b41b9cd 100644 --- a/scripts/restore +++ b/scripts/restore @@ -89,10 +89,10 @@ fi # Install source.list debian package backports & yarn if [ "$(lsb_release --codename --short)" == "jessie" ]; then - cp ../conf/backports.list /etc/apt/sources.list.d/ + cp ../conf/apt_backports.list /etc/apt/sources.list.d/ fi curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - -cp ../conf/yarn.list /etc/apt/sources.list.d/ +cp ../conf/apt_yarn.list /etc/apt/sources.list.d/yarn.list ynh_package_update # Install de Node.js @@ -124,7 +124,11 @@ ynh_install_app_dependencies \ # Restore PostgreSQL database db_user=$(ynh_sanitize_dbid "$app") -db_name=$(ynh_sanitize_dbid "$app") +db_name=$(ynh_app_setting_get "$app" db_name) +if [ -z "$db_name" ]; then + db_name="${app}_production" + ynh_app_setting_set "$app" db_name "$db_name" +fi db_pwd=$(ynh_app_setting_get "$app" db_pwd) ynh_psql_test_if_first_run |