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

Merge pull request #34 from YunoHost-Apps/testing

Testing
This commit is contained in:
eric_G 2023-08-21 11:35:37 +02:00 committed by GitHub
commit 1111f0cb1a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 28 additions and 87 deletions

View file

@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
Minimalist and opinionated RSS feed reader
**Shipped version:** 2.0.44~ynh1
**Shipped version:** 2.0.47~ynh1
## Screenshots

View file

@ -18,7 +18,7 @@ Si vous navez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
Minimalist and opinionated RSS feed reader
**Version incluse :** 2.0.44~ynh1
**Version incluse :** 2.0.47~ynh1
## Captures décran

View file

@ -5,7 +5,7 @@ name = "Miniflux"
description.en = "Minimalist and opinionated RSS feed reader"
description.fr = "Agrégateur de flux RSS minimaliste"
version = "2.0.44~ynh1"
version = "2.0.47~ynh1"
maintainers = ["eric_G"]
@ -16,7 +16,7 @@ admindoc = "https://miniflux.app/docs/index.html"
code = "https://github.com/miniflux/v2"
[integration]
yunohost = ">= 11.1.18"
yunohost = ">= 11.2"
architectures = ["amd64", "armhf", "arm64"]
multi_instance = true
ldap = false
@ -42,8 +42,8 @@ ram.runtime = "50M"
type = "password"
[install.init_main_permission]
help.en = "If enabled, Miniflux will be accessible by people who do not have an account. This can be changed later via the webadmin."
help.fr = "Si cette case est cochée, Miniflux sera accessible aux personnes nayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin."
help.en = "If set to visitors, Miniflux will be accessible by people who do not have an account. This can be changed later via the webadmin."
help.fr = "Si visiteurs sélectionnée, Miniflux sera accessible aux personnes nayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin."
type = "group"
default = "visitors"
@ -53,12 +53,12 @@ ram.runtime = "50M"
extract = false
rename = "miniflux"
arm64.url = "https://github.com/miniflux/v2/releases/download/2.0.44/miniflux-linux-arm64"
arm64.sha256 = "861d8763f548963b76645704a32e4b4838773430f25d1ef49989bae6f836bdb7"
amd64.url = "https://github.com/miniflux/v2/releases/download/2.0.44/miniflux-linux-amd64"
amd64.sha256 = "1a7fb7db4f1590cb9889c9eb3ba368360da8fc911bb78c90e7aa471d3505c23e"
armhf.url = "https://github.com/miniflux/v2/releases/download/2.0.44/miniflux-linux-armv7"
armhf.sha256 = "4b3a90033108880f58a93c792f9acd33a85faaf05a68d98ef4eda3a136c1cd2d"
arm64.url = "https://github.com/miniflux/v2/releases/download/2.0.47/miniflux-linux-arm64"
arm64.sha256 = "e7e0b87be241f9e9368c76658a62b7551d7fbbddc8746abb80ce7aea57e3640b"
amd64.url = "https://github.com/miniflux/v2/releases/download/2.0.47/miniflux-linux-amd64"
amd64.sha256 = "d4e87d77ecddd4dfd8889292805a955b48d35c0a431dfa26190a09ace558a0d0"
armhf.url = "https://github.com/miniflux/v2/releases/download/2.0.47/miniflux-linux-armv7"
armhf.sha256 = "ec0fe64ba421ec0c65c513c1026df15b3346ea364bcd8fc249db312fc3c317cb"
autoupdate.strategy = "latest_github_release"
autoupdate.asset.amd64 = "^miniflux-linux-amd64$"
autoupdate.asset.arm64 = "^miniflux-linux-arm64$"

View file

@ -35,14 +35,6 @@ chmod -R o-rwx "$install_dir"
chmod +x "$install_dir/miniflux"
chown -R $app:www-data "$install_dir"
#=================================================
# NGINX CONFIGURATION
#=================================================
ynh_script_progression --message="Configuring NGINX web server..." --weight=3
# Create a dedicated NGINX config
ynh_add_nginx_config
#=================================================
# ADD A CONFIGURATION
#=================================================
@ -54,25 +46,18 @@ chmod 600 "$install_dir/$app.conf"
chown $app "$install_dir/$app.conf"
#=================================================
# SETUP SYSTEMD
# SYSTEM CONFIGURATION
#=================================================
ynh_script_progression --message="Configuring a systemd service..." --weight=1
ynh_script_progression --message="Adding system configurations related to $app..." --weight=1
# Create a dedicated NGINX config
ynh_add_nginx_config
ynh_add_systemd_config
#=================================================
# SETUP LOGROTATE
#=================================================
ynh_script_progression --message="Configuring log rotation..." --weight=1
# Use logrotate to manage application logfile(s)
ynh_use_logrotate
#=================================================
# INTEGRATE SERVICE IN YUNOHOST
#=================================================
ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
yunohost service add $app --description="Minimalist feed reader" --log="/var/log/$app/$app.log"
#=================================================

