From d65e03d02b2e02f6c218a66662d7e866bdd705c4 Mon Sep 17 00:00:00 2001 From: Taker Date: Wed, 19 Jul 2017 22:40:20 +0200 Subject: [PATCH] path update --- scripts/install | 9 +++++---- scripts/remove | 4 +++- scripts/upgrade | 15 ++++++++++++++- sources/flood.service | 4 ++-- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/scripts/install b/scripts/install index 1a80c51..21d0ffc 100755 --- a/scripts/install +++ b/scripts/install @@ -86,9 +86,9 @@ curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash - sudo apt-get install -y nodejs # Clone flood -cd /home/flood -git clone https://github.com/jfurrow/flood.git -cp +cd /var/www +git clone https://github.com/jfurrow/flood.git +cp # Launch flood on boot sudo cp ../sources/flood.service /etc/systemd/system/flood.service @@ -111,4 +111,5 @@ sudo yunohost app setting flood data_dir -v $data_dir sudo yunohost app setting flood path -v $path # Register the service on yunohost -sudo yunohost service add rtorrent \ No newline at end of file +sudo yunohost service add rtorrent +sudo yunohost service add flood diff --git a/scripts/remove b/scripts/remove index 5424b08..6b2ebfc 100755 --- a/scripts/remove +++ b/scripts/remove @@ -1,4 +1,6 @@ #!/bin/bash + + domain=$(sudo yunohost app setting flood domain) data_dir=$(sudo yunohost app setting flood data_dir) @@ -12,7 +14,7 @@ sudo rm -f /etc/systemd/system/rtorrent.service # Remove the user sudo userdel -f flood -sudo rm -rf /home/flood +sudo rm -rf /var/www/flood # Remove the service sudo yunohost service remove flood diff --git a/scripts/upgrade b/scripts/upgrade index d0cd34d..f3db2ed 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -1,5 +1,11 @@ #!/bin/bash +# Exit on command errors and treat unset variables as an error +set -eu + +# See comments in install script +app=$YNH_APP_INSTANCE_NAME + sudo service rtorrent stop sudo service flood stop @@ -32,8 +38,15 @@ sudo make install sudo ldconfig # Update ruTorrent -cd /home/flood +cd /var/www/flood git pull +chown -R flood:flood /var/www/flood + +# If app is public, add url to SSOWat conf as skipped_uris +if [[ $is_public -eq 1 ]]; then + # See install script + ynh_app_setting_set "$app" unprotected_uris "/" +fi sudo service rtorrent start sudo service flood start \ No newline at end of file diff --git a/sources/flood.service b/sources/flood.service index f68eb48..d71e1ba 100644 --- a/sources/flood.service +++ b/sources/flood.service @@ -3,8 +3,8 @@ Description=Flood rTorrent Web UI After=network.target [Service] -WorkingDirectory=/home/flood -ExecStart=/usr/bin/npm start --production /home/flood +WorkingDirectory=/var/www/flood +ExecStart=/usr/bin/npm start --production /var/www/flood User=flood [Install]