mirror of
https://github.com/YunoHost-Apps/jappix_ynh.git
synced 2024-09-03 19:26:19 +02:00
Fix
This commit is contained in:
parent
4944504589
commit
e3743b18c1
8 changed files with 13 additions and 35 deletions
|
@ -1,7 +1,7 @@
|
||||||
# Jappix for YunoHost
|
# Jappix for YunoHost
|
||||||
|
|
||||||
[](https://dash.yunohost.org/appci/app/jappix)  
|
[](https://dash.yunohost.org/appci/app/jappix)  
|
||||||
[](https://install-app.yunohost.org/?app=jappix)
|
[](https://install-app.yunohost.org/?app=jappix)
|
||||||
|
|
||||||
> *This package allows you to install Jappix quickly and simply on a YunoHost server.
|
> *This package allows you to install Jappix quickly and simply on a YunoHost server.
|
||||||
If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
|
If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
|
||||||
|
@ -13,8 +13,8 @@ Jappix is a fully-featured XMPP web-client with an open social platform which en
|
||||||
|
|
||||||
#### Supported architectures
|
#### Supported architectures
|
||||||
|
|
||||||
* x86-64 - [](https://ci-apps.yunohost.org/ci/apps/jappix/)
|
* x86-64 - [](https://ci-apps.yunohost.org/ci/apps/jappix/)
|
||||||
* ARMv8-A - [](https://ci-apps-arm.yunohost.org/ci/apps/jappix/)
|
* ARMv8-A - [](https://ci-apps-arm.yunohost.org/ci/apps/jappix/)
|
||||||
|
|
||||||
## Links
|
## Links
|
||||||
|
|
||||||
|
|
|
@ -17,8 +17,6 @@
|
||||||
incorrect_path=0
|
incorrect_path=0
|
||||||
port_already_use=0
|
port_already_use=0
|
||||||
change_url=0
|
change_url=0
|
||||||
;;; Levels
|
|
||||||
Level 5=auto
|
|
||||||
;;; Options
|
;;; Options
|
||||||
Email=
|
Email=
|
||||||
Notification=none
|
Notification=none
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
"email": "titoko@titoko.fr"
|
"email": "titoko@titoko.fr"
|
||||||
},
|
},
|
||||||
"requirements": {
|
"requirements": {
|
||||||
"yunohost": ">> 3.8.1"
|
"yunohost": ">> 4.1.7"
|
||||||
},
|
},
|
||||||
"multi_instance": false,
|
"multi_instance": false,
|
||||||
"services": [
|
"services": [
|
||||||
|
@ -26,19 +26,11 @@
|
||||||
{
|
{
|
||||||
"name": "domain",
|
"name": "domain",
|
||||||
"type": "domain",
|
"type": "domain",
|
||||||
"ask": {
|
|
||||||
"en": "Choose a domain for Jappix",
|
|
||||||
"fr": "Choisissez un domaine pour Jappix"
|
|
||||||
},
|
|
||||||
"example": "domain.org"
|
"example": "domain.org"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "path",
|
"name": "path",
|
||||||
"type": "path",
|
"type": "path",
|
||||||
"ask": {
|
|
||||||
"en": "Choose a path for Jappix",
|
|
||||||
"fr": "Choisissez un chemin pour Jappix"
|
|
||||||
},
|
|
||||||
"example": "/jappix",
|
"example": "/jappix",
|
||||||
"default": "/jappix"
|
"default": "/jappix"
|
||||||
},
|
},
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# SETUP
|
# SETUP
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
|
@ -77,15 +77,8 @@ ynh_add_nginx_config
|
||||||
# Set Jappix configuration
|
# Set Jappix configuration
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
||||||
cp ../conf/hosts.xml $final_path/store/conf/hosts.xml
|
ynh_add_config --template="../conf/hosts.xml" --destination="$final_path/store/conf/hosts.xml"
|
||||||
|
ynh_add_config --template="../conf/main.xml" --destination="$final_path/store/conf/main.xml"
|
||||||
ynh_replace_string --match_string="__DOMAIN__" --replace_string=$domain --target_file="$final_path/store/conf/hosts.xml"
|
|
||||||
ynh_replace_string --match_string="__FINALPATH__" --replace_string=$final_path --target_file="$final_path/store/conf/hosts.xml"
|
|
||||||
|
|
||||||
cp ../conf/main.xml $final_path/store/conf/main.xml
|
|
||||||
|
|
||||||
ynh_replace_string --match_string="__LANGUAGE__" --replace_string=$language --target_file="$final_path/store/conf/main.xml"
|
|
||||||
ynh_replace_string --match_string="__NAME__" --replace_string=$name --target_file="$final_path/store/conf/main.xml"
|
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# RELOAD NGINX
|
# RELOAD NGINX
|
||||||
|
|
|
@ -30,7 +30,7 @@ ynh_secure_remove --file=$final_path
|
||||||
#=================================================
|
#=================================================
|
||||||
# REMOVE NGINX CONFIGURATION
|
# REMOVE NGINX CONFIGURATION
|
||||||
#=================================================
|
#=================================================
|
||||||
ynh_script_progression --message="Removing nginx web server configuration..." --weight=1
|
ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1
|
||||||
|
|
||||||
# Remove the dedicated nginx config
|
# Remove the dedicated nginx config
|
||||||
ynh_remove_nginx_config
|
ynh_remove_nginx_config
|
||||||
|
|
|
@ -56,7 +56,7 @@ ynh_restore_file --origin_path=$final_path
|
||||||
#=================================================
|
#=================================================
|
||||||
# RELOAD NGINX AND PHP-FPM
|
# RELOAD NGINX AND PHP-FPM
|
||||||
#=================================================
|
#=================================================
|
||||||
ynh_script_progression --message="Reloading nginx web server..." --weight=1
|
ynh_script_progression --message="Reloading NGINX web server..." --weight=1
|
||||||
|
|
||||||
ynh_systemd_action --service_name=nginx --action=reload
|
ynh_systemd_action --service_name=nginx --action=reload
|
||||||
|
|
||||||
|
|
|
@ -81,7 +81,7 @@ chown -R www-data: $final_path
|
||||||
#=================================================
|
#=================================================
|
||||||
# NGINX CONFIGURATION
|
# NGINX CONFIGURATION
|
||||||
#=================================================
|
#=================================================
|
||||||
ynh_script_progression --message="Upgrading nginx web server configuration..." --weight=1
|
ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
|
||||||
|
|
||||||
# Create a dedicated nginx config
|
# Create a dedicated nginx config
|
||||||
ynh_add_nginx_config
|
ynh_add_nginx_config
|
||||||
|
@ -90,15 +90,8 @@ ynh_add_nginx_config
|
||||||
# Set Jappix configuration
|
# Set Jappix configuration
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
||||||
cp ../conf/hosts.xml $final_path/store/conf/hosts.xml
|
ynh_add_config --template="../conf/hosts.xml" --destination="$final_path/store/conf/hosts.xml"
|
||||||
|
ynh_add_config --template="../conf/main.xml" --destination="$final_path/store/conf/main.xml"
|
||||||
ynh_replace_string --match_string="__DOMAIN__" --replace_string=$domain --target_file="$final_path/store/conf/hosts.xml"
|
|
||||||
ynh_replace_string --match_string="__FINALPATH__" --replace_string=$final_path --target_file="$final_path/store/conf/hosts.xml"
|
|
||||||
|
|
||||||
cp ../conf/main.xml $final_path/store/conf/main.xml
|
|
||||||
|
|
||||||
ynh_replace_string --match_string="__LANGUAGE__" --replace_string=$language --target_file="$final_path/store/conf/main.xml"
|
|
||||||
ynh_replace_string --match_string="__NAME__" --replace_string=$name --target_file="$final_path/store/conf/main.xml"
|
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# RELOAD NGINX
|
# RELOAD NGINX
|
||||||
|
|
Loading…
Add table
Reference in a new issue