View file

@ -10,10 +10,11 @@ source _common.sh
source /usr/share/yunohost/helpers
#=================================================
# STANDARD REMOVE
# REMOVE SYSTEM CONFIGURATIONS
#=================================================
# REMOVE SERVICE INTEGRATION IN YUNOHOST
# REMOVE SYSTEMD SERVICE
#=================================================
ynh_script_progression --message="Removing system configurations related to $app..." --weight=1
# Remove the service from the list of services known by YunoHost (added from `yunohost service add`)
if ynh_exec_warn_less yunohost service status $app >/dev/null
@ -22,27 +23,12 @@ then
yunohost service remove $app
fi
#=================================================
# STOP AND REMOVE SERVICE
#=================================================
ynh_script_progression --message="Stopping and removing the systemd service..." --weight=1
# Remove the dedicated systemd config
ynh_remove_systemd_config
#=================================================
# REMOVE NGINX CONFIGURATION
#=================================================
ynh_script_progression --message="Removing NGINX web server configuration..." --weight=5
# Remove the dedicated NGINX config
ynh_remove_nginx_config
#=================================================
# REMOVE LOGROTATE CONFIGURATION
#=================================================
ynh_script_progression --message="Removing logrotate configuration..." --weight=1
# Remove the app-specific logrotate config
ynh_remove_logrotate

View file

@ -9,15 +9,6 @@
source ../settings/scripts/_common.sh
source /usr/share/yunohost/helpers
#=================================================
# STANDARD RESTORATION STEPS
#=================================================
# RESTORE THE NGINX CONFIGURATION
#=================================================
ynh_script_progression --message="Restoring the NGINX configuration..." --weight=1
ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
#=================================================
# RESTORE THE APP MAIN DIR
#=================================================
@ -37,25 +28,19 @@ ynh_script_progression --message="Restoring the PostgreSQL database..." --weight
ynh_psql_execute_file_as_root --file="./db.sql" --database=$db_name
#=================================================
# RESTORE SYSTEMD
# RESTORE SYSTEM CONFIGURATIONS
#=================================================
ynh_script_progression --message="Restoring the systemd configuration..." --weight=5
# RESTORE THE PHP-FPM CONFIGURATION
#=================================================
ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1
ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
systemctl enable $app.service --quiet
#=================================================
# INTEGRATE SERVICE IN YUNOHOST
#=================================================
ynh_script_progression --message="Integrating service in YunoHost..."
yunohost service add $app --description="Minimalist feed reader" --log="/var/log/$app/$app.log"
#=================================================
# RESTORE THE LOGROTATE CONFIGURATION
#=================================================
ynh_script_progression --message="Restoring the logrotate configuration..." --weight=1
ynh_restore_file --origin_path="/etc/logrotate.d/$app"
#=================================================

View file

@ -41,33 +41,18 @@ chmod +x "$install_dir/miniflux"
chown -R $app:www-data "$install_dir"
#=================================================
# NGINX CONFIGURATION
# REAPPLY SYSTEM CONFIGURATIONS
#=================================================
ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2
ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1
# Create a dedicated NGINX config
ynh_add_nginx_config
#=================================================
# SETUP SYSTEMD
#=================================================
ynh_script_progression --message="Configuring a systemd service..." --weight=2
ynh_add_systemd_config
#=================================================
# SETUP LOGROTATE
#=================================================
ynh_script_progression --message="Upgrading logrotate configuration..." --weight=1
# Use logrotate to manage app-specific logfile(s)
ynh_use_logrotate --non-append
#=================================================
# INTEGRATE SERVICE IN YUNOHOST
#=================================================
ynh_script_progression --message="Integrating service in YunoHost..."
yunohost service add $app --description="Minimalist feed reader" --log="/var/log/$app/$app.log"
#=================================================