Merge pull request #76 from YunoHost-Apps/testing

Testing

README.md

@@ -1,4 +1,4 @@
-# Transmission app for YunoHost
+# Transmission for YunoHost
 
 [![Integration level](https://dash.yunohost.org/integration/transmission.svg)](https://dash.yunohost.org/appci/app/transmission) ![](https://ci-apps.yunohost.org/ci/badges/transmission.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/transmission.maintain.svg)  
 [![Install Transmission with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=transmission)
@@ -35,14 +35,28 @@ Transmission is a fast, easy, and free BitTorrent client.
 
 #### Supported architectures
 
-* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/transmission%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/transmission/)
+* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/transmission%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/transmission/)
 * ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/transmission%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/transmission/)
-* Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/ci/logs/transmission%20%28Apps%29.svg)](https://ci-stretch.nohost.me/ci/apps/transmission/)
 
 ## Limitations
 
 ## Additionnal informations
+Alternative to WebUI :
 
+You can use remote client on different platforms to manage your Transmission server:
+
+* Dekstop: Transmission-remote-GUI: https://github.com/transmission-remote-gui/transgui
+* Mobile: Transdroid: http://www.transdroid.org/
+* More clients here: https://transmissionbt.com/resources/
+
+You can use the following information to connect your server:
+
+* Remote host: Your domain or IP address (don't add folder)
+* Port: 443
+* SSL: Enabled
+* User: Your Yunohost Username
+* Password: Password of the Yunohost User above
+* RPC Path: /torrent/transmission/rpc (if you used the standard folder)
 
 ## Links
 
@@ -53,8 +67,7 @@ Transmission is a fast, easy, and free BitTorrent client.
 
 ---
 
-Developers infos
-----------------
+## Developers infos
 
 Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/transmission_ynh/tree/testing).
 

conf/nginx.conf

@@ -12,7 +12,7 @@ location __PATH__/ {
     proxy_pass http://127.0.0.1:__PORT__/;
 }
 
-location __PATH__/downloads {
+location __PATH__/downloads/ {
     alias /home/yunohost.transmission/completed/;
     autoindex on;
     autoindex_exact_size off;

manifest.json

@@ -6,7 +6,7 @@
 		"en": "A Fast, Easy, and Free BitTorrent Client",
 		"fr": "Un client BitTorrent libre et rapide"
 	},
-	"version": "1.0~ynh2",
+	"version": "1.0~ynh3",
 	"url": "https://www.transmissionbt.com/",
 	"license": "GPL-3.0",
 	"maintainer": {

scripts/backup

@@ -42,7 +42,10 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 ynh_script_progression --message="Backing up transmission configuration..."
 
 ynh_backup --src_path="/etc/transmission-daemon/settings.json"
+if [ -e /proc/sys/net/core/rmem_max ]
+then
     ynh_backup --src_path="/etc/sysctl.d/90-transmission.conf"
+fi
 
 #=================================================
 # BACKUP DATA

scripts/install

@@ -129,8 +129,9 @@ ynh_replace_string --match_string="__PEER_PORT__" --replace_string="$peer_port"
 ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_file=../conf/settings.json
 cp ../conf/settings.json /etc/transmission-daemon/settings.json
 
+if [ -e /proc/sys/net/core/rmem_max ]
+then
     cp ../conf/90-transmission.conf /etc/sysctl.d/90-transmission.conf
-if [ -e /proc/sys/net/core/rmem_max ]; then
     sysctl --load=/etc/sysctl.d/90-transmission.conf
 fi
 
@@ -139,7 +140,10 @@ fi
 #=================================================
 
 ynh_store_file_checksum --file=/etc/transmission-daemon/settings.json
+if [ -e /proc/sys/net/core/rmem_max ]
+then
     ynh_store_file_checksum --file=/etc/sysctl.d/90-transmission.conf
+fi
 
 #=================================================
 # YUNOHOST MULTIMEDIA INTEGRATION

scripts/remove

@@ -76,8 +76,9 @@ ynh_secure_remove --file=/usr/share/transmission
 # And data
 ynh_secure_remove --file=/var/lib/transmission-daemon
 # Kernel parameters
+if [ -e /proc/sys/net/core/rmem_max ]
+then
     ynh_secure_remove --file=/etc/sysctl.d/90-transmission.conf
-if [ ${PACKAGE_CHECK_EXEC:-0} -eq 0 ]; then
     sysctl --load=/etc/sysctl.d/90-transmission.conf
 fi
 

scripts/restore

@@ -73,8 +73,9 @@ ynh_systemd_action --service_name=transmission-daemon --action=stop
 ynh_secure_remove --file=/etc/transmission-daemon/settings.json
 ynh_restore_file --origin_path=/etc/transmission-daemon/settings.json
 
+if [ -e /proc/sys/net/core/rmem_max ]
+then
     ynh_restore_file --origin_path="/etc/sysctl.d/90-transmission.conf"
-if [ -e /proc/sys/net/core/rmem_max ]; then
     sysctl --load=/etc/sysctl.d/90-transmission.conf
 fi
 

scripts/upgrade

@@ -134,11 +134,12 @@ ynh_replace_string --match_string="__PEER_PORT__" --replace_string="$peer_port"
 ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_file=../conf/settings.json
 cp ../conf/settings.json /etc/transmission-daemon/settings.json
 
+if [ -e /proc/sys/net/core/rmem_max ]
+then
     # Verify the checksum and backup the file if it's different
     ynh_backup_if_checksum_is_different --file=/etc/sysctl.d/90-transmission.conf
 
     cp ../conf/90-transmission.conf /etc/sysctl.d/90-transmission.conf
-if [ -e /proc/sys/net/core/rmem_max ]; then
     sysctl --load=/etc/sysctl.d/90-transmission.conf
 fi
 
@@ -148,7 +149,10 @@ fi
 
 # Recalculate and store the config file checksum into the app settings
 ynh_store_file_checksum --file=/etc/transmission-daemon/settings.json
+if [ -e /proc/sys/net/core/rmem_max ]
+then
     ynh_store_file_checksum --file=/etc/sysctl.d/90-transmission.conf
+fi
 
 #=================================================
 # YUNOHOST MULTIMEDIA INTEGRATION