From cf104d46cf0731b5f20389efb0849238dfddb523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Mon, 29 Jan 2024 19:13:32 +0100 Subject: [PATCH] cleanup packagingv2 install --- conf/uwsgi.ini | 4 ++-- scripts/install | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conf/uwsgi.ini b/conf/uwsgi.ini index 4db9104..cc51cbf 100644 --- a/conf/uwsgi.ini +++ b/conf/uwsgi.ini @@ -17,7 +17,7 @@ lazy-apps = true enable-threads = true # Application base folder -base = __INSTALL_DIR__ +base = __INSTALL_DIR__/source # Support running the module from a webserver subdirectory. route-run = fixpathinfo: @@ -28,7 +28,7 @@ module = searx.webapp # Virtualenv and python path virtualenv = __INSTALL_DIR__/venv pythonpath = __INSTALL_DIR__/venv -chdir = __INSTALL_DIR__/searx/ +chdir = __INSTALL_DIR__/source/searx/ # The variable holding flask application callable = app diff --git a/scripts/install b/scripts/install index 2b9280e..15bbfea 100644 --- a/scripts/install +++ b/scripts/install @@ -15,10 +15,10 @@ source /usr/share/yunohost/helpers ynh_script_progression --message="Setting up source files..." --weight=2 # Download, check integrity, uncompress and patch the source from app.src -ynh_setup_source --dest_dir="$install_dir" +ynh_setup_source --dest_dir="$install_dir/source" chmod -R o-rwx "$install_dir" -chown -R $app: "$install_dir" +chown -R "$app:" "$install_dir" #================================================= # NGINX CONFIGURATION @@ -50,13 +50,13 @@ popd ynh_script_progression --message="Configuring Searx..." --weight=2 secret_key=$(ynh_string_random) -ynh_add_config --template="settings.yml" --destination="$install_dir/searx/settings.yml" +ynh_add_config --template="settings.yml" --destination="$install_dir/source/searx/settings.yml" #================================================= # SET PERMISSIONS ON SEARX DIRECTORY #================================================= -chown -R $app: $install_dir +chown -R "$app:" "$install_dir" #================================================= # CONFIGURE UWSGI FOR SEARX @@ -73,7 +73,7 @@ ynh_add_uwsgi_service ynh_script_progression --message="Starting a systemd service..." --weight=4 # Start a systemd service -ynh_systemd_action --service_name=uwsgi-app@$app.service --action=start --line_match="spawned uWSGI master process" --log_path="/var/log/uwsgi/$app/$app.log" +ynh_systemd_action --service_name="uwsgi-app@$app.service" --action=start --line_match="spawned uWSGI master process" --log_path="/var/log/uwsgi/$app/$app.log" #================================================= # END OF SCRIPT