troisième commit

TODO

@@ -1,3 +1,7 @@
+- finir le script upgrade
+
+======================================================================
+======================================================================
 - finir les scripts: install, remove, upgrade
     - on crée un utilisateur spécifique pour lancer l'exécutable: syncthingd
     - le dossier sera /home/yunohost.syncthing/ est le $HOME du user syncthingd

conf/log/run

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+exec logger -t syncthing
+

conf/run

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+export USERNAME=jb
+export HOME="/home/$USERNAME"
+export SYNCTHING="$HOME/bin/syncthing"
+
+exec 2>&1
+exec chpst -u "$USERNAME" "$SYNCTHING" -logflags 0
+

scripts/install

@@ -4,7 +4,13 @@
 domain=$1
 path=$2
 
-version="0.10.29"
+# Configurable variables
+syncVersion="0.10.29"
+syncHome="/home/yunohost.syncthing"
+syncUser=debian-syncthing
+syncSyncport=22000
+syncUIport=8080
+
 
 sudo yunohost app checkurl $domain$path -a syncthing
 if [[ ! $? -eq 0 ]]; then
@@ -15,34 +21,42 @@ fi
 path=${path%/}
 
 # Check port availability
-sudo yunohost app checkport 8080
+sudo yunohost app checkport $syncUIport
 if [[ ! $? -eq 0 ]]; then
   exit 1
 fi
-sudo yunohost app checkport 22000
+sudo yunohost app checkport $syncSyncport
 if [[ ! $? -eq 0 ]]; then
   exit 1
 fi
 
 # Open port in firewall
-sudo yunohost firewall allow TCP 22000 > /dev/null 2>&1
+sudo yunohost firewall allow TCP $syncSyncport > /dev/null 2>&1
+
+# Create $syncUser user to syncthing service
+sudo useradd -m  -d $syncHome/ -s /bin/false $syncUser
 
 # Make directories and set rights
-#~ sudo mkdir -p /home/yunohost.syncthing/{bin,sync}
-#~ sudo chown -R debian-syncthing:www-data /home/yunohost.syncthing/
-#~ sudo chown -R debian-syncthing:debian-syncthing /home/yunohost.syncthing/progress
-#~ sudo find /home/yunohost.syncthing/ -type f | while read LINE; do sudo chmod 640 "$LINE" ; done
-#~ sudo find /home/yunohost.syncthing/ -type d | while read LINE; do sudo chmod 750 "$LINE" ; done
+sudo mkdir -p $syncHome/{bin,sync}
+sudo chown -R $syncUser:$syncUser $syncHome/
+sudo find $syncHome/ -type f | while read LINE; do sudo chmod 640 "$LINE" ; done
+sudo find $syncHome/ -type d | while read LINE; do sudo chmod 750 "$LINE" ; done
 
+# Download and install syncthing binary
+sudo wget https://github.com/syncthing/syncthing/releases/download/v$syncVersion/syncthing-linux-amd64-v$syncVersion.tar.gz -O /tmp/syncthing.tar.gz
+sudo tar -C /tmp -xvf /tmp/syncthing.tar.gz syncthing-linux-amd64-v$syncVersion/syncthing
+sudo mv /tmp/syncthing-linux-amd64-v$syncVersion/syncthing $syncHome/bin/syncthing
+sudo chown $syncUser: $syncHome/bin/syncthing
+sudo chmod 640 $syncHome/bin/syncthing
 
-# Install official debian package
-## Ici il faut ajouter le code pour télécharger l'archive depuis le github de syncthing
-## créer un utilisateur pour lancer syncthing
-#~ sudo apt-get install syncthing-daemon -y -qq
-
-
-# Monitor service
-#~ sudo yunohost service add syncthing-daemon
+# Install and monitor service
+# les deux lignes ci dessous si il s'avère nécessaire de créer un script sysinit
+# sudo cp ../conf/syncthingd /etc/init.d/syncthingd
+# sudo update-rc.d syncthingd defaults
+sudo apt-get install runit -y -qq
+sudo mkdir -p /etc/service/syncthing
+sudo cp -R ../conf/run ../conf/log /etc/service/syncthing
+sudo yunohost service add runit
 
 # Configure Nginx and reload
 sed -i "s@PATHTOCHANGE@$path@g" ../conf/nginx.conf

scripts/remove

@@ -1,14 +1,16 @@
 #!/bin/bash
 
-sudo service syncthing-daemon stop
-sudo yunohost firewall disallow TCP 22000
-sudo yunohost service remove syncthing-daemon
+syncSyncport=22000
+
+sudo service runit stop
+sudo yunohost firewall disallow TCP $syncSyncport
+sudo yunohost service remove runit
 domain=$(sudo yunohost app setting syncthing domain)
 
 sudo rm /etc/nginx/conf.d/$domain.d/syncthing.conf
-sudo rm -rf /home/yunohost.syncthing
+# sudo rm -rf /home/yunohost.syncthing
 
-sudo apt-get remove -y -qq syncthing-daemon
+sudo apt-get remove -y -qq runit
 
 sudo service nginx reload
 sudo yunohost app ssowatconf

scripts/upgrade

@@ -1,5 +1,10 @@
 #!/bin/bash
 
+# Configurable variables
+syncSyncport=22000
+syncUser=debian-syncthing
+syncHome="/home/yunohost.syncthing"
+
 # Retrieve arguments
 domain=$(sudo yunohost app setting syncthing domain)
 path=$(sudo yunohost app setting syncthing path)
@@ -8,13 +13,14 @@ path=$(sudo yunohost app setting syncthing path)
 path=${path%/}
 
 # Open port in firewall
-sudo yunohost firewall allow TCP 22000 > /dev/null 2>&1
+sudo yunohost firewall allow TCP $syncSyncport > /dev/null 2>&1
 
 # Upgrade official debian package
-sudo apt-get install syncthing-daemon -y -qq
+sudo apt-get install runit -y -qq
+sudo -i -u $syncUser $syncHome/bin/syncthing -upgrade
 
 # Make directories and set rights
-sudo mkdir -p /home/yunohost.syncthing//{bin,sync}
+sudo mkdir -p /home/yunohost.syncthing/{bin,sync}
 sudo chown -R debian-syncthing:www-data /home/yunohost.syncthing/
 sudo chown -R debian-syncthing:debian-syncthing /home/yunohost.syncthing/progress
 sudo find /home/yunohost.syncthing/ -type f | while read LINE; do sudo chmod 640 "$LINE" ; done