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

Merge branch 'master' into v0.7.1

This commit is contained in:
yalh76 2019-01-22 03:28:51 +01:00 committed by GitHub
commit 87de7a8b94
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 14 deletions

View file

@ -1,6 +1,6 @@
# writefreely_ynh # 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) [![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. > *This package allow you to install WriteFreely quickly and simply on a YunoHost server.
@ -35,13 +35,13 @@ How to configure this app: by an admin panel, a plain file with SSH, or any othe
No LDAP and no HTTP auth supported 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 #### 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)/) * 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/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/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/jenkins/job/writefreely%20(Community)/badge/icon)](https://ci-stretch.nohost.me/jenkins/job/writefreely%20(Community)/) * 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 ## Limitations

View file

@ -37,7 +37,8 @@
Level 3=auto 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. # 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. # 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 5=auto
Level 6=auto Level 6=auto
Level 7=auto Level 7=auto

View file

@ -41,7 +41,11 @@ public_stats=$YNH_APP_ARG_PUBLIC_STATS
private=$YNH_APP_ARG_PRIVATE private=$YNH_APP_ARG_PRIVATE
local_timeline=$YNH_APP_ARG_LOCAL_TIMELINE 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 ### If it's a multi-instance app, meaning it can be installed several times independently
@ -327,7 +331,7 @@ chown -R $app: /var/log/$app/
### - Remove the section "REMOVE SERVICE FROM ADMIN PANEL" in the remove script ### - 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 ### - 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 # 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" #yunohost service add $app --description "$app daemon for XXX" --log "/var/log/$app/APP.log"

View file

@ -35,11 +35,11 @@ ynh_remove_systemd_config
#================================================= #=================================================
# Remove a service from the admin panel, added by `yunohost service add` # Remove a service from the admin panel, added by `yunohost service add`
if yunohost service status | grep -q $app #if yunohost service status | grep -q $app
then #then
echo "Remove $app service" # echo "Remove $app service"
yunohost service remove $app # yunohost service remove $app
fi #fi
#================================================= #=================================================
# REMOVE DEPENDENCIES # REMOVE DEPENDENCIES

View file

@ -110,7 +110,7 @@ chown -R root: $final_path
# ADVERTISE SERVICE IN ADMIN PANEL # 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 # RESTORE SYSTEMD