mirror of
https://github.com/YunoHost-Apps/fittrackee_ynh.git
synced 2024-09-03 18:36:16 +02:00
Merge branch 'testing' into master
This commit is contained in:
oufmilo
GitHub
commit
ef83fb989e
10 changed files with 39 additions and 30 deletions
|
|
@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
|
|||
BookWyrm is a social network for tracking your reading, talking about books, writing reviews, and discovering what to read next.
|
||||
|
||||
|
||||
**Shipped version:** 0.5.3~ynh1
|
||||
**Shipped version:** 0.5.4~ynh1
|
||||
|
||||
**Demo:** https://joinbookwyrm.com/fr/
|
||||
|
||||
|
|
@ -30,7 +30,7 @@ BookWyrm is a social network for tracking your reading, talking about books, wri
|
|||
|
||||
This project is still young and isn't, at the moment, very stable, so please proceed with caution when running in production.
|
||||
|
||||
Generate the admin code with 'sudo -u bookwyrm /var/www/bookwyrm/venv/bin/python3 /var/www/bookwyrm/manage.py admin_code',
|
||||
Generate the admin code with `sudo -u bookwyrm /var/www/bookwyrm/venv/bin/python3 /var/www/bookwyrm/manage.py admin_code`,
|
||||
and copy the admin code to use when you create your admin account. You can get your code
|
||||
at any time by re-running that command. Here's an example output:
|
||||
```
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
|
|||
BookWyrm est un réseau social pour garder la trace de vos lectures, parler de livres, écrire des critiques et découvrir quoi lire ensuite.
|
||||
|
||||
|
||||
**Version incluse :** 0.5.3~ynh1
|
||||
**Version incluse :** 0.5.4~ynh1
|
||||
|
||||
**Démo :** https://joinbookwyrm.com/fr/
|
||||
|
||||
|
|
@ -30,7 +30,7 @@ BookWyrm est un réseau social pour garder la trace de vos lectures, parler de l
|
|||
|
||||
Ce projet est encore jeune et n'est pas, pour le moment, très stable, faites preuve de prudence lors de son utilisation en production.
|
||||
|
||||
Générez le code administrateur avec 'sudo -u bookwyrm /var/www/bookwyrm/venv/bin/python3 /var/www/bookwyrm/manage.py admin_code',
|
||||
Générez le code administrateur avec `sudo -u bookwyrm /var/www/bookwyrm/venv/bin/python3 /var/www/bookwyrm/manage.py admin_code`,
|
||||
et copiez le code administrateur à utiliser lors de la création de votre compte administrateur. Vous pouvez obtenir votre code
|
||||
à tout moment en réexécutant cette commande. Voici un exemple de sortie :
|
||||
```
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ DEFAULT_LANGUAGE="English"
|
|||
## Leave unset to allow all hosts
|
||||
#ALLOWED_HOSTS="localhost,127.0.0.1,[::1]"
|
||||
|
||||
MEDIA_ROOT=images/
|
||||
MEDIA_ROOT=__DATADIR__/images/
|
||||
|
||||
# Database configuration
|
||||
PGPORT=5432
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ location __PATH__/ {
|
|||
}
|
||||
|
||||
location /images/ {
|
||||
alias __FINALPATH__/images/;
|
||||
alias __DATADIR__/images/;
|
||||
}
|
||||
|
||||
location /static/ {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
This project is still young and isn't, at the moment, very stable, so please proceed with caution when running in production.
|
||||
|
||||
Generate the admin code with 'sudo -u bookwyrm /var/www/bookwyrm/venv/bin/python3 /var/www/bookwyrm/manage.py admin_code',
|
||||
Generate the admin code with `sudo -u bookwyrm /var/www/bookwyrm/venv/bin/python3 /var/www/bookwyrm/manage.py admin_code`,
|
||||
and copy the admin code to use when you create your admin account. You can get your code
|
||||
at any time by re-running that command. Here's an example output:
|
||||
```
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
Ce projet est encore jeune et n'est pas, pour le moment, très stable, faites preuve de prudence lors de son utilisation en production.
|
||||
|
||||
Générez le code administrateur avec 'sudo -u bookwyrm /var/www/bookwyrm/venv/bin/python3 /var/www/bookwyrm/manage.py admin_code',
|
||||
Générez le code administrateur avec `sudo -u bookwyrm /var/www/bookwyrm/venv/bin/python3 /var/www/bookwyrm/manage.py admin_code`,
|
||||
et copiez le code administrateur à utiliser lors de la création de votre compte administrateur. Vous pouvez obtenir votre code
|
||||
à tout moment en réexécutant cette commande. Voici un exemple de sortie :
|
||||
```
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
"en": "Platform for social reading",
|
||||
"fr": "Plateforme de lecture sociale"
|
||||
},
|
||||
"version": "0.5.3~ynh1",
|
||||
"version": "0.5.4~ynh1",
|
||||
"url": "https://github.com/bookwyrm-social/bookwyrm",
|
||||
"upstream": {
|
||||
"license": "AGPL-3.0-or-later",
|
||||
|
|
@ -22,8 +22,8 @@
|
|||
"requirements": {
|
||||
"yunohost": ">= 11.0.9"
|
||||
},
|
||||
"multi_instance": true,
|
||||
"services": [
|
||||
"multi_instance": true,
|
||||
"services": [
|
||||
"nginx",
|
||||
"postgresql"
|
||||
],
|
||||
|
|
@ -33,7 +33,6 @@
|
|||
"name": "domain",
|
||||
"type": "domain"
|
||||
},
|
||||
|
||||
{
|
||||
"name": "is_public",
|
||||
"type": "boolean",
|
||||
|
|
@ -46,7 +45,15 @@
|
|||
"en": "Choose the application language",
|
||||
"fr": "Choisissez la langue de l'application"
|
||||
},
|
||||
"choices": ["de-de", "en-us", "es-es", "fr-fr", "it-it", "pt-pt", "zh-hans"],
|
||||
"choices": [
|
||||
"de-de",
|
||||
"en-us",
|
||||
"es-es",
|
||||
"fr-fr",
|
||||
"it-it",
|
||||
"pt-pt",
|
||||
"zh-hans"
|
||||
],
|
||||
"default": "fr-fr"
|
||||
},
|
||||
{
|
||||
|
|
|
|||
|
|
@ -105,6 +105,21 @@ chmod 750 "$final_path"
|
|||
chmod -R o-rwx "$final_path"
|
||||
chown -R $app:www-data "$final_path"
|
||||
|
||||
#=================================================
|
||||
# CREATE DATA DIRECTORY
|
||||
#=================================================
|
||||
ynh_script_progression --message="Creating a data directory..." --weight=1
|
||||
|
||||
datadir=/home/yunohost.app/$app
|
||||
ynh_app_setting_set --app=$app --key=datadir --value=$datadir
|
||||
|
||||
mkdir -p $datadir
|
||||
mkdir -p $datadir/images
|
||||
|
||||
chmod 750 "$datadir"
|
||||
chmod -R o-rwx "$datadir"
|
||||
chown -R $app:www-data "$datadir"
|
||||
|
||||
#=================================================
|
||||
# CONFIGURE THEN INSTALL SCRIPT AND DEPENDENCIES
|
||||
#=================================================
|
||||
|
|
@ -143,20 +158,6 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=1
|
|||
# Create a dedicated NGINX config
|
||||
ynh_add_nginx_config
|
||||
|
||||
#=================================================
|
||||
# CREATE DATA DIRECTORY
|
||||
#=================================================
|
||||
ynh_script_progression --message="Creating a data directory..." --weight=1
|
||||
|
||||
datadir=/home/yunohost.app/$app
|
||||
ynh_app_setting_set --app=$app --key=datadir --value=$datadir
|
||||
|
||||
mkdir -p $datadir
|
||||
|
||||
chmod 750 "$datadir"
|
||||
chmod -R o-rwx "$datadir"
|
||||
chown -R $app:www-data "$datadir"
|
||||
|
||||
#=================================================
|
||||
# SETUP SYSTEMD
|
||||
#=================================================
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
|
|||
#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)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue