1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/weblate_ynh.git synced 2024-10-01 13:35:04 +02:00

try to simplify things

This commit is contained in:
Thomas 2024-01-18 19:57:54 +01:00 committed by GitHub
parent a00c5fe2db
commit 713f70ec5b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 64 additions and 82 deletions

View file

@ -89,38 +89,34 @@ fi
#================================================= #=================================================
# PIP INSTALLATION # PIP INSTALLATION
#================================================= #=================================================
ynh_script_progression --message="Install weblate using PIP..." --weight=80 ynh_script_progression --message="Install weblate using PIP..." --weight=5
virtualenv --python=python3 "${install_dir}/venv" pushd $install_dir
chown -R $app: "$install_dir" python3 -m venv $install_dir/venv
source $install_dir/venv/bin/activate
ynh_exec_warn_less pip install --upgrade pip setuptools wheel pkgconfig xxhash
#run source in a 'sub shell' # Read the "Note" section in https://docs.weblate.org/en/weblate-5.3/admin/install/venv-debian.html#python-modules
( ynh_exec_warn_less pip install install --force-reinstall --no-binary :all: cffi
set +o nounset
source "${install_dir}/venv/bin/activate"
set -o nounset
cd "${install_dir}"
sudo --user=$app $install_dir/venv/bin/pip install --upgrade pip setuptools wheel pkgconfig xxhash ynh_exec_warn_less pip install Weblate=="$(ynh_app_upstream_version)"
# Read the "Note" section in https://docs.weblate.org/en/weblate-4.11/admin/install/venv-debian.html#python-modules ynh_exec_warn_less pip install psycopg2-binary ruamel.yaml aeidon phply
sudo --user=$app $install_dir/venv/bin/pip install --force-reinstall --no-binary :all: cffi
# Still needed with latest version of weblate?
sudo --user=$app BORG_OPENSSL_PREFIX=/usr/lib/x86_64-linux-gnu/ $install_dir/venv/bin/pip install Weblate=="$(ynh_app_upstream_version)"
sudo --user=$app $install_dir/venv/bin/pip install psycopg2-binary ruamel.yaml aeidon phply
#pip install pytz python-bidi PyYaML Babel pyuca pylibravatar py3dns psycopg2-binary phply django-redis hiredis aeidon ruamel.yaml
# specific to YunoHost package: # specific to YunoHost package:
sudo --user=$app $install_dir/venv/bin/pip install django_sendmail_backend ynh_exec_warn_less pip install django_sendmail_backend
)
popd
#================================================= #=================================================
# ADD A CONFIGURATION # ADD A CONFIGURATION
#================================================= #=================================================
ynh_script_progression --message="Adding a configuration file..." --weight=1 ynh_script_progression --message="Adding a configuration file..." --weight=1
# Configure redis
redis_db=$(ynh_redis_get_free_db) redis_db=$(ynh_redis_get_free_db)
ynh_app_setting_set --app=$app --key=redis_db --value="$redis_db" ynh_app_setting_set --app="$app" --key=redis_db --value="$redis_db"
path="${path%/}" path="${path%/}"
settings="$install_dir/venv/lib/$weblate_pypath/site-packages/weblate/settings.py" settings="$install_dir/venv/lib/$weblate_pypath/site-packages/weblate/settings.py"
@ -146,26 +142,20 @@ chown -R "$app:www-data" "$install_dir/data"
#========================================== #==========================================
ynh_script_progression --message="Filling up the database..." --weight=10 ynh_script_progression --message="Filling up the database..." --weight=10
(
set +o nounset
source "${install_dir}/venv/bin/activate"
set -o nounset
export DJANGO_SETTINGS_MODULE="weblate.settings" export DJANGO_SETTINGS_MODULE="weblate.settings"
cd "${install_dir}"
# the user needs to be weblate for postgresql ynh_exec_warn_less $install_dir/venv/bin/weblate migrate --noinput
ynh_exec_warn_less sudo --user=$app $install_dir/venv/bin/weblate migrate --noinput
# generate static files ynh_exec_warn_less $install_dir/venv/bin/weblate collectstatic --noinput
ynh_exec_warn_less sudo --user=$app $install_dir/venv/bin/weblate collectstatic --noinput
ynh_exec_warn_less sudo --user=$app $install_dir/venv/bin/weblate createadmin --no-color \ ynh_exec_warn_less $install_dir/venv/bin/weblate createadmin --no-color \
--password "$password" \ --password "$password" \
--username "$admin" \ --username "$admin" \
--email "$admin_mail" --email "$admin_mail"
# Check the configuration # Check the configuration
# This may fail in some cases with errors, etc., but the app works and the user can fix issues later. # This may fail in some cases with errors, etc., but the app works and the user can fix issues later.
ynh_exec_warn_less sudo --user=$app $install_dir/venv/bin/weblate check --deploy || true ynh_exec_warn_less $install_dir/venv/bin/weblate check --deploy || true
)
#================================================= #=================================================
# SETUP SYSTEMD # SETUP SYSTEMD
@ -191,7 +181,7 @@ ynh_use_logrotate --non-append
ynh_script_progression --message="Integrating service in YunoHost..." --weight=3 ynh_script_progression --message="Integrating service in YunoHost..." --weight=3
yunohost service add $app --log="/var/log/$app/weblate.log" yunohost service add $app --log="/var/log/$app/weblate.log"
yunohost service add "$app-celery" --log="/var/log/$app/weblate-celery-w1.log" yunohost service add "$app-celery" --log="/var/log/$app/weblate-celery.log"
#================================================= #=================================================
# START SYSTEMD SERVICE # START SYSTEMD SERVICE
@ -199,7 +189,7 @@ yunohost service add "$app-celery" --log="/var/log/$app/weblate-celery-w1.log"
ynh_script_progression --message="Starting a systemd service..." --weight=5 ynh_script_progression --message="Starting a systemd service..." --weight=5
ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/weblate.log" --line_match="spawned uWSGI" ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/weblate.log" --line_match="spawned uWSGI"
ynh_systemd_action --service_name="$app-celery" --action="start" --log_path="/var/log/$app/weblate-celery-celery.log" --line_match="mingle: all alone" ynh_systemd_action --service_name="$app-celery" --action="start" --log_path="/var/log/$app/weblate-celery.log" --line_match="mingle: all alone"
#================================================= #=================================================
# END OF SCRIPT # END OF SCRIPT

