Mise à jour de 'scripts/install'

Update manifest.json

README.md

@@ -4,57 +4,7 @@
 [![Install Peertube with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=peertube)<br><br>
 =======
 
-Shipped Version: **1.2.0**
-
-# Nodejs branch for servers giving error on yarn install (OVH)
-
-You will have to run few **commands in the terminal to run Peertube**. **Nodejs** will not be installed by **shell** and **passowrd** will not be created by shell. So you have to do these **things manually**.
-
-## Steps for installing
-
-1. Install **nodejs**
-   
-    $ curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash - <br>
-    $ sudo apt-get install -y nodejs
-1. Install the peertube with **OVH fix** branch.
-
-    $ yunohost app --debug install --debug https://github.com/YunoHost-Apps/peertube_ynh/tree/ovh_fix
-1. After installation is complete run **yarn install**.
-    
-    $ cd /var/www/peertube && yarn install --production --pure-lockfile
-1. Give proper **permissions** to peertube
-
-    $ chown -R peertube:peertube /var/www/peertube
-1. **Restart peertube** and check if there is any error message.
-
-    $ service peertube restart && journalctl -feu peertube
-
-1. If there is no **error in red** in the last lines of log. Press **ctrl+c** to stop the logs.
-1. Go to your **domain** to check if peertube is running and everthing is ok.
-1. Change your **root password** by this command:
-    
-    $ cd /var/www/peertube && NODE_CONFIG_DIR="/var/www/peertube/config/" NODE_ENV=production npm run reset-password -- -u root
-    
-    Username: **root**
-    password: **created in above step**
-    
-## Updating peertube
-1. Stop peertube
-  
-    $ service peertube stop
-1. Upgrade the package:
-    
-    $ yunohost app upgrade --debug -u https://github.com/YunoHost-Apps/peertube_ynh/tree/ovh_fix peertube
-1. After installation is complete run **yarn install**.
-    
-    $ cd /var/www/peertube && yarn install --production --pure-lockfile
-1. Give proper **permissions** to peertube
-    
-    $ chown -R peertube:peertube /var/www/peertube
-1. Start service.
-   
-    $ service peertube start
-    
+Shipped Version: **1.2.1**
 
 ## What is Peertube ?
 PeerTube is a federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser, using <a href="https://github.com/feross/webtorrent">WebTorrent</a>.
@@ -102,7 +52,7 @@ Want to see in action?
          $ sudo yunohost app install https://github.com/YunoHost-Apps/peertube_ynh
  1. Admin username is : **root**.
  1. **Admin password** will be sent to the email address given at the time of the installation.
- 1. **TLS** and **starttls** are disabled for the outgoing mails. If you intent to use email address not hosted on your local server,it's advised to have a proper SMTP configured with tls and starttls settings by editing **/var/www/peertube/config/porduction.yml**.
+ 1. **TLS** and **starttls** are disabled for the outgoing mails. If you intent to use email address not hosted on your local server,it's advised to have a proper SMTP configured with tls and starttls settings by editing **/var/www/peertube/config/production.yml**.
  
  ### Update Guide
  1. App can be updated by YunoHost **admin web-interface** or with the following command**:

conf/app.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/Chocobozzz/PeerTube/releases/download/v1.2.0/peertube-v1.2.0.tar.xz
-SOURCE_SUM=2ef5c4d0cf1f0f8a71e0b1f5a5146fbf4a9617ea79f32de618fe3b3c726d8f7e
+SOURCE_URL=https://github.com/Chocobozzz/PeerTube/releases/download/v1.2.1/peertube-v1.2.1.tar.xz
+SOURCE_SUM=77517c06133704e36b755bdae4f68838221e657ca70a1a40d5c8652655978ed5
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.xz
 SOURCE_IN_SUBDIR=true

manifest.json

@@ -6,7 +6,7 @@
         "en": "Video streaming platform using P2P directly in the web browser, connected to a federated network",
         "fr": "Plateforme de diffusion vidéo par P2P directement dans le navigateur, et connectée à un réseau fédéralisé"
     },
