YunoHost-Apps/facilmap_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/facilmap_ynh.git synced 2024-09-03 18:36:07 +02:00
Code Issues Activity Actions

Merge pull request #14 from YunoHost-Apps/testing

Browse source 
Testing
This commit is contained in:
Alexandre Aubin 2021-11-29 18:38:33 +01:00 • committed by GitHub
commit a3a904754e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 8 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
Collaborative maps and routing with a straightforward interface Collaborative maps and routing with a straightforward interface
**Shipped version:** 3.3.0~ynh2 **Shipped version:** 3.4.0~ynh1
**Demo:** https://facilmap.org/ **Demo:** https://facilmap.org/

2
README_fr.md
View file

@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
Carte collaborative avec une interface simple et pratique Carte collaborative avec une interface simple et pratique
**Version incluse :** 3.3.0~ynh2 **Version incluse :** 3.4.0~ynh1
**Démo :** https://facilmap.org/ **Démo :** https://facilmap.org/

5
conf/nginx.conf
View file

@ -1,11 +1,6 @@
#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
location __PATH__/ { location __PATH__/ {
# Force usage of https
# if ($scheme = http) {
# rewrite ^ https://$server_name$request_uri? permanent;
# }
proxy_pass http://127.0.0.1:__PORT__/; proxy_pass http://127.0.0.1:__PORT__/;
proxy_redirect off; proxy_redirect off;
proxy_set_header Host $host; proxy_set_header Host $host;

7
manifest.json
View file

@ -6,7 +6,7 @@
"en": "Collaborative maps and routing with a straightforward interface", "en": "Collaborative maps and routing with a straightforward interface",
"fr": "Carte collaborative avec une interface simple et pratique" "fr": "Carte collaborative avec une interface simple et pratique"
}, },
"version": "3.3.0~ynh2", "version": "3.4.0~ynh1",
"url": "https://github.com/FacilMap/facilmap", "url": "https://github.com/FacilMap/facilmap",
"upstream": { "upstream": {
"license": "AGPL-3.0", "license": "AGPL-3.0",
@ -23,7 +23,7 @@
"url": "https://squeak.eauchat.org" "url": "https://squeak.eauchat.org"
}, },
"requirements": { "requirements": {
"yunohost": ">= 4.2.4" "yunohost": ">= 4.3.0"
}, },
"multi_instance": true, "multi_instance": true,
"services": [ "services": [
@ -34,8 +34,7 @@
"install" : [ "install" : [
{ {
"name": "domain", "name": "domain",
"type": "domain", "type": "domain"
"example": "example.com"
}, },
{ {
"name": "path", "name": "path",

5
scripts/_common.sh
View file

@ -4,12 +4,9 @@
# COMMON VARIABLES # COMMON VARIABLES
#================================================= #=================================================
# dependencies used by the app
pkg_dependencies=""
nodejs_version=14 nodejs_version=14
facilmap_version=3.3.0 facilmap_version=3.4.0
#================================================= #=================================================
# PERSONAL HELPERS # PERSONAL HELPERS

5
scripts/install
View file

@ -78,7 +78,6 @@ ynh_app_setting_set --app=$app --key=port --value=$port
#================================================= #=================================================
ynh_script_progression --message="Installing dependencies..." --weight=6 ynh_script_progression --message="Installing dependencies..." --weight=6
ynh_install_app_dependencies $pkg_dependencies
ynh_install_nodejs --nodejs_version=$nodejs_version ynh_install_nodejs --nodejs_version=$nodejs_version
#================================================= #=================================================
@ -103,7 +102,7 @@ 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=100 ynh_script_progression --message="Setting up source files..." --weight=10
ynh_app_setting_set --app=$app --key=final_path --value=$final_path ynh_app_setting_set --app=$app --key=final_path --value=$final_path
@ -120,7 +119,7 @@ ynh_add_nginx_config
#================================================= #=================================================
# BUILD NODE DEPENDENCIES # BUILD NODE DEPENDENCIES
#================================================= #=================================================
ynh_script_progression --message="Building node dependencies..." --weight=200 ynh_script_progression --message="Building node dependencies..." --weight=20
mkdir -p $final_path mkdir -p $final_path
chown -R $app $final_path chown -R $app $final_path

3
scripts/restore
View file

@ -38,8 +38,6 @@ db_user=$db_name
#================================================= #=================================================
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 \
|| ynh_die --message="Path not available: ${domain}${path_url}"
test ! -d $final_path \ test ! -d $final_path \
|| ynh_die --message="There is already a directory: $final_path " || ynh_die --message="There is already a directory: $final_path "
@ -78,7 +76,6 @@ chown -R $app:www-data "$final_path"
ynh_script_progression --message="Reinstalling dependencies..." --weight=10 ynh_script_progression --message="Reinstalling dependencies..." --weight=10
# Define and install dependencies # Define and install dependencies
ynh_install_app_dependencies $pkg_dependencies
ynh_install_nodejs --nodejs_version=$nodejs_version ynh_install_nodejs --nodejs_version=$nodejs_version
#================================================= #=================================================

1
scripts/upgrade
View file

@ -81,7 +81,6 @@ ynh_add_nginx_config
#================================================= #=================================================
ynh_script_progression --message="Upgrading dependencies..." --weight=10 ynh_script_progression --message="Upgrading dependencies..." --weight=10
ynh_install_app_dependencies $pkg_dependencies
ynh_install_nodejs --nodejs_version=$nodejs_version ynh_install_nodejs --nodejs_version=$nodejs_version
#================================================= #=================================================