View file

@ -85,7 +85,7 @@ ynh_restore_file --origin_path="/etc/logrotate.d/$app"
ynh_script_progression --message="Integrating service in YunoHost..." --weight=3 ynh_script_progression --message="Integrating service in YunoHost..." --weight=3
yunohost service add $app --log="/var/log/$app/weblate.log" yunohost service add $app --log="/var/log/$app/weblate.log"
yunohost service add "$app-celery" --log="/var/log/$app/weblate-celery-w1.log" yunohost service add "$app-celery" --log="/var/log/$app/weblate-celery.log"
#================================================= #=================================================
# START SYSTEMD SERVICE # START SYSTEMD SERVICE
@ -93,7 +93,7 @@ yunohost service add "$app-celery" --log="/var/log/$app/weblate-celery-w1.log"
ynh_script_progression --message="Starting a systemd service..." --weight=5 ynh_script_progression --message="Starting a systemd service..." --weight=5
ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/weblate.log" --line_match="spawned uWSGI" ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/weblate.log" --line_match="spawned uWSGI"
ynh_systemd_action --service_name="$app-celery" --action="start" --log_path="/var/log/$app/weblate-celery-celery.log" --line_match="mingle: all alone" ynh_systemd_action --service_name="$app-celery" --action="start" --log_path="/var/log/$app/weblate-celery.log" --line_match="mingle: all alone"
#================================================= #=================================================
# GENERIC FINALIZATION # GENERIC FINALIZATION

View file

