diff --git a/scripts/_common.sh b/scripts/_common.sh index 4946a6e..2bccbe6 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= # dependencies used by the app -pkg_dependencies="postgresql postgresql-contrib python3 python3-venv libpq-dev docker-compose-plugin" +pkg_dependencies="postgresql postgresql-contrib python3-venv libpq-dev" #================================================= # PERSONAL HELPERS diff --git a/scripts/upgrade b/scripts/upgrade index 05c1100..e532939 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -21,14 +21,14 @@ path_url=$(ynh_app_setting_get --app=$app --key=path) language=$(ynh_app_setting_get --app=$app --key=language) admin=$(ynh_app_setting_get --app=$app --key=admin) final_path=$(ynh_app_setting_get --app=$app --key=final_path) -db_name=$(ynh_app_setting_get --app=$app --key=db_name) -db_user=$(ynh_app_setting_get --app=$app --key=db_user) -db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) +#db_name=$(ynh_app_setting_get --app=$app --key=db_name) +#db_user=$(ynh_app_setting_get --app=$app --key=db_user) +#db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) port=$(ynh_app_setting_get --app=$app --key=port) datadir=$(ynh_app_setting_get --app=$app --key=datadir) admin_mail=$(ynh_user_get_info --username=$admin --key=username) -key=$(ynh_string_random --length=32) +#key=$(ynh_string_random --length=32) #================================================= # CHECK VERSION @@ -92,6 +92,7 @@ chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" + #================================================= # CONFIGURE THEN INSTALL SCRIPT AND DEPENDENCIES #================================================= @@ -107,15 +108,9 @@ $final_path/venv/bin/pip3 install -r "$final_path/requirements.txt" #================================================= ynh_script_progression --message="Upgrading database..." --weight=1 -pushd "$final_path" - docker-compose build - docker-compose run --rm web python manage.py migrate - docker-compose run --rm web python manage.py compile_themes - docker-compose run --rm web python manage.py collectstatic --no-input - docker-compose down - docker-compose up -d - docker-compose run --rm web python manage.py populate_streams -popd +$final_path/venv/bin/python3 "$final_path/manage.py" migrate +$final_path/venv/bin/python3 "$final_path/manage.py" collectstatic --no-input +$final_path/venv/bin/python3 "$final_path/manage.py" populate_streams #================================================= # SET PERMISSIONS ON BOOKWYRM DIRECTORY @@ -131,17 +126,6 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." - # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# UPDATE A CONFIG FILE -#================================================= -ynh_script_progression --message="Updating a config file..." --weight=1 - -ynh_add_config --template="../conf/.env.production" --destination="$final_path/.env" -chmod 600 $final_path/.env -chown $app:www-data "$final_path/.env" - -set -a; source "$final_path/.env"; set +a - #================================================= # SETUP SYSTEMD #=================================================