diff --git a/conf/systemd.service b/conf/systemd.service index b7b4887..7182b2b 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -7,7 +7,7 @@ Type=simple User=__APP__ Group=__APP__ WorkingDirectory=__INSTALL_DIR__ -Environment="PATH=__ENV_PATH__" +Environment="PATH=__PATH_WITH_NODEJS__" ExecStart=__NODEJS_DIR__/npm start StandardOutput=append:/var/log/__APP__/__APP__.log StandardError=inherit diff --git a/manifest.toml b/manifest.toml index 2a37511..08991c4 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,7 +17,7 @@ userdoc = "https://hastebin.com/about.md" code = "https://github.com/toptal/haste-server" [integration] -yunohost = ">= 11.2.18" +yunohost = ">= 11.2.29" helpers_version = "2.1" architectures = "all" multi_instance = false diff --git a/scripts/install b/scripts/install index 99aeaec..3f0a726 100755 --- a/scripts/install +++ b/scripts/install @@ -25,7 +25,6 @@ ynh_script_progression "Configuring NGINX web server..." ynh_config_add_nginx -env_path="$PATH" ynh_config_add_systemd mkdir -p /var/log/$app @@ -53,7 +52,7 @@ ynh_replace --match="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.m ynh_script_progression "Installing $app..." pushd "$install_dir" - ynh_hide_warnings npm install + ynh_hide_warnings ynh_exec_as_app npm install popd #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 4cb8479..bcdc274 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -33,7 +33,6 @@ ynh_config_add_nginx ynh_config_add_logrotate -env_path="$PATH" ynh_config_add_systemd yunohost service add $app --description="Haste is a pastebin software" --log="/var/log/$app/$app.log" @@ -44,7 +43,7 @@ yunohost service add $app --description="Haste is a pastebin software" --log="/v ynh_script_progression "Installing $app..." pushd "$install_dir" - ynh_hide_warnings ynh_hide_warnings ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install + ynh_hide_warnings ynh_exec_as_app npm install popd #=================================================