mirror of
https://github.com/YunoHost-Apps/ffsync_ynh.git
synced 2024-09-03 18:26:38 +02:00
Fix linter
This commit is contained in:
parent
dde9196c65
commit
fb3e33c06f
7 changed files with 9 additions and 33 deletions
|
@ -1,10 +1,10 @@
|
||||||
# Mozilla’s Sync Server for YunoHost
|
# Mozilla’s Sync Server for YunoHost
|
||||||
|
|
||||||
[![Integration level](https://dash.yunohost.org/integration/ffsync.svg)](https://dash.yunohost.org/appci/app/ffsync) ![](https://ci-apps.yunohost.org/ci/badges/ffsync.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/ffsync.maintain.svg)
|
[![Integration level](https://dash.yunohost.org/integration/ffsync.svg)](https://dash.yunohost.org/appci/app/ffsync) ![](https://ci-apps.yunohost.org/ci/badges/ffsync.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/ffsync.maintain.svg)
|
||||||
[![Install ffsync with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=ffsync)
|
[![Install ffsync with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=ffsync)
|
||||||
|
|
||||||
*[Lire ce readme en français.](./README_fr.md)*
|
*[Lire ce readme en français.](./README_fr.md)*
|
||||||
> *This package allow you to install ffsync quickly and simply on a YunoHost server.
|
> *This package allow you to install ffsync quickly and simply on a YunoHost server.
|
||||||
If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.*
|
If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.*
|
||||||
|
|
||||||
## Overview
|
## Overview
|
||||||
|
@ -24,11 +24,6 @@ By default, a server set up will defer authentication to the Mozilla-hosted acco
|
||||||
|
|
||||||
Once installed, reaching `http://domain.tld/path` should show a page explaining how to configure it.
|
Once installed, reaching `http://domain.tld/path` should show a page explaining how to configure it.
|
||||||
|
|
||||||
#### Supported architectures
|
|
||||||
|
|
||||||
* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/ffsync%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/ffsync/)
|
|
||||||
* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/ffsync%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/ffsync/)
|
|
||||||
|
|
||||||
## Links
|
## Links
|
||||||
|
|
||||||
* Report a bug about this package: https://github.com/YunoHost-Apps/ffsync_ynh/issues
|
* Report a bug about this package: https://github.com/YunoHost-Apps/ffsync_ynh/issues
|
||||||
|
|
|
@ -10,11 +10,9 @@
|
||||||
setup_private=0
|
setup_private=0
|
||||||
setup_public=1
|
setup_public=1
|
||||||
upgrade=1
|
upgrade=1
|
||||||
upgrade=1 from_commit=028501b35335139cff4fc41477a9dbc969657576
|
|
||||||
backup_restore=1
|
backup_restore=1
|
||||||
multi_instance=1
|
multi_instance=1
|
||||||
port_already_use=0
|
port_already_use=0
|
||||||
change_url=0
|
change_url=0
|
||||||
;;; Upgrade options
|
;;; Upgrade options
|
||||||
; commit=028501b35335139cff4fc41477a9dbc969657576
|
|
||||||
name=Before migration to pypy
|
name=Before migration to pypy
|
||||||
|
|
|
@ -4,11 +4,6 @@ location __PATH__/ {
|
||||||
# Path to source
|
# Path to source
|
||||||
alias __FINALPATH__/ ;
|
alias __FINALPATH__/ ;
|
||||||
|
|
||||||
# Force usage of https
|
|
||||||
if ($scheme = http) {
|
|
||||||
rewrite ^ https://$server_name$request_uri? permanent;
|
|
||||||
}
|
|
||||||
|
|
||||||
include uwsgi_params;
|
include uwsgi_params;
|
||||||
# Needed for long running operations in admin interface
|
# Needed for long running operations in admin interface
|
||||||
proxy_pass http://localhost:__PORT__/;
|
proxy_pass http://localhost:__PORT__/;
|
||||||
|
|
|
@ -12,13 +12,13 @@ After=mysql.service
|
||||||
#LimitNOFILE=65535
|
#LimitNOFILE=65535
|
||||||
Type=simple
|
Type=simple
|
||||||
User=__APP__
|
User=__APP__
|
||||||
Group=www-data
|
Group=__APP__
|
||||||
WorkingDirectory=/opt/yunohost/__APP__
|
WorkingDirectory=/opt/yunohost/__APP__
|
||||||
ExecStart=/opt/yunohost/__APP__/local/bin/gunicorn --paste /opt/yunohost/__APP__/syncserver.ini
|
ExecStart=/opt/yunohost/__APP__/local/bin/gunicorn --paste /opt/yunohost/__APP__/syncserver.ini
|
||||||
Restart=always
|
Restart=always
|
||||||
|
|
||||||
# Sandboxing options to harden security
|
# Sandboxing options to harden security
|
||||||
# Depending on specificities of your service/app, you may need to tweak these
|
# Depending on specificities of your service/app, you may need to tweak these
|
||||||
# .. but this should be a good baseline
|
# .. but this should be a good baseline
|
||||||
# Details for these options: https://www.freedesktop.org/software/systemd/man/systemd.exec.html
|
# Details for these options: https://www.freedesktop.org/software/systemd/man/systemd.exec.html
|
||||||
NoNewPrivileges=yes
|
NoNewPrivileges=yes
|
||||||
|
@ -45,7 +45,7 @@ CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_WAKE_ALARM
|
||||||
CapabilityBoundingSet=~CAP_SYS_TTY_CONFIG
|
CapabilityBoundingSet=~CAP_SYS_TTY_CONFIG
|
||||||
CapabilityBoundingSet=~CAP_MAC_ADMIN CAP_MAC_OVERRIDE
|
CapabilityBoundingSet=~CAP_MAC_ADMIN CAP_MAC_OVERRIDE
|
||||||
CapabilityBoundingSet=~CAP_NET_ADMIN CAP_NET_BROADCAST CAP_NET_RAW
|
CapabilityBoundingSet=~CAP_NET_ADMIN CAP_NET_BROADCAST CAP_NET_RAW
|
||||||
CapabilityBoundingSet=~CAP_SYS_ADMIN CAP_SYS_PTRACE CAP_SYSLOG
|
CapabilityBoundingSet=~CAP_SYS_ADMIN CAP_SYS_PTRACE CAP_SYSLOG
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
WantedBy=multi-user.target
|
||||||
|
|
|
@ -14,18 +14,7 @@ pkg_dependencies="pypy pypy-dev python3-virtualenv build-essential libssl-dev li
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
||||||
call_pip() {
|
call_pip() {
|
||||||
# Sometime we get a segfault error while we invoke pip
|
ynh_exec_warn_less pip $@
|
||||||
# As we don't have a really clean way to fix this really bad error we just try many time utils it works
|
|
||||||
i=0
|
|
||||||
result_ok=false
|
|
||||||
while [ $i -lt 5 ] && ! $result_ok; do
|
|
||||||
ynh_exec_warn_less pip $@ && result_ok=true
|
|
||||||
i=$((i+1))
|
|
||||||
done
|
|
||||||
if ! $result_ok; then
|
|
||||||
echo "Error on build package"
|
|
||||||
false
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
|
||||||
install_sources() {
|
install_sources() {
|
||||||
|
|
|
@ -30,8 +30,6 @@ db_user=$db_name
|
||||||
#=================================================
|
#=================================================
|
||||||
# CHECK IF THE APP CAN BE RESTORED
|
# CHECK IF THE APP CAN BE RESTORED
|
||||||
#=================================================
|
#=================================================
|
||||||
ynh_webpath_available --domain=$domain --path_url=$path_url \
|
|
||||||
|| ynh_die --message="Path not available: ${domain}${path_url}"
|
|
||||||
test ! -d $final_path \
|
test ! -d $final_path \
|
||||||
|| ynh_die --message="There is already a directory: $final_path "
|
|| ynh_die --message="There is already a directory: $final_path "
|
||||||
|
|
||||||
|
@ -82,7 +80,8 @@ ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./
|
||||||
|
|
||||||
ynh_script_progression --message="Reloading services..." --weight=3
|
ynh_script_progression --message="Reloading services..." --weight=3
|
||||||
systemctl daemon-reload
|
systemctl daemon-reload
|
||||||
systemctl enable $app.service
|
systemctl enable --quiet $app.service
|
||||||
|
yunohost service add "$app"
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# GENERIC FINALIZATION
|
# GENERIC FINALIZATION
|
||||||
|
|
|
@ -96,7 +96,7 @@ ynh_script_progression --message="Checking backware compatibility..." --weight=1
|
||||||
# Detect old installation with uwsgi
|
# Detect old installation with uwsgi
|
||||||
if [ -e /etc/uwsgi/apps-available/$app.ini ]; then
|
if [ -e /etc/uwsgi/apps-available/$app.ini ]; then
|
||||||
systemctl stop uwsgi-app@$app.service
|
systemctl stop uwsgi-app@$app.service
|
||||||
systemctl disable uwsgi-app@$app.service
|
systemctl disable --quiet uwsgi-app@$app.service
|
||||||
yunohost service remove "uwsgi-app@$app"
|
yunohost service remove "uwsgi-app@$app"
|
||||||
ynh_secure_remove --file=/etc/uwsgi/apps-available/$app.ini
|
ynh_secure_remove --file=/etc/uwsgi/apps-available/$app.ini
|
||||||
ynh_secure_remove --file=/etc/systemd/system/uwsgi-app@$app.service.d
|
ynh_secure_remove --file=/etc/systemd/system/uwsgi-app@$app.service.d
|
||||||
|
|
Loading…
Reference in a new issue