From 95333cdf2ada1a09328904584e97ac7b9b95a8db Mon Sep 17 00:00:00 2001 From: Yalh Date: Sat, 19 Jan 2019 10:42:29 +0100 Subject: [PATCH 1/9] Remove Advertise in Admin panel Duplicate from SystemD --- scripts/install | 2 +- scripts/remove | 10 +++++----- scripts/restore | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/install b/scripts/install index e18a1b8..13d428c 100755 --- a/scripts/install +++ b/scripts/install @@ -327,7 +327,7 @@ chown -R $app: /var/log/$app/ ### - Remove the section "REMOVE SERVICE FROM ADMIN PANEL" in the remove script ### - As well as the section ADVERTISE SERVICE IN ADMIN PANEL" in the restore script -yunohost service add $app --log "/var/log/$app/APP.log" +#yunohost service add $app --log "/var/log/$app/APP.log" # if using yunohost version 3.2 or more in the 'manifest.json', a description can be added #yunohost service add $app --description "$app daemon for XXX" --log "/var/log/$app/APP.log" diff --git a/scripts/remove b/scripts/remove index ec9d2ea..cde9be7 100755 --- a/scripts/remove +++ b/scripts/remove @@ -35,11 +35,11 @@ ynh_remove_systemd_config #================================================= # Remove a service from the admin panel, added by `yunohost service add` -if yunohost service status | grep -q $app -then - echo "Remove $app service" - yunohost service remove $app -fi +#if yunohost service status | grep -q $app +#then +# echo "Remove $app service" +# yunohost service remove $app +#fi #================================================= # REMOVE DEPENDENCIES diff --git a/scripts/restore b/scripts/restore index 1f6387d..ba71051 100755 --- a/scripts/restore +++ b/scripts/restore @@ -110,7 +110,7 @@ chown -R root: $final_path # ADVERTISE SERVICE IN ADMIN PANEL #================================================= -yunohost service add $app --log "/var/log/$app/APP.log" +#yunohost service add $app --log "/var/log/$app/APP.log" #================================================= # RESTORE SYSTEMD From 5a14c57e53842ae1fd5a5c0e6e2ff7f2b046dc28 Mon Sep 17 00:00:00 2001 From: Yalh Date: Sat, 19 Jan 2019 10:46:08 +0100 Subject: [PATCH 2/9] Remove Level 4 process_checker because there is no ldap authentification --- check_process | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_process b/check_process index fc65cc3..a07086e 100644 --- a/check_process +++ b/check_process @@ -37,7 +37,7 @@ Level 3=auto # Level 4: If the app supports LDAP and SSOwat, turn level 4 to '1' and add a link to an issue or a part of your code to show it. # If the app does not use LDAP nor SSOwat, and can't use them, turn level 4 to 'na' and explain as well. - Level 4=0 + Level 4=na #application doesn't support LDAP authentification Level 5=auto Level 6=auto Level 7=auto From 61c562cda8f046c1fb417f147f92349f5c2c9610 Mon Sep 17 00:00:00 2001 From: Yalh Date: Sat, 19 Jan 2019 10:50:12 +0100 Subject: [PATCH 3/9] changing start of the app to restart --- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index 13d428c..abbe1a4 100755 --- a/scripts/install +++ b/scripts/install @@ -350,4 +350,4 @@ fi systemctl reload nginx systemctl enable "$app" -systemctl start "$app" +systemctl restart "$app" diff --git a/scripts/restore b/scripts/restore index ba71051..fb939d1 100755 --- a/scripts/restore +++ b/scripts/restore @@ -139,5 +139,5 @@ ynh_restore_file "/etc/logrotate.d/$app" #systemctl reload php5-fpm systemctl reload nginx -systemctl start "$app" +systemctl restart "$app" diff --git a/scripts/upgrade b/scripts/upgrade index 9e872f1..31e2df8 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -166,4 +166,4 @@ fi #================================================= systemctl reload nginx -systemctl start "$app" +systemctl restart "$app" From 4b71f48ec7a1eb28a2231d74fab7df80c5569e55 Mon Sep 17 00:00:00 2001 From: Yalh Date: Sat, 19 Jan 2019 11:40:00 +0100 Subject: [PATCH 4/9] Bypass package_checker name not compatible with writefreely --- scripts/install | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index abbe1a4..d52cd26 100755 --- a/scripts/install +++ b/scripts/install @@ -41,7 +41,11 @@ public_stats=$YNH_APP_ARG_PUBLIC_STATS private=$YNH_APP_ARG_PRIVATE local_timeline=$YNH_APP_ARG_LOCAL_TIMELINE - +## Bypass package_checker name not compatible with writefreely +if [ "$admin" = "package_checker" ] +then + admin="test" +fi ### If it's a multi-instance app, meaning it can be installed several times independently @@ -350,4 +354,4 @@ fi systemctl reload nginx systemctl enable "$app" -systemctl restart "$app" +systemctl start "$app" From f166ad12a93cb802f65c7b19c6b56c265b14456a Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 19 Jan 2019 18:47:22 +0100 Subject: [PATCH 5/9] Update check_process --- check_process | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/check_process b/check_process index a07086e..ce07e17 100644 --- a/check_process +++ b/check_process @@ -37,7 +37,8 @@ Level 3=auto # Level 4: If the app supports LDAP and SSOwat, turn level 4 to '1' and add a link to an issue or a part of your code to show it. # If the app does not use LDAP nor SSOwat, and can't use them, turn level 4 to 'na' and explain as well. - Level 4=na #application doesn't support LDAP authentification + # Application doesn't support LDAP authentification + Level 4=1 Level 5=auto Level 6=auto Level 7=auto From 1f626b323241d0d40b918085c323d1bed2b34937 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 20 Jan 2019 02:43:07 +0100 Subject: [PATCH 6/9] typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d1ba9ad..70703af 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ How to configure this app: by an admin panel, a plain file with SSH, or any othe No LDAP and no HTTP auth supported -Depending of the configuration, the app be used by multiple users? +Depending of the configuration, the app be used by multiple users #### Supported architectures From 0d6398677928cf74c64ea27aaa81e0397c97459d Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 20 Jan 2019 16:20:50 +0100 Subject: [PATCH 7/9] Not compatible with Arm --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 70703af..7ce713d 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ Depending of the configuration, the app be used by multiple users #### Supported architectures * x86-64b - [![Build Status](https://ci-apps.yunohost.org/jenkins/job/writefreely%20(Community)/badge/icon)](https://ci-apps.yunohost.org/jenkins/job/writefreely%20(Community)/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/jenkins/job/writefreely%20(Community)%20(%7EARM%7E)/badge/icon)](https://ci-apps-arm.yunohost.org/jenkins/job/writefreely%20(Community)%20(%7EARM%7E)/) +* ~~ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/jenkins/job/writefreely%20(Community)%20(%7EARM%7E)/badge/icon)](https://ci-apps-arm.yunohost.org/jenkins/job/writefreely%20(Community)%20(%7EARM%7E)/)~~ * Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/jenkins/job/writefreely%20(Community)/badge/icon)](https://ci-stretch.nohost.me/jenkins/job/writefreely%20(Community)/) ## Limitations From b54e305a0a0c205c5b64b528c467e226f957cb09 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 21 Jan 2019 00:55:39 +0100 Subject: [PATCH 8/9] Update link from Jenkins to CI --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 7ce713d..4b13796 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # writefreely_ynh -[![Integration level](https://dash.yunohost.org/integration/writefreely.svg)](https://ci-apps.yunohost.org/jenkins/job/writefreely%20%28Community%29/lastBuild/consoleFull) +[![Integration level](https://dash.yunohost.org/integration/writefreely.svg)](https://dash.yunohost.org/appci/app/writefreely) [![Install WriteFreely with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=writefreely) > *This package allow you to install WriteFreely quickly and simply on a YunoHost server. @@ -39,9 +39,9 @@ Depending of the configuration, the app be used by multiple users #### Supported architectures -* x86-64b - [![Build Status](https://ci-apps.yunohost.org/jenkins/job/writefreely%20(Community)/badge/icon)](https://ci-apps.yunohost.org/jenkins/job/writefreely%20(Community)/) -* ~~ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/jenkins/job/writefreely%20(Community)%20(%7EARM%7E)/badge/icon)](https://ci-apps-arm.yunohost.org/jenkins/job/writefreely%20(Community)%20(%7EARM%7E)/)~~ -* Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/jenkins/job/writefreely%20(Community)/badge/icon)](https://ci-stretch.nohost.me/jenkins/job/writefreely%20(Community)/) +* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/writefreely%20%28Community%29.svg)](https://ci-apps.yunohost.org/ci/apps/writefreely/) +* ~~ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/writefreely%20%28Community%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/writefreely/)~~ +* Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/ci/logs/writefreely%20%28Community%29.svg)](https://ci-stretch.nohost.me/ci/apps/writefreely/) ## Limitations From 22baae2c61ace13daaaee3efcc8d580384ed5373 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 21 Jan 2019 00:56:04 +0100 Subject: [PATCH 9/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4b13796..200bee2 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # writefreely_ynh -[![Integration level](https://dash.yunohost.org/integration/writefreely.svg)](https://dash.yunohost.org/appci/app/writefreely) +[![Integration level](https://dash.yunohost.org/integration/writefreely.svg)](https://dash.yunohost.org/appci/app/writefreely) [![Install WriteFreely with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=writefreely) > *This package allow you to install WriteFreely quickly and simply on a YunoHost server.