mirror of
https://github.com/YunoHost-Apps/outline_ynh.git
synced 2024-09-03 19:56:12 +02:00
Merge branch 'v2' of https://github.com/YunoHost-Apps/outline_ynh into v2
This commit is contained in:
commit
ef0c72c1ee
2 changed files with 6 additions and 3 deletions
|
@ -56,6 +56,9 @@ then
|
||||||
ynh_script_progression --message="Data migration finished"
|
ynh_script_progression --message="Data migration finished"
|
||||||
ynh_script_progression --message="Data bucket was kept for safety, just in case !"
|
ynh_script_progression --message="Data bucket was kept for safety, just in case !"
|
||||||
ynh_script_progression --message="Don't forget to remove MinIO app if you don't use it !"
|
ynh_script_progression --message="Don't forget to remove MinIO app if you don't use it !"
|
||||||
|
|
||||||
|
db_name=$(ynh_sanitize_dbid --db_name=$app)
|
||||||
|
ynh_psql_execute_as_root --sql="CREATE EXTENSION IF NOT EXISTS uuid-ossp;" --database=$db_name
|
||||||
else
|
else
|
||||||
ynh_script_progression --message="No migration to be done"
|
ynh_script_progression --message="No migration to be done"
|
||||||
fi
|
fi
|
||||||
|
@ -100,7 +103,7 @@ ynh_script_progression --message="Running DB initial migration..."
|
||||||
|
|
||||||
pushd "$install_dir"
|
pushd "$install_dir"
|
||||||
ynh_use_nodejs
|
ynh_use_nodejs
|
||||||
ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn db:migrate
|
ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH NODE_ENV=production yarn db:migrate
|
||||||
popd
|
popd
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
diff --git a/server/emails/mailer.tsx b/server/emails/mailer.tsx
|
diff --git a/server/emails/mailer.tsx b/server/emails/mailer.tsx
|
||||||
index 4d4f6f09c..f457025d5 100644
|
index f53e44b6b..bcf56efca 100644
|
||||||
--- a/server/emails/mailer.tsx
|
--- a/server/emails/mailer.tsx
|
||||||
+++ b/server/emails/mailer.tsx
|
+++ b/server/emails/mailer.tsx
|
||||||
@@ -208,6 +208,7 @@ export class Mailer {
|
@@ -207,6 +207,7 @@ export class Mailer {
|
||||||
: {
|
: {
|
||||||
rejectUnauthorized: false,
|
rejectUnauthorized: false,
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in a new issue