diff --git a/README.md b/README.md index 2dca4c2..863c16a 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Embed a highly customizable web calendar into your website using ICal source links. -**Shipped version:** 1.25~ynh1 +**Shipped version:** 1.26~ynh1 **Demo:** https://open-web-calendar.hosted.quelltext.eu/ @@ -45,4 +45,4 @@ or sudo yunohost app upgrade open-web-calendar -u https://github.com/YunoHost-Apps/open-web-calendar_ynh/tree/testing --debug ``` -**More info regarding app packaging:** +**More info regarding app packaging:** \ No newline at end of file diff --git a/README_fr.md b/README_fr.md index 65e2e27..f999f8e 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,5 +1,5 @@ @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Intégrez un calendrier Web hautement personnalisable dans votre site Web à l'aide des liens sources ICal. -**Version incluse :** 1.25~ynh1 +**Version incluse :** 1.26~ynh1 **Démo :** https://open-web-calendar.hosted.quelltext.eu/ diff --git a/conf/systemd.service b/conf/systemd.service index 8623da6..3eb7e81 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -1,5 +1,5 @@ [Unit] -Description=Small description of the service +Description=Open Web Calendar After=network.target [Service] diff --git a/manifest.toml b/manifest.toml index 42d65a9..b83dbc7 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Open Web Calendar" description.en = "Embed a web calendar into your own website" description.fr = "Intégrez un calendrier Web à votre propre site Web" -version = "1.25~ynh1" +version = "1.26~ynh1" maintainers = ["eric_G"] @@ -43,8 +43,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/niccokunzmann/open-web-calendar/archive/refs/tags/v1.25.tar.gz" - sha256 = "cbbd510937f6a7eb4aca68ea1c7d32e656411779aa2f0c597453a09ef87d8de2" + url = "https://github.com/niccokunzmann/open-web-calendar/archive/refs/tags/v1.26.tar.gz" + sha256 = "efc018098a6f5670348b5fd0a0ac724beac2e35f9c3204815ff1096c439d7c7e" autoupdate.strategy = "latest_github_tag" [resources.system_user] diff --git a/scripts/change_url b/scripts/change_url index 566d6ef..546471e 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -16,7 +16,7 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression --message="Stopping a systemd service..." --weight=1 -ynh_systemd_action --service_name="$app" --action="stop" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name="$app" --action="stop" --log_path="systemd" #================================================= # MODIFY URL IN NGINX CONF @@ -32,7 +32,7 @@ ynh_change_url_nginx_config #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name="$app" --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name="$app" --action="start" --log_path="systemd" #================================================= # END OF SCRIPT diff --git a/scripts/install b/scripts/install index 660f18a..b157024 100755 --- a/scripts/install +++ b/scripts/install @@ -64,7 +64,7 @@ popd ynh_script_progression --message="Starting a systemd service..." --weight=1 # Start a systemd service -ynh_systemd_action --service_name="$app" --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name="$app" --action="start" --log_path="systemd" #================================================= # END OF SCRIPT diff --git a/scripts/restore b/scripts/restore index 24fed30..e8f94f7 100755 --- a/scripts/restore +++ b/scripts/restore @@ -39,7 +39,7 @@ yunohost service add "$app" --description="Customizable web calendar" --log="/va ynh_script_progression --message="Reloading NGINX web server and $app's service..." --weight=1 ### Typically you only have either $app or php-fpm but not both at the same time... -ynh_systemd_action --service_name="$app" --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name="$app" --action="start" --log_path="systemd" ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/upgrade b/scripts/upgrade index 596fafb..f7c075e 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -14,7 +14,7 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression --message="Stopping a systemd service..." --weight=1 -ynh_systemd_action --service_name="$app" --action="stop" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name="$app" --action="stop" --log_path="systemd" #================================================= # "REBUILD" THE APP (DEPLOY NEW SOURCES, RERUN NPM BUILD...) @@ -67,7 +67,7 @@ chown "$app:$app" "$install_dir/app.json" #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name="$app" --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name="$app" --action="start" --log_path="systemd" #================================================= # END OF SCRIPT