diff --git a/conf/systemd.service b/conf/systemd.service index 77c1105..4d7c12a 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="__YNH_NODE_LOAD_PATH__" Environment="THELOUNGE_HOME=__DATA_DIR__/" Environment="NODE_ENV=production" ExecStart=/usr/bin/yarn start diff --git a/manifest.toml b/manifest.toml index 1cdc700..bbfe54f 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ description.fr = "Client Web IRC" version = "4.4.3~ynh2" -maintainers = ["rafi59"] +maintainers = [] [upstream] license = "MIT" diff --git a/scripts/backup b/scripts/backup index 8846907..f495cf1 100644 --- a/scripts/backup +++ b/scripts/backup @@ -32,10 +32,6 @@ ynh_backup --src_path="$data_dir" --is_big ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# BACKUP SYSTEMD -#================================================= - ynh_backup --src_path="/etc/systemd/system/$app.service" #================================================= diff --git a/scripts/install b/scripts/install index 7f1ef6c..cb849bb 100644 --- a/scripts/install +++ b/scripts/install @@ -28,14 +28,6 @@ ynh_setup_source --dest_dir=$install_dir chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=1 - -# Create a dedicated NGINX config -ynh_add_nginx_config - #================================================= # SPECIFIC SETUP #================================================= @@ -45,6 +37,9 @@ ynh_script_progression --message="Modifying a config file..." --weight=1 ynh_add_config --template="config.js" --destination="$data_dir/config.js" +chmod 400 "$data_dir/config.js" +chown "$app:$app" "$data_dir/config.js" + #================================================= # INSTALL THE LOUNGE #================================================= @@ -61,13 +56,10 @@ popd #================================================= ynh_script_progression --message="Configuring a systemd service..." --weight=1 -env_path="$PATH" -ynh_add_systemd_config +# Create a dedicated NGINX config +ynh_add_nginx_config -#================================================= -# INTEGRATE SERVICE IN YUNOHOST -#================================================= -ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 +ynh_add_systemd_config yunohost service add $app --description="Client Web IRC" --log="/var/log/$app/$app.log" diff --git a/scripts/upgrade b/scripts/upgrade index d625b24..0e550a8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -55,7 +55,6 @@ ynh_script_progression --message="Upgrading system configurations related to $ap ynh_add_nginx_config -env_path="$PATH" ynh_add_systemd_config yunohost service add $app --description="Client Web IRC" --log="/var/log/$app/$app.log"