1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/jappix_ynh.git synced 2024-09-03 19:26:19 +02:00

Merge pull request #29 from YunoHost-Apps/testing

Testing
This commit is contained in:
eric_G 2023-12-17 16:08:57 +01:00 committed by GitHub
commit 70af42a5c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 9 additions and 16 deletions

View file

@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
A free social network A free social network
**Shipped version:** 1.2~ynh1 **Shipped version:** 1.2~ynh2
## Screenshots ## Screenshots

View file

@ -18,7 +18,7 @@ Si vous navez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
Un réseau social libre Un réseau social libre
**Version incluse :** 1.2~ynh1 **Version incluse :** 1.2~ynh2
## Captures décran ## Captures décran

View file

@ -4,10 +4,6 @@ location __PATH__/ {
# Path to source # Path to source
alias __FINALPATH__/ ; alias __FINALPATH__/ ;
if ($scheme = http) {
rewrite ^ https://$server_name$request_uri? permanent;
}
index index.php; index index.php;
try_files $uri $uri/ index.php; try_files $uri $uri/ index.php;

View file

@ -6,7 +6,7 @@
"en": "A free social network", "en": "A free social network",
"fr": "Un réseau social libre" "fr": "Un réseau social libre"
}, },
"version": "1.2~ynh1", "version": "1.2~ynh2",
"url": "https://jappix.org/", "url": "https://jappix.org/",
"upstream": { "upstream": {
"license": "AGPL-3.0-only", "license": "AGPL-3.0-only",
@ -19,7 +19,7 @@
"email": "titoko@titoko.fr" "email": "titoko@titoko.fr"
}, },
"requirements": { "requirements": {
"yunohost": ">> 4.2.4" "yunohost": ">> 11.2"
}, },
"multi_instance": false, "multi_instance": false,
"services": [ "services": [
@ -30,8 +30,7 @@
"install" : [ "install" : [
{ {
"name": "domain", "name": "domain",
"type": "domain", "type": "domain"
"example": "domain.org"
}, },
{ {
"name": "path", "name": "path",
@ -51,7 +50,7 @@
}, },
{ {
"name": "language", "name": "language",
"type": "string", "type": "select",
"ask": { "ask": {
"en": "Choose the default language of Jappix", "en": "Choose the default language of Jappix",
"fr": "Choissisez la langue par défaut de Jappix" "fr": "Choissisez la langue par défaut de Jappix"

View file

@ -88,6 +88,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
#================================================= #=================================================
# Set Jappix configuration # Set Jappix configuration
#================================================= #=================================================
ynh_script_progression --message="Configuring Jappix..." --weight=1
mkdir -p "$final_path/store/conf" mkdir -p "$final_path/store/conf"

View file

@ -32,10 +32,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
#================================================= #=================================================
ynh_script_progression --message="Validating restoration parameters..." --weight=2 ynh_script_progression --message="Validating restoration parameters..." --weight=2
ynh_webpath_available --domain=$domain --path_url=$path_url \ test ! -d $final_path || ynh_die --message="There is already a directory: $final_path "
|| ynh_die --message="Path not available: ${domain}${path_url}"
test ! -d $final_path \
|| ynh_die --message="There is already a directory: $final_path "
#================================================= #=================================================
# STANDARD RESTORATION STEPS # STANDARD RESTORATION STEPS

View file

@ -67,7 +67,6 @@ ynh_system_user_create --username=$app --home_dir="$final_path"
#================================================= #=================================================
# DOWNLOAD, CHECK AND UNPACK SOURCE # DOWNLOAD, CHECK AND UNPACK SOURCE
#================================================= #=================================================
ynh_script_progression --message="Setting up source files..." --weight=6
if [ "$upgrade_type" == "UPGRADE_APP" ] if [ "$upgrade_type" == "UPGRADE_APP" ]
then then
@ -100,6 +99,7 @@ ynh_add_fpm_config
#================================================= #=================================================
# Set Jappix configuration # Set Jappix configuration
#================================================= #=================================================
ynh_script_progression --message="Configuring Jappix..." --weight=1
mkdir -p "$final_path/store/conf" mkdir -p "$final_path/store/conf"