Compliance with Yunohost’s package linter (except scripts/{backup,restore})

This commit is contained in:
Pierre-Antoine Rault
2016-12-08 16:12:16 +01:00
parent a4566abdfa
commit 05009d2414
4 changed files with 33 additions and 17 deletions

View File

@@ -1,5 +1,8 @@
#!/bin/bash
# Source app helpers
. /usr/share/yunohost/helpers
# Retrieve arguments
domain=$1
path=$2
@@ -7,7 +10,7 @@ path=$2
# Check domain/path availability
sudo yunohost app checkurl $domain$path -a ffsync
if [[ ! $? -eq 0 ]]; then
exit 1
ynh_die
fi
# Generate random password
@@ -18,11 +21,11 @@ db_user=ffsync
# Initialize database and store mysql password for upgrade
sudo yunohost app initdb $db_user -p $db_pwd
sudo yunohost app setting ffsync mysqlpwd -v $db_pwd
sudo ynh_app_setting_set ffsync mysqlpwd $db_pwd
# Generate random password and save
secret=$(head -c 20 /dev/urandom | sha1sum | cut -d " " -f1)
sudo yunohost app setting ffsync secret -v $secret
sudo ynh_app_setting_set ffsync secret $secret
# Check depends installation
sudo apt-get install make python-dev python-virtualenv -y
@@ -93,4 +96,4 @@ sudo service ffsync restart
sudo yunohost app ssowatconf
sudo service nginx restart
sudo yunohost service add ffsync -l /var/log/ffsync.log
sudo yunohost app setting ffsync skipped_uris -v "/"
sudo ynh_app_setting_set ffsync skipped_uris "/"

View File

@@ -3,7 +3,7 @@
db_user=ffsync
db_name=ffsync
root_pwd=$(sudo cat /etc/yunohost/mysql)
domain=$(sudo yunohost app setting ffsync domain)
domain=$(sudo ynh_app_setting_get ffsync domain)
mysql -u root -p$root_pwd -e "DROP DATABASE $db_name ; DROP USER $db_user@localhost ;"
sudo rm -rf /opt/yunohost/ffsync

View File

@@ -1,19 +1,19 @@
#!/bin/bash
# Retrieve arguments
domain=$(sudo yunohost app setting ffsync domain)
path=$(sudo yunohost app setting ffsync path)
db_pwd=$(sudo yunohost app setting ffsync mysqlpwd)
domain=$(sudo ynh_app_setting_get ffsync domain)
path=$(sudo ynh_app_setting_get ffsync path)
db_pwd=$(sudo ynh_app_setting_get ffsync mysqlpwd)
db_user=ffsync
final_path=/opt/yunohost/ffsync
# Get secret variable
secret=$(sudo yunohost app setting ffsync secret)
secret=$(sudo ynh_app_setting_get ffsync secret)
# Get from conf file if not defined
if [[ -z $secret ]]
then
secret=$(sudo grep "secret =" $final_path/syncserver.ini | cut -d" " -f3)
sudo yunohost app setting ffsync secret -v $secret
sudo ynh_app_setting_set ffsync secret $secret
fi
# Check Swap
@@ -81,5 +81,5 @@ sudo service ffsync restart
# Reload Nginx and regenerate SSOwat conf
sudo service nginx reload
sudo yunohost app setting ffsync skipped_uris -v "/"
sudo ynh_app_setting_set ffsync skipped_uris "/"
sudo yunohost app ssowatconf