From 568fb28d639bd556acd41c66b5d0676e7bd6e1de Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 30 Jan 2019 18:50:52 +0100 Subject: [PATCH 1/3] Add sudo user npm + adding time for service to start --- scripts/install | 12 ++++++------ scripts/restore | 2 +- scripts/upgrade | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/scripts/install b/scripts/install index 876eb60..8f6072d 100644 --- a/scripts/install +++ b/scripts/install @@ -175,11 +175,11 @@ chown -R $app:$app /var/log/$app pushd $final_path ynh_use_nodejs -npm install hoek@^4.2.1 --save -npm install -npm audit fix -npm install typescript@>=2.0 --save -npm install ts-node +sudo -u $app env PATH=$PATH:$nodejs_path npm install hoek@^4.2.1 --save +sudo -u $app env PATH=$PATH:$nodejs_path npm install +sudo -u $app env PATH=$PATH:$nodejs_path npm audit fix +sudo -u $app env PATH=$PATH:$nodejs_path npm install typescript@>=2.0 --save +sudo -u $app env PATH=$PATH:$nodejs_path npm install ts-node popd chown -R $app:$app $final_path @@ -311,4 +311,4 @@ fi #================================================= systemctl reload nginx -sleep 30 \ No newline at end of file +sleep 30 diff --git a/scripts/restore b/scripts/restore index 9b817a4..325054e 100644 --- a/scripts/restore +++ b/scripts/restore @@ -130,4 +130,4 @@ ynh_restore_file "/etc/logrotate.d/$app" #systemctl reload php5-fpm systemctl reload nginx -sleep 30 \ No newline at end of file +sleep 30 diff --git a/scripts/upgrade b/scripts/upgrade index 4d0575a..f499e10 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -118,11 +118,11 @@ ynh_system_user_create $app pushd $final_path ynh_use_nodejs -npm install hoek@^4.2.1 --save -npm install -npm audit fix -npm install typescript@>=2.0 --save -npm install ts-node +sudo -u $app env PATH=$PATH:$nodejs_path npm install hoek@^4.2.1 --save +sudo -u $app env PATH=$PATH:$nodejs_path npm install +sudo -u $app env PATH=$PATH:$nodejs_path npm audit fix +sudo -u $app env PATH=$PATH:$nodejs_path npm install typescript@>=2.0 --save +sudo -u $app env PATH=$PATH:$nodejs_path npm install ts-node popd ### Verify the checksum of a file, stored by `ynh_store_file_checksum` in the install script. @@ -176,4 +176,4 @@ fi #================================================= systemctl reload nginx -sleep 10 +sleep 30 From 5ddf616085e47fcc4e88f9e4ab7712dda23109a7 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 30 Jan 2019 18:58:19 +0100 Subject: [PATCH 2/3] Reorder npm steps --- scripts/install | 4 ++-- scripts/upgrade | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 8f6072d..f700a20 100644 --- a/scripts/install +++ b/scripts/install @@ -176,10 +176,10 @@ chown -R $app:$app /var/log/$app pushd $final_path ynh_use_nodejs sudo -u $app env PATH=$PATH:$nodejs_path npm install hoek@^4.2.1 --save -sudo -u $app env PATH=$PATH:$nodejs_path npm install -sudo -u $app env PATH=$PATH:$nodejs_path npm audit fix sudo -u $app env PATH=$PATH:$nodejs_path npm install typescript@>=2.0 --save sudo -u $app env PATH=$PATH:$nodejs_path npm install ts-node +sudo -u $app env PATH=$PATH:$nodejs_path npm install +sudo -u $app env PATH=$PATH:$nodejs_path npm audit fix popd chown -R $app:$app $final_path diff --git a/scripts/upgrade b/scripts/upgrade index f499e10..5022034 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -119,10 +119,10 @@ ynh_system_user_create $app pushd $final_path ynh_use_nodejs sudo -u $app env PATH=$PATH:$nodejs_path npm install hoek@^4.2.1 --save -sudo -u $app env PATH=$PATH:$nodejs_path npm install -sudo -u $app env PATH=$PATH:$nodejs_path npm audit fix sudo -u $app env PATH=$PATH:$nodejs_path npm install typescript@>=2.0 --save sudo -u $app env PATH=$PATH:$nodejs_path npm install ts-node +sudo -u $app env PATH=$PATH:$nodejs_path npm install +sudo -u $app env PATH=$PATH:$nodejs_path npm audit fix popd ### Verify the checksum of a file, stored by `ynh_store_file_checksum` in the install script. From cafc1e5cec127eec7c37bd49063448c9ab7774f0 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 30 Jan 2019 19:07:48 +0100 Subject: [PATCH 3/3] Fix $app own before doing install --- scripts/install | 4 ++-- scripts/upgrade | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index f700a20..4599d3a 100644 --- a/scripts/install +++ b/scripts/install @@ -170,6 +170,8 @@ ynh_system_user_create $app $final_path # ... #================================================= +chown -R $app: $final_path + mkdir -p /var/log/$app chown -R $app:$app /var/log/$app @@ -182,8 +184,6 @@ sudo -u $app env PATH=$PATH:$nodejs_path npm install sudo -u $app env PATH=$PATH:$nodejs_path npm audit fix popd -chown -R $app:$app $final_path - #================================================= # SETUP SYSTEMD #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 5022034..7522e2f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -116,6 +116,8 @@ ynh_system_user_create $app # ... #================================================= +chown -R $app: $final_path + pushd $final_path ynh_use_nodejs sudo -u $app env PATH=$PATH:$nodejs_path npm install hoek@^4.2.1 --save