-    "version": "1.2.0",
+    "version": "1.2.1",
     "url": "https://github.com/Chocobozzz/PeerTube",
     "license": "AGPL-3.0-only",
     "maintainer": {

scripts/install

@@ -22,7 +22,7 @@ ynh_abort_if_errors
 #=================================================
 
 domain=$YNH_APP_ARG_DOMAIN
-path_url="/"
+path_url="/peertube"
 admin_email=$YNH_APP_ARG_EMAIL
 admin_pass=$(ynh_string_random 24)
 is_public=$YNH_APP_ARG_IS_PUBLIC
@@ -138,6 +138,10 @@ ynh_setup_source "$final_path"
 cp ../conf/production.yaml "$final_path/config/production.yaml"
 touch "$final_path/config/local-production.json"
 
+(
+	cd "$final_path"
+	yarn install --production --pure-lockfile 
+)
 
 #=================================================
 # NGINX CONFIGURATION
@@ -219,4 +223,28 @@ ynh_add_systemd_config
 systemctl enable "$app"
 systemctl start "$app"
 
+#=================================================
+# CHANGE PEERTUBE ADMIN PASSWORD AFTER INITIAL GEN
+#=================================================
 
+# we need to wait for the service to init peertube's database
+(
+	cd "$final_path"
+	sleep 30
+	echo $admin_pass | NODE_CONFIG_DIR="$final_path/config" NODE_ENV=production npm run reset-password -- -u root
+)
+
+#=================================================
+# SEND A README FOR THE ADMIN
+#=================================================
+
+message=" $app was successfully installed :)
+
+Please open your $app domain: https://$domain$path_url
+
+The admin username is: root
+The admin password is: $admin_pass
+
+If you are facing any problem or want to improve this app, please open a new issue here: https://github.com/YunoHost-Apps/peertube_ynh"
+
+ynh_send_readme_to_admin "$message"

scripts/restore

@@ -74,6 +74,9 @@ ynh_system_user_create "$app"
 #=================================================
 
 # Set right permissions
+if [ ! -d "/home/yunohost.app/$app" ]; then
+	mkdir -p "/home/yunohost.app/${app}/storage"
+fi
 chown -R "$app":"$app" "/home/yunohost.app/${app}/storage"
 
 #=================================================
@@ -82,6 +85,8 @@ chown -R "$app":"$app" "/home/yunohost.app/${app}/storage"
 # REINSTALL DEPENDENCIES
 #=================================================
 
+# install nodejs
+ynh_install_nodejs 8
 
 # add backports for Debian Jessie (required to install ffmpeg)
 if [ "$(lsb_release --codename --short)" == "jessie" ]; then
@@ -123,6 +128,11 @@ ynh_restore_file "/etc/logrotate.d/$app"
 # RESTORE THE LOGROTATE CONFIGURATION
 #=================================================
 
+(
+	cd "$final_path"
+	yarn install --production --pure-lockfile --silent --cache-folder /var/cache/yarn/
+)
+
 # Set right permissions 
 chown -R "$app":"$app" "$final_path"
 

scripts/upgrade

@@ -98,6 +98,8 @@ ynh_system_user_create "$app"
 # INSTALL DEPENDENCIES
 #=================================================
 
+# install nodejs
+ynh_install_nodejs 8
 
 # add backports for Debian Jessie (required to install ffmpeg)
 if [ "$(lsb_release --codename --short)" == "jessie" ]; then
@@ -133,6 +135,11 @@ cp -a  "$tmpdir/local-production.json" "$final_path/config/local-production.json
 # Remove the tmp directory securely
 ynh_secure_remove "$tmpdir"
 
+(
+	cd "$final_path"
+	yarn install --production --pure-lockfile 
+)
+
 
 #=================================================
 # NGINX CONFIGURATION