mirror of
https://github.com/YunoHost-Apps/grocy_ynh.git
synced 2024-09-03 19:25:54 +02:00
Éric Gaspar
GitHub
parent
cbbb845cc8
commit
9f88060a54
9 changed files with 45 additions and 42 deletions
|
|
@ -24,8 +24,8 @@ Grocy is a web-based self-hosted groceries & household management solution for y
|
|||
## Configuration
|
||||
|
||||
Default login
|
||||
user: **admin**
|
||||
password: **admin**
|
||||
* user: **admin**
|
||||
* password: **admin**
|
||||
|
||||
## Documentation
|
||||
|
||||
|
|
@ -41,8 +41,8 @@ Grocy is a web-based self-hosted groceries & household management solution for y
|
|||
|
||||
#### Supported architectures
|
||||
|
||||
* x86-64 - [](https://ci-apps.yunohost.org/ci/apps/grocy/)
|
||||
* ARMv8-A - [](https://ci-apps-arm.yunohost.org/ci/apps/grocy/)
|
||||
* x86-64 - [](https://ci-apps.yunohost.org/ci/apps/grocy/)
|
||||
* ARMv8-A - [](https://ci-apps-arm.yunohost.org/ci/apps/grocy/)
|
||||
|
||||
## Limitations
|
||||
|
||||
|
|
|
|||
|
|
@ -24,8 +24,8 @@ Grocy is a web-based self-hosted groceries & household management solution for y
|
|||
## Configuration
|
||||
|
||||
Connexion par défaut
|
||||
utilisateur : **admin**
|
||||
mot de passe : **admin**
|
||||
* utilisateur : **admin**
|
||||
* mot de passe : **admin**
|
||||
|
||||
## Documentation
|
||||
|
||||
|
|
@ -41,8 +41,8 @@ Connexion par défaut
|
|||
|
||||
#### Supported architectures
|
||||
|
||||
* x86-64 - [](https://ci-apps.yunohost.org/ci/apps/grocy/)
|
||||
* ARMv8-A - [](https://ci-apps-arm.yunohost.org/ci/apps/grocy/)
|
||||
* x86-64 - [](https://ci-apps.yunohost.org/ci/apps/grocy/)
|
||||
* ARMv8-A - [](https://ci-apps-arm.yunohost.org/ci/apps/grocy/)
|
||||
|
||||
## Limitations
|
||||
|
||||
|
|
|
|||
|
|
@ -18,14 +18,14 @@
|
|||
setup_private=1
|
||||
setup_public=1
|
||||
upgrade=1
|
||||
upgrade=1 from_commit=cbbb845cc8d7324b6e23ab6d7739233523283542
|
||||
backup_restore=1
|
||||
multi_instance=1
|
||||
port_already_use=0
|
||||
change_url=1
|
||||
;;; Options
|
||||
Email=
|
||||
Notification=none
|
||||
;;; Upgrade options
|
||||
; commit=CommitHash
|
||||
name=Name and date of the commit.
|
||||
; commit=cbbb845cc8d7324b6e23ab6d7739233523283542
|
||||
name=Testing (#8)
|
||||
manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666&
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
"en": "Web-based groceries & household management solution for your home",
|
||||
"fr": "Solution Web de gestion d'épicerie et de gestion de la maison"
|
||||
},
|
||||
"version": "3.0.1~ynh1",
|
||||
"version": "3.0.1~ynh2",
|
||||
"url": "https://github.com/grocy/grocy",
|
||||
"license": "MIT",
|
||||
"maintainer": {
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
"email": ""
|
||||
},
|
||||
"requirements": {
|
||||
"yunohost": ">= 4.0.0"
|
||||
"yunohost": ">= 4.1.7"
|
||||
},
|
||||
"multi_instance": true,
|
||||
"services": [
|
||||
|
|
@ -25,14 +25,6 @@
|
|||
"install": [{
|
||||
"name": "domain",
|
||||
"type": "domain",
|
||||
"ask": {
|
||||
"en": "Choose a domain name for Grocy",
|
||||
"fr": "Choisissez un nom de domaine pour Grocy"
|
||||
},
|
||||
"help": {
|
||||
"en": "Grocy needs to be installed in its own root domain or subdomain.",
|
||||
"fr": "Grocy doit être installé dans son propre domaine racine ou sous-domaine."
|
||||
},
|
||||
"example": "grocy.example.com"
|
||||
},
|
||||
{
|
||||
|
|
@ -48,14 +40,6 @@
|
|||
{
|
||||
"name": "is_public",
|
||||
"type": "boolean",
|
||||
"ask": {
|
||||
"en": "Is it a public site?",
|
||||
"fr": "Est-ce un site public ?"
|
||||
},
|
||||
"help": {
|
||||
"en": "If enabled, Grocy will be accessible by people who do not have an account. This can be changed later via the webadmin.",
|
||||
"fr": "Si cette case est cochée, Grocy sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin."
|
||||
},
|
||||
"default": true
|
||||
}
|
||||
]
|
||||
|
|
|
|||
16
pull_request_template.md
Normal file
16
pull_request_template.md
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
## Problem
|
||||
- *Description of why you made this PR*
|
||||
|
||||
## Solution
|
||||
- *And how do you fix that problem*
|
||||
|
||||
## PR Status
|
||||
- [ ] Code finished.
|
||||
- [ ] Tested with Package_check.
|
||||
- [ ] Fix or enhancement tested.
|
||||
- [ ] Upgrade from last version tested.
|
||||
- [ ] Can be reviewed and tested.
|
||||
|
||||
## Package_check results
|
||||
---
|
||||
* An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"*
|
||||
|
|
@ -17,7 +17,7 @@ old_domain=$YNH_APP_OLD_DOMAIN
|
|||
old_path=$YNH_APP_OLD_PATH
|
||||
|
||||
new_domain=$YNH_APP_NEW_DOMAIN
|
||||
new_path=$YNH_APP_NEW_PATH
|
||||
new_path="/"
|
||||
|
||||
app=$YNH_APP_INSTANCE_NAME
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ ynh_abort_if_errors
|
|||
|
||||
# Retrieve arguments
|
||||
domain=$YNH_APP_ARG_DOMAIN
|
||||
path_url=$"/"
|
||||
path_url="/"
|
||||
is_public=$YNH_APP_ARG_IS_PUBLIC
|
||||
language=$YNH_APP_ARG_LANGUAGE
|
||||
|
||||
|
|
@ -45,7 +45,6 @@ ynh_script_progression --message="Storing installation settings..." --weight=1
|
|||
|
||||
ynh_app_setting_set --app=$app --key=domain --value=$domain
|
||||
ynh_app_setting_set --app=$app --key=path --value=$path_url
|
||||
ynh_app_setting_set --app=$app --key=is_public --value=$is_public
|
||||
ynh_app_setting_set --app=$app --key=language --value=$language
|
||||
|
||||
#=================================================
|
||||
|
|
@ -86,9 +85,7 @@ phpversion=$(ynh_app_setting_get --app="$app" --key=phpversion)
|
|||
# MODIFY A CONFIG FILE
|
||||
#=================================================
|
||||
|
||||
cp -a ../conf/config-dist.php "$final_path/data/config.php"
|
||||
|
||||
ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$final_path/data/config.php"
|
||||
ynh_add_config --template="../conf/config-dist.php" --destination="$final_path/data/config.php"
|
||||
|
||||
#=================================================
|
||||
# STORE THE CONFIG FILE CHECKSUM
|
||||
|
|
@ -104,17 +101,18 @@ ynh_store_file_checksum --file="$final_path/data/config.php"
|
|||
|
||||
# Set permissions to app files
|
||||
chown -R $app: $final_path
|
||||
chmod o-rwx $final_path
|
||||
chmod -R 755 $final_path/data
|
||||
|
||||
#=================================================
|
||||
# SETUP SSOWAT
|
||||
#=================================================
|
||||
ynh_script_progression --message="Configuring SSOwat..." --weight=1
|
||||
ynh_script_progression --message="Configuring permissions..." --weight=1
|
||||
|
||||
# Make app public if necessary or protect it
|
||||
if [ $is_public -eq 1 ]
|
||||
then
|
||||
ynh_permission_update --permission "main" --add "visitors"
|
||||
ynh_permission_update --permission="main" --add="visitors"
|
||||
fi
|
||||
|
||||
#=================================================
|
||||
|
|
|
|||
|
|
@ -77,6 +77,7 @@ ynh_add_fpm_config --package="$extra_php_dependencies"
|
|||
|
||||
# Restore permissions on app files
|
||||
chown -R $app: $final_path
|
||||
chmod o-rwx $final_path
|
||||
chmod -R 755 $final_path/data
|
||||
|
||||
#=================================================
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@ app=$YNH_APP_INSTANCE_NAME
|
|||
|
||||
domain=$(ynh_app_setting_get --app=$app --key=domain)
|
||||
path_url=$(ynh_app_setting_get --app=$app --key=path)
|
||||
is_public=$(ynh_app_setting_get --app=$app --key=is_public)
|
||||
final_path=$(ynh_app_setting_get --app=$app --key=final_path)
|
||||
language=$(ynh_app_setting_get --app=$app --key=language)
|
||||
phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
|
||||
|
|
@ -40,6 +39,13 @@ if [ -z "$final_path" ]; then
|
|||
ynh_app_setting_set --app=$app --key=final_path --value=$final_path
|
||||
fi
|
||||
|
||||
# Cleaning legacy permissions
|
||||
if ynh_legacy_permissions_exists; then
|
||||
ynh_legacy_permissions_delete_all
|
||||
|
||||
ynh_app_setting_delete --app=$app --key=is_public
|
||||
fi
|
||||
|
||||
#=================================================
|
||||
# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
|
||||
#=================================================
|
||||
|
|
@ -109,10 +115,7 @@ ynh_add_fpm_config --package="$extra_php_dependencies"
|
|||
# MODIFY A CONFIG FILE
|
||||
#=================================================
|
||||
|
||||
cp -a ../conf/config-dist.php "$final_path/data/config.php"
|
||||
|
||||
ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$final_path/data/config.php"
|
||||
|
||||
ynh_add_config --template="../conf/config-dist.php" --destination="$final_path/data/config.php"
|
||||
|
||||
#=================================================
|
||||
# SECURE FILES AND DIRECTORIES
|
||||
|
|
@ -120,6 +123,7 @@ ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --
|
|||
|
||||
# Set permissions to app files
|
||||
chown -R $app: $final_path
|
||||
chmod o-rwx $final_path
|
||||
chmod -R 755 $final_path/data
|
||||
|
||||
#=================================================
|
||||
|
|
|
|||
Loading…
Reference in a new issue