@ -113,30 +113,24 @@ upgrade() {
#================================================= #=================================================
# PIP INSTALLATION # PIP INSTALLATION
#================================================= #=================================================
ynh_script_progression --message="Install weblate using PIP..." --weight=15 ynh_script_progression --message="Install weblate using PIP..." --weight=5
ynh_secure_remove --file="${install_dir}/venv" pushd $install_dir
virtualenv --python=python3 "${install_dir}/venv" python3 -m venv $install_dir/venv
chown -R $app: "$install_dir" source $install_dir/venv/bin/activate
ynh_exec_warn_less pip install --upgrade pip setuptools wheel pkgconfig xxhash
#run source in a 'sub shell' # Read the "Note" section in https://docs.weblate.org/en/weblate-5.3/admin/install/venv-debian.html#python-modules
( ynh_exec_warn_less pip install install --force-reinstall --no-binary :all: cffi
set +o nounset
source "${install_dir}/venv/bin/activate"
set -o nounset
cd "${install_dir}"
sudo --user=$app $install_dir/venv/bin/pip install --upgrade pip setuptools wheel pkgconfig xxhash ynh_exec_warn_less pip install Weblate=="$(ynh_app_upstream_version)"
ynh_exec_warn_less pip install psycopg2-binary ruamel.yaml aeidon phply
# Read the "Note" section in https://docs.weblate.org/en/weblate-4.11/admin/install/venv-debian.html#python-modules
sudo --user=$app $install_dir/venv/bin/pip install --force-reinstall --no-binary :all: cffi
# Still needed with latest version of weblate?
sudo --user=$app $install_dir/venv/bin/pip install --upgrade Weblate=="$new_version"
sudo --user=$app $install_dir/venv/bin/pip install psycopg2-binary ruamel.yaml aeidon phply
#pip install pytz python-bidi PyYaML Babel pyuca pylibravatar py3dns psycopg2-binary phply django-redis hiredis aeidon ruamel.yaml
# specific to YunoHost package: # specific to YunoHost package:
sudo --user=$app $install_dir/venv/bin/pip install django_sendmail_backend ynh_exec_warn_less pip install django_sendmail_backend
)
popd
#================================================= #=================================================
# MODIFY A CONFIG FILE # MODIFY A CONFIG FILE
@ -165,25 +159,23 @@ upgrade() {
ynh_systemd_action --service_name="$app-celery" --action="start" ynh_systemd_action --service_name="$app-celery" --action="start"
(
set +o nounset
source "${install_dir}/venv/bin/activate"
set -o nounset
export DJANGO_SETTINGS_MODULE="weblate.settings" export DJANGO_SETTINGS_MODULE="weblate.settings"
cd "${install_dir}"
sudo --user=$app $install_dir/venv/bin/weblate migrate --noinput ynh_exec_warn_less $install_dir/venv/bin/weblate migrate --noinput
sudo --user=$app $install_dir/venv/bin/weblate collectstatic --noinput
sudo --user=$app $install_dir/venv/bin/weblate setuplang ynh_exec_warn_less $install_dir/venv/bin/weblate collectstatic --noinput
sudo --user=$app $install_dir/venv/bin/weblate setupgroups
sudo --user=$app $install_dir/venv/bin/weblate compilemessages ynh_exec_warn_less $install_dir/venv/bin/weblate setuplang
ynh_exec_warn_less $install_dir/venv/bin/weblate setupgroups
ynh_exec_warn_less $install_dir/venv/bin/weblate compilemessages
# Check the configuration # Check the configuration
# This may fail in some cases with errors, etc., but the app works and the user can fix issues later. # This may fail in some cases with errors, etc., but the app works and the user can fix issues later.
if [ "$new_version" == "$(ynh_app_upstream_version)" ]; then if [ "$new_version" == "$(ynh_app_upstream_version)" ]; then
sudo --user=$app $install_dir/venv/bin/weblate check --deploy || true ynh_exec_warn_less $install_dir/venv/bin/weblate check --deploy || true
fi fi
)
ynh_systemd_action --service_name="$app-celery" --action="stop" ynh_systemd_action --service_name="$app-celery" --action="stop"
} }
@ -230,7 +222,7 @@ ynh_use_logrotate --non-append
ynh_script_progression --message="Integrating service in YunoHost..." --weight=2 ynh_script_progression --message="Integrating service in YunoHost..." --weight=2
yunohost service add $app --log="/var/log/$app/weblate.log" yunohost service add $app --log="/var/log/$app/weblate.log"
yunohost service add "$app-celery" --log="/var/log/$app/weblate-celery-w1.log" yunohost service add "$app-celery" --log="/var/log/$app/weblate-celery.log"
#================================================= #=================================================
# START SYSTEMD SERVICES # START SYSTEMD SERVICES
@ -238,7 +230,7 @@ yunohost service add "$app-celery" --log="/var/log/$app/weblate-celery-w1.log"
ynh_script_progression --message="Starting systemd services..." --weight=5 ynh_script_progression --message="Starting systemd services..." --weight=5
ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/weblate.log" --line_match="spawned uWSGI" ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/weblate.log" --line_match="spawned uWSGI"
ynh_systemd_action --service_name="$app-celery" --action="start" --log_path="/var/log/$app/weblate-celery-celery.log" --line_match="mingle: all alone" ynh_systemd_action --service_name="$app-celery" --action="start" --log_path="/var/log/$app/weblate-celery.log" --line_match="mingle: all alone"
#================================================= #=================================================
# END OF SCRIPT # END OF SCRIPT