diff --git a/conf/settings.py b/conf/settings.py index 7c1229d..f52fe78 100644 --- a/conf/settings.py +++ b/conf/settings.py @@ -155,7 +155,7 @@ DEFAULT_AUTO_FIELD = "django.db.models.AutoField" # URL prefix to use, please see documentation for more details # WARNING: this must be without trailing slash (this is why we set __PATH2__ (cf. loaded settings in install and upgrade)) -URL_PREFIX = "__PATH2__" +URL_PREFIX = "__PATH_NO_SLASH__" # Absolute filesystem path to the directory that will hold user-uploaded files. MEDIA_ROOT = os.path.join(DATA_DIR, "media") diff --git a/manifest.toml b/manifest.toml index ce2f08b..5ac42af 100644 --- a/manifest.toml +++ b/manifest.toml @@ -9,7 +9,7 @@ description.fr = "Plateforme de traduction utilisant Git et Python" version = "5.3.1~ynh1" -maintainers = ["YunoHost Contributors"] +maintainers = ["Thovi98"] [upstream] license = "AGPL-3.0" @@ -19,6 +19,7 @@ admindoc = "https://docs.weblate.org/" userdoc = "https://docs.weblate.org/" code = "https://github.com/WeblateOrg/weblate" cpe = "cpe:2.3:a:weblate:weblate" +fund = "https://weblate.org/fr/donate/" [integration] yunohost = ">= 11.2.0" @@ -62,7 +63,6 @@ ram.runtime = "3G" ask.fr = "Nom d'utilisateur de votre forge" type = "string" example = "Your username" - default = "username" optional = true [install.forge_token] @@ -70,7 +70,6 @@ ram.runtime = "3G" ask.fr = "Jeton de votre forge (OAuth)" type = "string" example = "A secret token" - default = "thisisanexampletoken" optional = true [resources] @@ -93,8 +92,11 @@ ram.runtime = "3G" main.default = 8080 [resources.apt] - #first = weblate dependecies, after hub = borgbackup dependencies - packages = "libxml2-dev, libxslt-dev, libfreetype6-dev, libjpeg-dev, libz-dev, libyaml-dev, libffi-dev, libcairo-dev, gir1.2-pango-1.0, libgirepository1.0-dev, libacl1-dev, libssl-dev, libpq-dev, libjpeg62-turbo-dev, build-essential, python3-gdbm, python3-dev, python3-pip, python3-venv, python3-virtualenv, virtualenv, git, uwsgi, uwsgi-plugin-python3, redis-server, postgresql, postgresql-contrib, hub, libacl1-dev, libacl1, libssl-dev, liblz4-dev, libzstd-dev, libxxhash-dev, build-essential, pkg-config, python3-pkgconfig" + # §1 = weblate dependecies, §2 = borgbackup dependencies + packages = ["libxml2-dev, libxslt-dev, libfreetype6-dev, libjpeg-dev, libz-dev, libyaml-dev, libffi-dev, libcairo-dev, gir1.2-pango-1.0, libgirepository1.0-dev, libacl1-dev, libssl-dev, libpq-dev, libjpeg62-turbo-dev, build-essential, python3-gdbm, python3-dev, python3-pip, python3-venv, python3-virtualenv, virtualenv, git, uwsgi, uwsgi-plugin-python3, redis-server, postgresql, postgresql-contrib, hub, + + + libacl1-dev, libacl1, libssl-dev, liblz4-dev, libzstd-dev, libxxhash-dev, build-essential, pkg-config, python3-pkgconfig"] [resources.database] type = "postgresql" diff --git a/scripts/install b/scripts/install index 92ae346..3dfd209 100755 --- a/scripts/install +++ b/scripts/install @@ -30,7 +30,7 @@ ynh_app_setting_set --app=$app --key=forge_token --value=$forge_token #================================================= # Remove trailing "/" for next commands -path2=${path%/} +path_no_slash=${path%/} #================================================= # CREATE A POSTGRESQL DATABASE diff --git a/scripts/upgrade b/scripts/upgrade index b73554e..dce0edb 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -18,7 +18,7 @@ admin_mail=$(ynh_user_get_info --username="$admin" --key=mail) key=$(ynh_string_random --length=50) # Remove trailing "/" for next commands -path2=${path%/} +path_no_slash=${path%/} #================================================= # CHECK VERSION