1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/coin_ynh.git synced 2024-09-03 18:16:26 +02:00
This commit is contained in:
yalh76 2022-09-03 18:27:29 +02:00
parent 126c35b3cb
commit ed536471b2
5 changed files with 188 additions and 186 deletions

View file

@ -1,6 +1,6 @@
#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
location __PATH__/ { location __PATH__/ {
try_files $uri @__NAME__; try_files $uri @__NAME__;
} }
location __PATH__/protected/ { location __PATH__/protected/ {

View file

@ -120,9 +120,9 @@ ynh_script_progression --message="Installing more dependencies..." --weight=1
pushd "$final_path" pushd "$final_path"
ynh_use_python ynh_use_python
ynh_exec_warn_less $ynh_pip install --upgrade pip ynh_exec_warn_less $ynh_pip install --upgrade pip
ynh_exec_warn_less $ynh_pip install gunicorn ynh_exec_warn_less $ynh_pip install gunicorn
echo "django-auth-ldap<1.4" >> $final_path/requirements.txt echo "django-auth-ldap<1.4" >> $final_path/requirements.txt
ynh_exec_warn_less $ynh_pip install -r $final_path/requirements.txt ynh_exec_warn_less $ynh_pip install -r $final_path/requirements.txt
popd popd
#================================================= #=================================================

View file

@ -105,9 +105,9 @@ ynh_script_progression --message="Installing more dependencies..." --weight=1
pushd "$final_path" pushd "$final_path"
ynh_use_python ynh_use_python
ynh_exec_warn_less $ynh_pip install --upgrade pip ynh_exec_warn_less $ynh_pip install --upgrade pip
ynh_exec_warn_less $ynh_pip install gunicorn ynh_exec_warn_less $ynh_pip install gunicorn
echo "django-auth-ldap<1.4" >> $final_path/requirements.txt echo "django-auth-ldap<1.4" >> $final_path/requirements.txt
ynh_exec_warn_less $ynh_pip install -r $final_path/requirements.txt ynh_exec_warn_less $ynh_pip install -r $final_path/requirements.txt
popd popd
#================================================= #=================================================

View file

@ -138,28 +138,30 @@ ynh_store_file_checksum --file="$final_path/coin/settings_local.py"
pushd "$final_path" pushd "$final_path"
ynh_use_python ynh_use_python
#================================================= #=================================================
# PYTHON DEPENDENCIES # PYTHON DEPENDENCIES
#================================================= #=================================================
ynh_script_progression --message="Installing more dependencies..." --weight=1 ynh_script_progression --message="Installing more dependencies..." --weight=1
echo "django-auth-ldap<1.4" >> $final_path/requirements.txt ynh_exec_warn_less $ynh_pip install --upgrade pip
ynh_exec_warn_less $ynh_pip install -r $final_path/requirements.txt ynh_exec_warn_less $ynh_pip install gunicorn
echo "django-auth-ldap<1.4" >> $final_path/requirements.txt
#================================================= ynh_exec_warn_less $ynh_pip install -r $final_path/requirements.txt
# MIGRATE DB
#================================================= #=================================================
ynh_script_progression --message="Migrating database..." --weight=1 # MIGRATE DB
#=================================================
ynh_script_progression --message="Migrating database..." --weight=1
ynh_exec_warn_less $ynh_python manage.py migrate --noinput ynh_exec_warn_less $ynh_python manage.py migrate --noinput
#================================================= #=================================================
# COLLECT FILES # COLLECT FILES
#================================================= #=================================================
ynh_script_progression --message="Collecting files..." --weight=1 ynh_script_progression --message="Collecting files..." --weight=1
ynh_exec_warn_less $ynh_python manage.py collectstatic --noinput ynh_exec_warn_less $ynh_python manage.py collectstatic --noinput
popd popd
chmod 750 "$final_path" chmod 750 "$final_path"

View file

@ -2,9 +2,9 @@
ynh_python_try_bash_extension() { ynh_python_try_bash_extension() {
if [ -x src/configure ]; then if [ -x src/configure ]; then
src/configure && make -C src || { src/configure && make -C src || {
ynh_print_info --message="Optional bash extension failed to build, but things will still work normally." ynh_print_info --message="Optional bash extension failed to build, but things will still work normally."
} }
fi fi
} }
@ -40,13 +40,13 @@ pyenv_dependencies="make build-essential libssl-dev zlib1g-dev libbz2-dev librea
# Finally, to start a Python service with the correct version, 2 solutions # Finally, to start a Python service with the correct version, 2 solutions
# Either the app is dependent of python or pip, but does not called it directly. # Either the app is dependent of python or pip, but does not called it directly.
# In such situation, you need to load PATH # In such situation, you need to load PATH
# `Environment="__YNH_PYTHON_LOAD_PATH__"` # `Environment="__YNH_PYTHON_LOAD_PATH__"`
# `ExecStart=__FINALPATH__/my_app` # `ExecStart=__FINALPATH__/my_app`
# You will replace __YNH_PYTHON_LOAD_PATH__ with $ynh_python_load_path # You will replace __YNH_PYTHON_LOAD_PATH__ with $ynh_python_load_path
# #
# Or Python start the app directly, then you don't need to load the PATH variable # Or Python start the app directly, then you don't need to load the PATH variable
# `ExecStart=__YNH_PYTHON__ my_app run` # `ExecStart=__YNH_PYTHON__ my_app run`
# You will replace __YNH_PYTHON__ with $ynh_python # You will replace __YNH_PYTHON__ with $ynh_python
# #
# #
# one other variable is also available # one other variable is also available
@ -56,32 +56,32 @@ pyenv_dependencies="make build-essential libssl-dev zlib1g-dev libbz2-dev librea
# #
# Requires YunoHost version 3.2.2 or higher. # Requires YunoHost version 3.2.2 or higher.
ynh_use_python () { ynh_use_python () {
python_version=$(ynh_app_setting_get --app=$app --key=python_version) python_version=$(ynh_app_setting_get --app=$app --key=python_version)
# Get the absolute path of this version of Python # Get the absolute path of this version of Python
ynh_python_path="$python_version_path/$YNH_APP_INSTANCE_NAME/bin" ynh_python_path="$python_version_path/$YNH_APP_INSTANCE_NAME/bin"
# Allow alias to be used into bash script # Allow alias to be used into bash script
shopt -s expand_aliases shopt -s expand_aliases
# Create an alias for the specific version of Python and a variable as fallback # Create an alias for the specific version of Python and a variable as fallback
ynh_python="$ynh_python_path/python" ynh_python="$ynh_python_path/python"
alias ynh_python="$ynh_python" alias ynh_python="$ynh_python"
# And pip # And pip
ynh_pip="$ynh_python_path/pip" ynh_pip="$ynh_python_path/pip"
alias ynh_pip="$ynh_pip" alias ynh_pip="$ynh_pip"
# Load the path of this version of Python in $PATH # Load the path of this version of Python in $PATH
if [[ :$PATH: != *":$ynh_python_path"* ]]; then if [[ :$PATH: != *":$ynh_python_path"* ]]; then
PATH="$ynh_python_path:$PATH" PATH="$ynh_python_path:$PATH"
fi fi
# Create an alias to easily load the PATH # Create an alias to easily load the PATH
ynh_python_load_path="PATH=$PATH" ynh_python_load_path="PATH=$PATH"
# Sets the local application-specific Python version # Sets the local application-specific Python version
pushd $final_path pushd $final_path
$pyenv_install_dir/bin/pyenv local $python_version $pyenv_install_dir/bin/pyenv local $python_version
popd popd
} }
# Install a specific version of Python # Install a specific version of Python
@ -101,120 +101,120 @@ ynh_use_python () {
# #
# Requires YunoHost version 3.2.2 or higher. # Requires YunoHost version 3.2.2 or higher.
ynh_install_python () { ynh_install_python () {
# Declare an array to define the options of this helper. # Declare an array to define the options of this helper.
local legacy_args=v local legacy_args=v
local -A args_array=( [v]=python_version= ) local -A args_array=( [v]=python_version= )
local python_version local python_version
# Manage arguments with getopts # Manage arguments with getopts
ynh_handle_getopts_args "$@" ynh_handle_getopts_args "$@"
# Install required dependencies # Install required dependencies
ynh_add_app_dependencies --package="$pyenv_dependencies" ynh_add_app_dependencies --package="$pyenv_dependencies"
# Load pyenv path in PATH # Load pyenv path in PATH
local CLEAR_PATH="$pyenv_install_dir/bin:$PATH" local CLEAR_PATH="$pyenv_install_dir/bin:$PATH"
# Remove /usr/local/bin in PATH in case of Python prior installation # Remove /usr/local/bin in PATH in case of Python prior installation
PATH=$(echo $CLEAR_PATH | sed 's@/usr/local/bin:@@') PATH=$(echo $CLEAR_PATH | sed 's@/usr/local/bin:@@')
# Move an existing Python binary, to avoid to block pyenv # Move an existing Python binary, to avoid to block pyenv
#test -x /usr/bin/python && mv /usr/bin/python /usr/bin/python_pyenv #test -x /usr/bin/python && mv /usr/bin/python /usr/bin/python_pyenv
# Install or update pyenv # Install or update pyenv
pyenv="$(command -v pyenv $pyenv_install_dir/bin/pyenv | head -1)" pyenv="$(command -v pyenv $pyenv_install_dir/bin/pyenv | head -1)"
if [ -n "$pyenv" ]; then if [ -n "$pyenv" ]; then
ynh_print_info --message="pyenv already seems installed in \`$pyenv'." ynh_print_info --message="pyenv already seems installed in \`$pyenv'."
pushd "${pyenv%/*/*}" pushd "${pyenv%/*/*}"
if git remote -v 2>/dev/null | grep "https://github.com/pyenv/pyenv.git"; then if git remote -v 2>/dev/null | grep "https://github.com/pyenv/pyenv.git"; then
ynh_print_info --message="Trying to update with git..." ynh_print_info --message="Trying to update with git..."
git pull -q --tags origin master git pull -q --tags origin master
cd .. cd ..
ynh_python_try_bash_extension ynh_python_try_bash_extension
fi fi
popd popd
else else
ynh_print_info --message="Installing pyenv with git..." ynh_print_info --message="Installing pyenv with git..."
mkdir -p $pyenv_install_dir mkdir -p $pyenv_install_dir
pushd $pyenv_install_dir pushd $pyenv_install_dir
git init -q git init -q
git remote add -f -t master origin https://github.com/pyenv/pyenv.git > /dev/null 2>&1 git remote add -f -t master origin https://github.com/pyenv/pyenv.git > /dev/null 2>&1
git checkout -q -b master origin/master git checkout -q -b master origin/master
ynh_python_try_bash_extension ynh_python_try_bash_extension
pyenv=$pyenv_install_dir/bin/pyenv pyenv=$pyenv_install_dir/bin/pyenv
popd popd
fi fi
pyenv_virtualenv="$(command -v "$pyenv_install_dir"/plugins/*/bin/pyenv-virtualenv pyenv-virtualenv | head -1)" pyenv_virtualenv="$(command -v "$pyenv_install_dir"/plugins/*/bin/pyenv-virtualenv pyenv-virtualenv | head -1)"
if [ -n "$pyenv_virtualenv" ]; then if [ -n "$pyenv_virtualenv" ]; then
ynh_print_info --message="\`pyenv virtualenv' command already available in \`$pyenv_virtualenv'." ynh_print_info --message="\`pyenv virtualenv' command already available in \`$pyenv_virtualenv'."
pushd "${pyenv_virtualenv%/*/*}" pushd "${pyenv_virtualenv%/*/*}"
if git remote -v 2>/dev/null | grep "https://github.com/pyenv/pyenv-virtualenv.git"; then if git remote -v 2>/dev/null | grep "https://github.com/pyenv/pyenv-virtualenv.git"; then
ynh_print_info --message="Trying to update pyenv-virtualenv with git..." ynh_print_info --message="Trying to update pyenv-virtualenv with git..."
git pull -q origin master git pull -q origin master
fi fi
popd popd
else else
ynh_print_info --message="Installing pyenv-virtualenv with git..." ynh_print_info --message="Installing pyenv-virtualenv with git..."
mkdir -p "${pyenv_install_dir}/plugins" mkdir -p "${pyenv_install_dir}/plugins"
git clone -q https://github.com/pyenv/pyenv-virtualenv.git "${pyenv_install_dir}/plugins/pyenv-virtualenv" git clone -q https://github.com/pyenv/pyenv-virtualenv.git "${pyenv_install_dir}/plugins/pyenv-virtualenv"
fi fi
pyenv_latest="$(command -v "$pyenv_install_dir"/plugins/*/bin/pyenv-latest pyenv-latest | head -1)" pyenv_latest="$(command -v "$pyenv_install_dir"/plugins/*/bin/pyenv-latest pyenv-latest | head -1)"
if [ -n "$pyenv_latest" ]; then if [ -n "$pyenv_latest" ]; then
ynh_print_info --message="\`pyenv latest' command already available in \`$pyenv_latest'." ynh_print_info --message="\`pyenv latest' command already available in \`$pyenv_latest'."
pushd "${pyenv_latest%/*/*}" pushd "${pyenv_latest%/*/*}"
if git remote -v 2>/dev/null | grep "https://github.com/momo-lab/xxenv-latest.git"; then if git remote -v 2>/dev/null | grep "https://github.com/momo-lab/xxenv-latest.git"; then
ynh_print_info --message="Trying to update xxenv-latest with git..." ynh_print_info --message="Trying to update xxenv-latest with git..."
git pull -q origin master git pull -q origin master
fi fi
popd popd
else else
ynh_print_info --message="Installing xxenv-latest with git..." ynh_print_info --message="Installing xxenv-latest with git..."
mkdir -p "${pyenv_install_dir}/plugins" mkdir -p "${pyenv_install_dir}/plugins"
git clone -q https://github.com/momo-lab/xxenv-latest.git "${pyenv_install_dir}/plugins/xxenv-latest" git clone -q https://github.com/momo-lab/xxenv-latest.git "${pyenv_install_dir}/plugins/xxenv-latest"
fi fi
# Enable caching # Enable caching
mkdir -p "${pyenv_install_dir}/cache" mkdir -p "${pyenv_install_dir}/cache"
# Create shims directory if needed # Create shims directory if needed
mkdir -p "${pyenv_install_dir}/shims" mkdir -p "${pyenv_install_dir}/shims"
# Restore /usr/local/bin in PATH # Restore /usr/local/bin in PATH
PATH=$CLEAR_PATH PATH=$CLEAR_PATH
# And replace the old Python binary # And replace the old Python binary
# test -x /usr/bin/python_pyenv && mv /usr/bin/python_pyenv /usr/bin/python # test -x /usr/bin/python_pyenv && mv /usr/bin/python_pyenv /usr/bin/python
# Install the requested version of Python # Install the requested version of Python
local final_python_version=$(pyenv latest --print $python_version) local final_python_version=$(pyenv latest --print $python_version)
ynh_print_info --message="Installation of Python-$python_version" ynh_print_info --message="Installation of Python-$python_version"
pyenv install --skip-existing $final_python_version > /dev/null 2>&1 pyenv install --skip-existing $final_python_version > /dev/null 2>&1
# Store python_version into the config of this app # Store python_version into the config of this app
ynh_app_setting_set --app=$YNH_APP_INSTANCE_NAME --key=python_version --value=$python_version ynh_app_setting_set --app=$YNH_APP_INSTANCE_NAME --key=python_version --value=$python_version
# Remove app virtualenv # Remove app virtualenv
if `pyenv virtualenvs | grep --quiet "$YNH_APP_INSTANCE_NAME " 1>/dev/null 2>&1` if `pyenv virtualenvs | grep --quiet "$YNH_APP_INSTANCE_NAME " 1>/dev/null 2>&1`
then then
pyenv virtualenv-delete --force $YNH_APP_INSTANCE_NAME pyenv virtualenv-delete --force $YNH_APP_INSTANCE_NAME
fi fi
# Create app virtualenv # Create app virtualenv
pyenv virtualenv --force $python_version $YNH_APP_INSTANCE_NAME pyenv virtualenv --force $python_version $YNH_APP_INSTANCE_NAME
# Cleanup Python versions # Cleanup Python versions
ynh_cleanup_python ynh_cleanup_python
# Set environment for Python users # Set environment for Python users
echo "#pyenv echo "#pyenv
export PYENV_ROOT=$pyenv_install_dir export PYENV_ROOT=$pyenv_install_dir
export PATH=\"$pyenv_install_dir/bin:$PATH\" export PATH=\"$pyenv_install_dir/bin:$PATH\"
eval \"\$(pyenv init -)\" eval \"\$(pyenv init -)\"
#pyenv" > /etc/profile.d/pyenv.sh #pyenv" > /etc/profile.d/pyenv.sh
# Load the environment # Load the environment
eval "$(pyenv init -)" eval "$(pyenv init -)"
} }
# Remove the version of Python used by the app. # Remove the version of Python used by the app.
@ -223,21 +223,21 @@ eval \"\$(pyenv init -)\"
# #
# usage: ynh_remove_python # usage: ynh_remove_python
ynh_remove_python () { ynh_remove_python () {
local python_version=$(ynh_app_setting_get --app=$YNH_APP_INSTANCE_NAME --key=python_version) local python_version=$(ynh_app_setting_get --app=$YNH_APP_INSTANCE_NAME --key=python_version)
# Load pyenv path in PATH # Load pyenv path in PATH
local CLEAR_PATH="$pyenv_install_dir/bin:$PATH" local CLEAR_PATH="$pyenv_install_dir/bin:$PATH"
# Remove /usr/local/bin in PATH in case of Python prior installation # Remove /usr/local/bin in PATH in case of Python prior installation
PATH=$(echo $CLEAR_PATH | sed 's@/usr/local/bin:@@') PATH=$(echo $CLEAR_PATH | sed 's@/usr/local/bin:@@')
pyenv virtualenv-delete --force $YNH_APP_INSTANCE_NAME pyenv virtualenv-delete --force $YNH_APP_INSTANCE_NAME
# Remove the line for this app # Remove the line for this app
ynh_app_setting_delete --app=$YNH_APP_INSTANCE_NAME --key=python_version ynh_app_setting_delete --app=$YNH_APP_INSTANCE_NAME --key=python_version
# Cleanup Python versions # Cleanup Python versions
ynh_cleanup_python ynh_cleanup_python
} }
# Remove no more needed versions of Python used by the app. # Remove no more needed versions of Python used by the app.
@ -249,35 +249,35 @@ ynh_remove_python () {
# usage: ynh_cleanup_python # usage: ynh_cleanup_python
ynh_cleanup_python () { ynh_cleanup_python () {
# List required Python versions # List required Python versions
local installed_apps=$(yunohost app list | grep -oP 'id: \K.*$') local installed_apps=$(yunohost app list | grep -oP 'id: \K.*$')
local required_python_versions="" local required_python_versions=""
for installed_app in $installed_apps for installed_app in $installed_apps
do do
local installed_app_python_version=$(ynh_app_setting_get --app=$installed_app --key="python_version") local installed_app_python_version=$(ynh_app_setting_get --app=$installed_app --key="python_version")
if [[ $installed_app_python_version ]] if [[ $installed_app_python_version ]]
then then
required_python_versions="${installed_app_python_version}\n${required_python_versions}" required_python_versions="${installed_app_python_version}\n${required_python_versions}"
fi fi
done done
# Remove no more needed Python versions # Remove no more needed Python versions
local installed_python_versions=$(pyenv versions --bare --skip-aliases | grep -Ev '/') local installed_python_versions=$(pyenv versions --bare --skip-aliases | grep -Ev '/')
for installed_python_version in $installed_python_versions for installed_python_version in $installed_python_versions
do do
if ! `echo ${required_python_versions} | grep "${installed_python_version}" 1>/dev/null 2>&1` if ! `echo ${required_python_versions} | grep "${installed_python_version}" 1>/dev/null 2>&1`
then then
ynh_print_info --message="Removing of Python-$installed_python_version" ynh_print_info --message="Removing of Python-$installed_python_version"
$pyenv_install_dir/bin/pyenv uninstall --force $installed_python_version $pyenv_install_dir/bin/pyenv uninstall --force $installed_python_version
fi fi
done done
# If none Python version is required # If none Python version is required
if [[ ! $required_python_versions ]] if [[ ! $required_python_versions ]]
then then
# Remove pyenv environment configuration # Remove pyenv environment configuration
ynh_print_info --message="Removing of pyenv-$pyenv_version" ynh_print_info --message="Removing of pyenv-$pyenv_version"
ynh_secure_remove --file="$pyenv_install_dir" ynh_secure_remove --file="$pyenv_install_dir"
ynh_secure_remove --file="/etc/profile.d/pyenv.sh" ynh_secure_remove --file="/etc/profile.d/pyenv.sh"
fi fi
} }