1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/2FAuth_ynh.git synced 2024-09-03 20:36:18 +02:00

Merge pull request #50 from YunoHost-Apps/testing

cleaning
This commit is contained in:
eric_G 2023-12-22 15:50:37 +01:00 committed by GitHub
commit fa0b2be5e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 11 additions and 19 deletions

View file

@ -27,7 +27,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
- Edit accounts, even the imported ones
- Generate TOTP and HOTP security codes
**Shipped version:** 4.2.4~ynh1
**Shipped version:** 5.0.0~ynh1
**Demo:** https://demo.2fauth.app/login

View file

@ -27,7 +27,7 @@ Si vous navez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
- Modifier les comptes, même ceux importés
- Générer des codes de sécurité TOTP et HOTP
**Version incluse :** 4.2.4~ynh1
**Version incluse :** 5.0.0~ynh1
**Démo :** https://demo.2fauth.app/login

View file

@ -5,7 +5,7 @@ name = "2FAuth"
description.en = "self-hosted alternative to One Time Passcode"
description.fr = "Alternative auto-hébergée a One Time Passcode"
version = "4.2.4~ynh1"
version = "5.0.0~ynh1"
maintainers = ["eric_G"]
@ -44,8 +44,8 @@ ram.runtime = "50M"
[resources.sources]
[resources.sources.main]
url = "https://github.com/Bubka/2FAuth/archive/refs/tags/v4.2.4.tar.gz"
sha256 = "997bec1648eb0dce453415eaff43ef53e9310b2c2fb15c6acd0e5c04f7b700ee"
url = "https://github.com/Bubka/2FAuth/archive/refs/tags/v5.0.0.tar.gz"
sha256 = "7664a8275320b92b0246cb017ca121b92906e9bc85c0a013b6b1ef95485e622e"
autoupdate.strategy = "latest_github_tag"
[resources.system_user]

View file

@ -6,7 +6,6 @@
# IMPORT GENERIC HELPERS
#=================================================
# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
source ../settings/scripts/_common.sh
source /usr/share/yunohost/helpers

View file

@ -34,6 +34,7 @@ ynh_script_progression --message="Setting up source files..." --weight=1
# Download, check integrity, uncompress and patch the source from app.src
ynh_setup_source --dest_dir="$install_dir"
chmod -R o-rwx "$install_dir"
chown -R $app:www-data "$install_dir"
#=================================================
@ -41,10 +42,8 @@ chown -R $app:www-data "$install_dir"
#=================================================
ynh_script_progression --message="Configuring PHP-FPM..." --weight=2
# Create a dedicated PHP-FPM config
ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint
# Create a dedicated NGINX config
ynh_add_nginx_config
#=================================================
@ -60,7 +59,7 @@ ynh_install_composer --install_args="--prefer-dist --no-scripts --no-dev"
ynh_script_progression --message="Adding a configuration file..." --weight=1
# Setup application config
ynh_add_config --template="../conf/.env.example" --destination="$install_dir/.env"
ynh_add_config --template=".env.example" --destination="$install_dir/.env"
chmod 644 "$install_dir/.env"
chown $app:$app "$install_dir/.env"

View file

@ -17,12 +17,6 @@ ynh_script_progression --message="Removing NGINX web server configuration..." --
# Remove the dedicated NGINX config
ynh_remove_nginx_config
#=================================================
# REMOVE PHP-FPM CONFIGURATION
#=================================================
ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=1
# Remove the dedicated PHP-FPM config
ynh_remove_fpm_config
#=================================================

View file

@ -17,6 +17,7 @@ ynh_script_progression --message="Restoring the app main directory..." --weight=
ynh_restore_file --origin_path="$install_dir"
chmod -R o-rwx "$install_dir"
chown -R $app:www-data "$install_dir"
#=================================================

View file

@ -50,6 +50,7 @@ then
ynh_setup_source --dest_dir="$install_dir" --keep="storage .env"
fi
chmod -R o-rwx "$install_dir"
chown -R $app:www-data "$install_dir"
#=================================================
@ -57,10 +58,8 @@ chown -R $app:www-data "$install_dir"
#=================================================
ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1
# Create a dedicated PHP-FPM config
ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint
ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint
# Create a dedicated NGINX config
ynh_add_nginx_config
#=================================================
@ -71,7 +70,7 @@ ynh_add_nginx_config
#email=$(ynh_user_get_info --username=$admin --key=mail)
# Setup application config
#ynh_add_config --template="../conf/.env.example" --destination="$install_dir/.env"
#ynh_add_config --template=".env.example" --destination="$install_dir/.env"
#chmod 644 "$install_dir/.env"
#chown $app:$app "$install_dir/.env"