Merge pull request #45 from YunoHost-Apps/manifestv2

Manifestv2

.github/workflows/updater.sh

@@ -1,107 +0,0 @@
-#!/bin/bash
-
-#=================================================
-# PACKAGE UPDATING HELPER
-#=================================================
-
-# This script is meant to be run by GitHub Actions
-# The YunoHost-Apps organisation offers a template Action to run this script periodically
-# Since each app is different, maintainers can adapt its contents so as to perform
-# automatic actions when a new upstream release is detected.
-
-#=================================================
-# FETCHING LATEST RELEASE AND ITS ASSETS
-#=================================================
-
-# Fetching information
-current_version=$(cat manifest.json | jq -j '.version|split("~")[0]')
-repo=$(cat manifest.json | jq -j '.upstream.code|split("https://github.com/")[1]')
-# Some jq magic is needed, because the latest upstream release is not always the latest version (e.g. security patches for older versions)
-version=$(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '.[] | select( .prerelease != true ) | .tag_name' | sort -V | tail -1)
-assets="https://github.com/diaspora/diaspora/archive/refs/tags/$version.tar.gz"
-
-# Later down the script, we assume the version has only digits and dots
-# Sometimes the release name starts with a "v", so let's filter it out.
-# You may need more tweaks here if the upstream repository has different naming conventions.
-if [[ ${version:0:1} == "v" || ${version:0:1} == "V" ]]; then
-	version=${version:1}
-fi
-
-# Setting up the environment variables
-echo "Current version: $current_version"
-echo "Latest release from upstream: $version"
-echo "VERSION=$version" >> $GITHUB_ENV
-echo "REPO=$repo" >> $GITHUB_ENV
-# For the time being, let's assume the script will fail
-echo "PROCEED=false" >> $GITHUB_ENV
-
-# Proceed only if the retrieved version is greater than the current one
-if ! dpkg --compare-versions "$current_version" "lt" "$version" ; then
-	echo "::warning ::No new version available"
-	exit 0
-# Proceed only if a PR for this new version does not already exist
-elif git ls-remote -q --exit-code --heads https://github.com/$GITHUB_REPOSITORY.git ci-auto-update-v$version ; then
-	echo "::warning ::A branch already exists for this update"
-	exit 0
-fi
-
-#=================================================
-# UPDATE SOURCE FILES
-#=================================================
-
-# Let's download source tarball
-asset_url=$assets
-
-echo "Handling asset at $asset_url"
-
-src="app"
-
-# Create the temporary directory
-tempdir="$(mktemp -d)"
-
-# Download sources and calculate checksum
-filename=${asset_url##*/}
-curl --silent -4 -L $asset_url -o "$tempdir/$filename"
-checksum=$(sha256sum "$tempdir/$filename" | head -c 64)
-
-# Delete temporary directory
-rm -rf $tempdir
-
-# Get extension
-if [[ $filename == *.tar.gz ]]; then
-  extension=tar.gz
-else
-  extension=${filename##*.}
-fi
-
-# Rewrite source file
-cat <<EOT > conf/$src.src
-SOURCE_URL=$asset_url
-SOURCE_SUM=$checksum
-SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=$extension
-SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=
-SOURCE_EXTRACT=true
-EOT
-echo "... conf/$src.src updated"
-
-#=================================================
-# SPECIFIC UPDATE STEPS
-#=================================================
-
-# Any action on the app's source code can be done.
-# The GitHub Action workflow takes care of committing all changes after this script ends.
-
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-
-# Replace new version in manifest
-echo "$(jq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.json)" > manifest.json
-
-# No need to update the README, yunohost-bot takes care of it
-
-# The Action will proceed only if the PROCEED environment variable is set to true
-echo "PROCEED=true" >> $GITHUB_ENV
-exit 0

.github/workflows/updater.yml

@@ -1,49 +0,0 @@
-# This workflow allows GitHub Actions to automagically update your app whenever a new upstream release is detected.
-# You need to enable Actions in your repository settings, and fetch this Action from the YunoHost-Apps organization.
-# This file should be enough by itself, but feel free to tune it to your needs.
-# It calls updater.sh, which is where you should put the app-specific update steps.
-name: Check for new upstream releases
-on:
-  # Allow to manually trigger the workflow
-  workflow_dispatch:
-  # Run it every day at 6:00 UTC
-  schedule:
-    - cron:  '0 6 * * *'
-jobs:
-  updater:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Fetch the source code
-        uses: actions/checkout@v2
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Run the updater script
-        id: run_updater
-        run: |
-          # Setting up Git user
-          git config --global user.name 'yunohost-bot'
-          git config --global user.email 'yunohost-bot@users.noreply.github.com'
-          # Run the updater script
-          /bin/bash .github/workflows/updater.sh
-      - name: Commit changes
-        id: commit
-        if: ${{ env.PROCEED == 'true' }}
-        run: |
-          git commit -am "Upgrade to v$VERSION"
-      - name: Create Pull Request
-        id: cpr
-        if: ${{ env.PROCEED == 'true' }}
-        uses: peter-evans/create-pull-request@v3
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          commit-message: Update to version ${{ env.VERSION }}
-          committer: 'yunohost-bot <yunohost-bot@users.noreply.github.com>'
-          author: 'yunohost-bot <yunohost-bot@users.noreply.github.com>'
-          signoff: false
-          base: testing
-          branch: ci-auto-update-v${{ env.VERSION }}
-          delete-branch: true
-          title: 'Upgrade to version ${{ env.VERSION }}'
-          body: |
-            Upgrade to v${{ env.VERSION }}
-          draft: false

README.md

@@ -1,5 +1,5 @@
 <!--
-N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
+N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/readme_generator
 It shall NOT be edited by hand.
 -->
 
@@ -18,19 +18,12 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 Distributed social networking service
 
-**Shipped version:** 0.7.18.1~ynh1
+**Shipped version:** 0.7.18.2~ynh2
 
 ## Screenshots
 
 ![Screenshot of Diaspora](./doc/screenshots/Diaspora_latest.png)
 
-## Disclaimers / important information
-
-- There is currently no LDAP integration
-- the installation is very long, especially the frontend building step
-- As upstream doesn't support it, there is no possibility to change the endpoint/url of diaspora\*. Please choose it carefully!
-- The main permission should be granted to "visitors". In other term, diaspora is intented to be a public application. Only deviate from that if you know what you are doing!
-
 ## Documentation and resources
 
 * Official app website: <https://diasporafoundation.org/>

README_fr.md

@@ -1,5 +1,5 @@
 <!--
-N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
+N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/readme_generator
 It shall NOT be edited by hand.
 -->
 
@@ -18,19 +18,12 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 
 Service de réseau social distribué
 
-**Version incluse :** 0.7.18.1~ynh1
+**Version incluse :** 0.7.18.2~ynh2
 
 ## Captures d’écran
 
 ![Capture d’écran de Diaspora](./doc/screenshots/Diaspora_latest.png)
 
-## Avertissements / informations importantes
-
-- Il n'y a pas d'intégration LDAP pour le moment.
-- L'installation est très longue, en particulier l'étape de build du frontend.
-- le projet amont ne supporte pas les changements d'url, ainsi l'application yunohost ne supporte pas non plus cette action.
-- Le groupe visiteur doit avoir la permission "diaspora.main". En d'autres termes, diaspora est supposé être une application publique. Ne changez cela que si vous savez ce que vous faîtes ! 
-
 ## Documentations et ressources
 
 * Site officiel de l’app : <https://diasporafoundation.org/>

check_process

@@ -1,26 +0,0 @@
-;; Test complet
-	; Manifest
-		domain="domain.tld"
-		admin="john"
-		password="1Strong-Password"
-	; Checks
-		pkg_linter=1
-		setup_sub_dir=0 # not supported upstream
-		setup_root=1
-		setup_nourl=0
-		upgrade=1
-		# 0.7.16.0-ynh1
-		upgrade=1	from_commit=ee7996edba39c1978b0986aabc89042f949e335f
-		# 0.7.17.0~ynh1
-		upgrade=1	from_commit=f6bc22257c54478420ed42480f346f25601ee87a
-		backup_restore=1
-		multi_instance=1
-		port_already_use=0
-		change_url=0 # not supported upstream
-;;; Options
-Email=
-Notification=none
-;;; Upgrade options
-	; commit=ee7996edba39c1978b0986aabc89042f949e335f
-		name=0.7.16.0-ynh1.
-		manifest_arg=domain=DOMAIN&admin=USER&admin_password=pass

conf/app.src

@@ -1,7 +0,0 @@
-SOURCE_URL=https://github.com/diaspora/diaspora/archive/refs/tags/v0.7.18.1.tar.gz
-SOURCE_SUM=9dba7fc8ec261bc00c4f5d45af38e3c7aa9e44204dce3b2b79feeed3a120d148
-SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=tar.gz
-SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=
-SOURCE_EXTRACT=true

conf/diaspora_sidekiq.service

@@ -5,11 +5,11 @@ PartOf=__APP__.target
 [Service]
 Type=simple
 User=__APP__
-WorkingDirectory=__FINALPATH__/live
+WorkingDirectory=__INSTALL_DIR__/live
 Environment="__LD_PRELOAD__"
 Environment="RAILS_ENV=production"
 Environment="__YNH_RUBY_LOAD_PATH__"
-ExecStart=__FINAL_PATH__/live/bin/bundle exec sidekiq
+ExecStart=__INSTALL_DIR__/live/bin/bundle exec sidekiq
 Restart=always
 
 # Sandboxing options to harden security

conf/diaspora_web.service

@@ -5,12 +5,12 @@ PartOf=__APP__.target
 [Service]
 Type=simple
 User=__APP__
-WorkingDirectory=__FINALPATH__/live
+WorkingDirectory=__INSTALL_DIR__/live
 Environment="__LD_PRELOAD__"
 Environment="RAILS_ENV=production"
 Environment="__YNH_RUBY_LOAD_PATH__"
 PIDFile=/run/__APP__/diaspora.pid
-ExecStart=__FINAL_PATH__/live/bin/bundle exec unicorn -c config/unicorn.rb -E production
+ExecStart=__INSTALL_DIR__/live/bin/bundle exec unicorn -c config/unicorn.rb -E production
 ExecReload=/bin/kill -USR2 $MAINPID
 Restart=always
 

conf/nginx.conf

@@ -2,7 +2,7 @@
 location __PATH__/ {
 
   # Path to source
-  alias __FINALPATH__/live/public/;
+  alias __INSTALL_DIR__/live/public/;
 
   # Configure maximum picture size
   # Note that Diaspora has a client side check set at 4M

doc/PRE_INSTALL.md

@@ -1,4 +1,3 @@
-- There is currently no LDAP integration
 - the installation is very long, especially the frontend building step
 - As upstream doesn't support it, there is no possibility to change the endpoint/url of diaspora\*. Please choose it carefully!
 - The main permission should be granted to "visitors". In other term, diaspora is intented to be a public application. Only deviate from that if you know what you are doing!

doc/PRE_INSTALL_fr.md

@@ -1,4 +1,3 @@
-- Il n'y a pas d'intégration LDAP pour le moment.
 - L'installation est très longue, en particulier l'étape de build du frontend.
 - le projet amont ne supporte pas les changements d'url, ainsi l'application yunohost ne supporte pas non plus cette action.
 - Le groupe visiteur doit avoir la permission "diaspora.main". En d'autres termes, diaspora est supposé être une application publique. Ne changez cela que si vous savez ce que vous faîtes !

manifest.json

@@ -1,51 +0,0 @@
-{
-    "name": "Diaspora",
-    "id": "diaspora",
-    "packaging_format": 1,
-    "description": {
-        "en": "Distributed social networking service",
-        "fr": "Service de réseau social distribué"
-    },
-    "version": "0.7.18.1~ynh1",
-    "url": "https://diasporafoundation.org",
-    "upstream": {
-        "license": "AGPL-3.0",
-        "website": "https://diasporafoundation.org/",
-        "admindoc": "https://wiki.diasporafoundation.org/FAQ_for_pod_maintainers",
-        "userdoc": "https://wiki.diasporafoundation.org/FAQ_for_users",
-        "code": "https://github.com/diaspora/diaspora"
-    },
-    "license": "AGPL-3.0",
-    "maintainer": {
-        "name": "rafi59",
-        "email": ""
-    },
-    "requirements": {
-        "yunohost": ">= 4.3.0"
-    },
-    "multi_instance": true,
-    "services": [
-        "nginx"
-    ],
-    "arguments": {
-        "install": [
-            {
-                "name": "domain",
-                "type": "domain"
-            },
-            {
-                "name": "admin",
-                "type": "user"
-            },
-            {
-                "name": "password",
-                "type": "password",
-                "help": {
-                    "en": "Admin password. Must contain at least 10 characters, one lowercase letter, one uppercase letter, one number, and one symbol (e.g. '~!@#$%^&*()').",
-                    "fr": "Mot de passe pour l’administrateur. Doit contenir au moins 10 caractères, une majuscule, une minuscule, un chiffre, et une ponctuation (ex. '~!@#$%^&*()')."
-                },
-                "optional": false
-            }
-        ]
-    }
-}

manifest.toml

@@ -0,0 +1,98 @@
+#:schema https://raw.githubusercontent.com/YunoHost/apps/master/schemas/manifest.v2.schema.json
+
+packaging_format = 2
+
+id = "diaspora"
+name = "Diaspora"
+description.en = "Distributed social networking service"
+description.fr = "Service de réseau social distribué"
+
+version = "0.7.18.2~ynh2"
+
+maintainers = ["rafi59"]
+
+[upstream]
+license = "AGPL-3.0"
+website = "https://diasporafoundation.org/"
+admindoc = "https://wiki.diasporafoundation.org/FAQ_for_pod_maintainers"
+userdoc = "https://wiki.diasporafoundation.org/FAQ_for_users"
+code = "https://github.com/diaspora/diaspora"
+
+[integration]
+yunohost = ">=11.2"
+architectures = "all" # FIXME: can be replaced by a list of supported archs using the dpkg --print-architecture nomenclature (amd64/i386/armhf/arm64), for example: ["amd64", "i386"]
+multi_instance = true
+ldap = false
+sso = false
+disk = "200M"
+ram.build = "2000M"
+ram.runtime = "2000M"
+
+[install]
+    [install.domain]
+    type = "domain"
+
+    [install.admin]
+    type = "user"
+
+    [install.init_main_permission]
+    type = "group"
+    default = "visitors"
+
+    [install.password]
+    help.en = "Admin password. Must contain at least 10 characters, one lowercase letter, one uppercase letter, one number, and one symbol (e.g. '~!@#$%^&*()')."
+    help.fr = "Mot de passe pour l’administrateur. Doit contenir au moins 10 caractères, une majuscule, une minuscule, un chiffre, et une ponctuation (ex. '~!@#$%^&*()')."
+    type = "password"
+    optional = false
+
+[resources]
+    [resources.sources.main]
+    url = "https://github.com/diaspora/diaspora/archive/refs/tags/v0.7.18.2.tar.gz"
+    sha256 = "0b5828aa45af2361bfda4cd0f1e97070c322d90f1d16416bae2cba2418af9930"
+
+    autoupdate.strategy = "latest_github_release"
+
+    [resources.system_user]
+
+    [resources.install_dir]
+
+    [resources.permissions]
+    main.url = "/"
+
+    [resources.apt]
+    packages = [
+        "cmake",
+        "imagemagick",
+        "ghostscript",
+        "curl",
+        "libmagickwand-dev",
+        "git",
+        "libpq-dev",
+        "redis-server",
+        "postgresql",
+        "libffi-dev",
+        "libgdbm-dev",
+        "libncurses5-dev",
+        "libyaml-dev",
+        "pkg-config",
+        "sqlite3",
+        "libgmp-dev",
+        "libssl-dev",
+        # For Ruby
+        "libjemalloc-dev",
+        "curl",
+        "build-essential",
+        "libreadline-dev",
+        "zlib1g-dev",
+        "libsqlite3-dev",
+        "libssl-dev",
+        "libxml2-dev",
+        "libxslt-dev",
+        "autoconf",
+        "automake",
+        "bison",
+        "libtool",
+    ]
+
+    [resources.database]
+    type = "postgresql"

scripts/_common.sh

@@ -4,41 +4,43 @@
 # COMMON VARIABLES
 #=================================================
 
-# dependencies used by the app
-pkg_dependencies="cmake imagemagick ghostscript curl libmagickwand-dev git libpq-dev redis-server postgresql"
-build_pkg_dependencies="libffi-dev libgdbm-dev libncurses5-dev libyaml-dev pkg-config sqlite3 libgmp-dev libssl-dev"
-
 ruby_version=2.7
 nodejs_version=14
 bundler_version=2.1.4
 
-# Workaround for ruby 2.7 on Bullseye
+# jemalloc seems to be better for ROR apps, let's use it
-# See https://github.com/mastodon/mastodon/issues/15751#issuecomment-873594463
+case $YNH_ARCH in
-# Apparently fixed on ruby 3.0.4
+    amd64)
-if [ "$(lsb_release --codename --short)" = "bullseye" ]; then
+        arch="x86_64"
-    case $YNH_ARCH in
+        ;;
-        amd64)
+    arm64)
-            arch="x86_64"
+        arch="aarch64"
-            ;;
+        ;;
-        arm64)
+    armel|armhf)
-            arch="aarch64"
+        arch="arm"
-            ;;
+        ;;
-        armel|armhf)
+    i386)
-            arch="arm"
+        arch="i386"
-            ;;
+        ;;
-        i386)
+esac
-            arch="i386"
+ld_preload="LD_PRELOAD=/usr/lib/$arch-linux-gnu/libjemalloc.so"
-            ;;
-    esac
-    ld_preload="LD_PRELOAD=/usr/lib/$arch-linux-gnu/libjemalloc.so"
-else
-    ld_preload=""
-fi
 
 #=================================================
 # PERSONAL HELPERS
 #=================================================
 
+_ynh_add_systemd_target() {
+    ynh_add_config --template="diaspora.target" --destination="/etc/systemd/system/${app}.target"
+    systemctl daemon-reload
+    systemctl enable "${app}.target" --quiet
+}
+_ynh_remove_systemd_target() {
+    systemctl stop "${app}.target"
+    systemctl disable "${app}.target" --quiet
+    ynh_secure_remove --file="/etc/systemd/system/${app}.target"
+    systemctl daemon-reload
+}
+
 #=================================================
 # EXPERIMENTAL HELPERS
 #=================================================

scripts/backup

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-#=================================================
-# GENERIC START
 #=================================================
 # IMPORT GENERIC HELPERS
 #=================================================
@@ -10,27 +8,6 @@
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# MANAGE SCRIPT FAILURE
-#=================================================
-
-ynh_clean_setup () {
-	true
-}
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
-#=================================================
-# LOAD SETTINGS
-#=================================================
-ynh_print_info --message="Loading installation settings..."
-
-app=$YNH_APP_INSTANCE_NAME
-
-final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-domain=$(ynh_app_setting_get --app=$app --key=domain)
-db_name=$(ynh_app_setting_get --app=$app --key=db_name)
-
 #=================================================
 # DECLARE DATA AND CONF FILES TO BACKUP
 #=================================================
@@ -40,22 +17,18 @@ ynh_print_info --message="Declaring files to be backed up..."
 # BACKUP THE APP MAIN DIR
 #=================================================
 
-ynh_backup --src_path="$final_path"
+ynh_backup --src_path="$install_dir"
 
 #=================================================
-# BACKUP THE NGINX CONFIGURATION
+# SYSTEM CONFIGURATION
 #=================================================
 
 ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
-#=================================================
-# SPECIFIC BACKUP
-#=================================================
-# BACKUP SYSTEMD
-#=================================================
-
 ynh_backup --src_path="/etc/systemd/system/${app}_web.service"
 ynh_backup --src_path="/etc/systemd/system/${app}_sidekiq.service"
+ynh_backup --src_path="/etc/systemd/system/${app}.target"
+ynh_backup --src_path="/etc/tmpfiles.d/${app}.conf"
 
 #=================================================
 # BACKUP THE POSTGRESQL DATABASE

scripts/change_url

@@ -0,0 +1,54 @@
+#!/bin/bash
+
+#=================================================
+# IMPORT GENERIC HELPERS
+#=================================================
+
+source _common.sh
+source ynh_install_ruby__2
+source /usr/share/yunohost/helpers
+
+#=================================================
+# INITIALIZE AND STORE SETTINGS
+#=================================================
+
+admin_mail=$(ynh_user_get_info --username=$admin --key=mail)
+
+#=================================================
+# STOP SYSTEMD SERVICE
+#=================================================
+ynh_script_progression --message="Stopping $app's systemd service..." --weight=1
+
+ynh_systemd_action --service_name="$app.target" --action="stop" --log_path="/var/log/$app/$app.log"
+
+#=================================================
+# MODIFY URL IN NGINX CONF
+#=================================================
+ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1
+
+# this will most likely adjust NGINX config correctly
+ynh_change_url_nginx_config
+
+#=================================================
+# UPDATE A CONFIG FILE
+#=================================================
+ynh_script_progression --message="Updating a configuration file..." --weight=1
+
+ynh_add_config --template="diaspora.yml" --destination="$install_dir/live/config/diaspora.yml"
+chmod 400 "$install_dir/live/config/diaspora.yml"
+chown "$app:$app" "$install_dir/live/config/diaspora.yml"
+
+#=================================================
+# START SYSTEMD SERVICE
+#=================================================
+ynh_script_progression --message="Starting $app's systemd service..." --weight=1
+
+systemctl restart "${app}.target"
+ynh_systemd_action --service_name="${app}_web.service" --action=restart --log_path="$install_dir/live/log/production.log" --line_match="successfully configured the federation library"
+ynh_systemd_action --service_name="${app}_sidekiq.service" --action=restart --log_path="systemd" --line_match="Running in ruby"
+
+#=================================================
+# END OF SCRIPT
+#=================================================
+
+ynh_script_progression --message="Change of URL completed for $app" --last

scripts/install

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-#=================================================
-# GENERIC START
 #=================================================
 # IMPORT GENERIC HELPERS
 #=================================================
@@ -11,132 +9,62 @@ source ynh_install_ruby__2
 source /usr/share/yunohost/helpers
 
 #=================================================
-# MANAGE SCRIPT FAILURE
+# INITIALIZE AND STORE SETTINGS
 #=================================================
 
-ynh_clean_setup () {
-	true
-}
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
-#=================================================
-# RETRIEVE ARGUMENTS FROM THE MANIFEST
-#=================================================
-
-domain=$YNH_APP_ARG_DOMAIN
-path_url="/"
-admin=$YNH_APP_ARG_ADMIN
-password=$YNH_APP_ARG_PASSWORD
-
-app=$YNH_APP_INSTANCE_NAME
-
 admin_mail=$(ynh_user_get_info --username=$admin --key=mail)
 
-#=================================================
-# CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
-#=================================================
-ynh_script_progression --message="Validating installation parameters..." --weight=1
-
-final_path=/var/www/$app
-test ! -e "$final_path" || ynh_die --message="This path already contains a folder"
-
-# Register (book) web path
-ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
-
-#=================================================
-# STORE SETTINGS FROM MANIFEST
-#=================================================
-ynh_script_progression --message="Storing installation settings..." --weight=1
-
-ynh_app_setting_set --app=$app --key=domain --value=$domain
-ynh_app_setting_set --app=$app --key=path --value=$path_url
-
-#=================================================
-# STANDARD MODIFICATIONS
 #=================================================
 # INSTALL DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Installing dependencies..." --weight=5
+ynh_script_progression --message="Installing Ruby..." --weight=5
-
-ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies $build_pkg_dependencies
 ynh_exec_warn_less ynh_install_ruby --ruby_version=$ruby_version
+
+ynh_script_progression --message="Installing NodeJS..." --weight=5
 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
 
-ynh_package_autoremove
-
-#=================================================
-# CREATE DEDICATED USER
-#=================================================
-ynh_script_progression --message="Configuring system user..." --weight=1
-
-# Create a system user
-ynh_system_user_create --username=$app --home_dir="$final_path"
-
-#=================================================
-# CREATE A POSTGRESQL DATABASE
-#=================================================
-ynh_script_progression --message="Creating a PostgreSQL database..." --weight=1
-
-db_name=$(ynh_sanitize_dbid $app)
-db_user=$db_name
-ynh_app_setting_set --app=$app --key=db_name --value=$db_name
-ynh_psql_test_if_first_run
-ynh_psql_setup_db --db_user=$db_user --db_name=$db_name
-db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd)
-
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
 ynh_script_progression --message="Setting up source files..." --weight=1
 
-ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 # Download, check integrity, uncompress and patch the source from app.src
-ynh_setup_source --dest_dir="$final_path/live"
+ynh_setup_source --dest_dir="$install_dir/live"
+
 # create upload folder and link it
-mkdir -p "$final_path/uploads"
+mkdir -p "$install_dir/uploads"
-ln -s "$final_path/uploads" "$final_path/live/public"
+ln -s "$install_dir/uploads" "$install_dir/live/public"
 
-chmod -R 750 "$final_path"
+chmod -R o-rwx "$install_dir"
-chown -R $app:www-data "$final_path"
+chown -R "$app:www-data" "$install_dir"
 
-#=================================================
-# NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Configuring NGINX web server..." --weight=1
-
-# Create a dedicated NGINX config
-ynh_add_nginx_config
-
-#=================================================
-# SPECIFIC SETUP
 #=================================================
 # ADD A CONFIGURATION
 #=================================================
-ynh_script_progression --message="Adding a configuration file..." --weight=1
+ynh_script_progression --message="Adding $app's configuration file..." --weight=1
 
-ynh_add_config --template="../conf/diaspora.yml" --destination="$final_path/live/config/diaspora.yml"
+ynh_add_config --template="diaspora.yml" --destination="$install_dir/live/config/diaspora.yml"
-chmod 400 "$final_path/live/config/diaspora.yml"
+chmod 400 "$install_dir/live/config/diaspora.yml"
-chown $app:$app "$final_path/live/config/diaspora.yml"
+chown "$app:$app" "$install_dir/live/config/diaspora.yml"
 
-ynh_add_config --template="../conf/database.yml" --destination="$final_path/live/config/database.yml"
+ynh_add_config --template="database.yml" --destination="$install_dir/live/config/database.yml"
-chmod 400 "$final_path/live/config/database.yml"
+chmod 400 "$install_dir/live/config/database.yml"
-chown $app:$app "$final_path/live/config/database.yml"
+chown "$app:$app" "$install_dir/live/config/database.yml"
 
 #=================================================
 # BUILD APP
 #=================================================
 ynh_script_progression --message="Building app..." --weight=40
 
-pushd $final_path/live
+pushd "$install_dir/live"
   ynh_use_ruby
   ynh_use_nodejs
-  ynh_gem install bundler:$bundler_version
+  ynh_gem install "bundler:$bundler_version"
-  ynh_exec_as $app $ynh_ruby_load_path $ld_preload script/configure_bundler
+  ynh_exec_warn_less ynh_exec_as "$app" "$ynh_ruby_load_path" "$ld_preload" script/configure_bundler
-  ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle install --full-index --with=postgresql
+  ynh_exec_warn_less ynh_exec_as "$app" "$ynh_ruby_load_path" "$ld_preload" bin/bundle install --full-index --with=postgresql
-  ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rake db:migrate
+  ynh_exec_warn_less ynh_exec_as "$app" RAILS_ENV=production "$ynh_ruby_load_path" "$ld_preload" bin/bundle exec rake db:migrate
-  ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/rake assets:precompile
+  ynh_exec_warn_less ynh_exec_as "$app" RAILS_ENV=production "$ynh_ruby_load_path" "$ld_preload" bin/rake assets:precompile
-  ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails console << END
+  ynh_exec_warn_less ynh_exec_as "$app" RAILS_ENV=production "$ynh_ruby_load_path" "$ld_preload" bin/bundle exec rails console << END
 user = User.build({username: '$admin', email: '$admin_mail', password: '$password', password_confirmation: '$password' })
 user.save
 user.seed_aspects
@@ -145,62 +73,37 @@ END
 popd
 
 #=================================================
-# SETUP SYSTEMD
+# SYSTEM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Configuring a systemd service..." --weight=1
+ynh_script_progression --message="Adding system configurations related to $app..." --weight=1
 
+# Create a dedicated NGINX config
+ynh_add_nginx_config
+
+# Create a dedicated systemd config
 ynh_add_systemd_config --service="${app}_sidekiq" --template="diaspora_sidekiq.service"
 ynh_add_systemd_config --service="${app}_web" --template="diaspora_web.service"
 
-# tmp files
+# Create target unit
-install -T --mode=0644 -v ../conf/diaspora.tmpfiles.d /etc/tmpfiles.d/${app}.conf
+_ynh_add_systemd_target
-ynh_replace_string --match_string=__APP__ --replace_string=$app --target_file=/etc/tmpfiles.d/${app}.conf
+yunohost service add "$app.target" --description "Diaspora service (unicorn web and sidekiq)" \
+  --log "$install_dir/live/log/production.log" \
+        "$install_dir/live/log/unicorn-stderr.log" \
+        "$install_dir/live/log/unicorn-stdout.log" \
+        "$install_dir/live/log/sidekiq.log"
 
-# target unit
+# Create tmpfile
-install -T --mode=0644 -v ../conf/diaspora.target /etc/systemd/system/${app}.target
+ynh_add_config --template="diaspora.tmpfiles.d" --destination="/etc/tmpfiles.d/${app}.conf"
-ynh_replace_string --match_string=__APP__ --replace_string=$app --target_file=/etc/systemd/system/${app}.target
-
-# reload, create, enable and start stuff
-systemctl daemon-reload
 systemd-tmpfiles --create
-systemctl enable ${app}.target --quiet
-
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# INTEGRATE SERVICE IN YUNOHOST
-#=================================================
-ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
-
-yunohost service add $app.target \
-  --log $final_path/live/log/production.log \
-        $final_path/live/log/unicorn-stderr.log\
-        $final_path/live/log/unicorn-stdout.log\
-        $final_path/live/log/sidekiq.log\
-  --description "Diaspora service (unicorn web and sidekiq)"
 
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message="Starting a systemd service..." --weight=1
+ynh_script_progression --message="Starting $app's systemd service..." --weight=1
 
-systemctl restart ${app}.target
+systemctl restart "${app}.target"
-ynh_systemd_action --service_name=${app}_web.service --action=restart --log_path="$final_path/live/log/production.log" --line_match="successfully configured the federation library"
+ynh_systemd_action --service_name="${app}_web.service" --action=restart --log_path="$install_dir/live/log/production.log" --line_match="successfully configured the federation library"
-ynh_systemd_action --service_name=${app}_sidekiq.service --action=restart --log_path="systemd" --line_match="Running in ruby"
+ynh_systemd_action --service_name="${app}_sidekiq.service" --action=restart --log_path="systemd" --line_match="Running in ruby"
-
-#=================================================
-# SETUP SSOWAT
-#=================================================
-ynh_script_progression --message="Configuring permissions..." --weight=1
-
-ynh_permission_update --permission="main" --add="visitors"
-
-#=================================================
-# RELOAD NGINX
-#=================================================
-ynh_script_progression --message="Reloading NGINX web server..." --weight=1
-
-ynh_systemd_action --service_name=nginx --action=reload
 
 #=================================================
 # END OF SCRIPT

scripts/remove

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-#=================================================
-# GENERIC START
 #=================================================
 # IMPORT GENERIC HELPERS
 #=================================================
@@ -11,64 +9,21 @@ source ynh_install_ruby__2
 source /usr/share/yunohost/helpers
 
 #=================================================
-# LOAD SETTINGS
+# REMOVE SYSTEM CONFIGURATIONS
-#=================================================
-ynh_script_progression --message="Loading installation settings..." --weight=1
-
-app=$YNH_APP_INSTANCE_NAME
-
-domain=$(ynh_app_setting_get --app=$app --key=domain)
-db_name=$(ynh_app_setting_get --app=$app --key=db_name)
-db_user=$db_name
-final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-
-#=================================================
-# STANDARD REMOVE
-#=================================================
-# REMOVE SERVICE INTEGRATION IN YUNOHOST
 #=================================================
+ynh_script_progression --message="Removing system configurations related to $app..." --weight=1
 
 # Remove the service from the list of services known by YunoHost (added from `yunohost service add`)
-if ynh_exec_warn_less yunohost service status $app.target >/dev/null
+if ynh_exec_warn_less yunohost service status "$app.target" >/dev/null; then
-then
+    yunohost service remove "$app.target"
-	ynh_script_progression --message="Removing $app.target service integration..." --weight=1
-	yunohost service remove $app.target
 fi
 
-#=================================================
+ynh_remove_systemd_config
-# STOP AND REMOVE SERVICE
-#=================================================
-ynh_script_progression --message="Stopping and removing the systemd service..." --weight=1
 
-systemctl stop ${app}.target
-systemctl disable ${app}.target --quiet
-ynh_remove_systemd_config --service="${app}_web"
-ynh_remove_systemd_config --service="${app}_sidekiq"
 ynh_secure_remove --file="/etc/tmpfiles.d/${app}.conf"
-ynh_secure_remove --file="/etc/systemd/system/${app}.target"
 ynh_secure_remove --file="/run/${app}"
-systemctl daemon-reload
 
-#=================================================
+_ynh_remove_systemd_target
-# REMOVE THE POSTGRESQL DATABASE
-#=================================================
-ynh_script_progression --message="Removing the PostgreSQL database..." --weight=1
-
-# Remove a database if it exists, along with the associated user
-ynh_psql_remove_db --db_user=$db_user --db_name=$db_name
-
-#=================================================
-# REMOVE APP MAIN DIR
-#=================================================
-ynh_script_progression --message="Removing app main directory..." --weight=1
-
-# Remove the app directory securely
-ynh_secure_remove --file="$final_path"
-
-#=================================================
-# REMOVE NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1
 
 # Remove the dedicated NGINX config
 ynh_remove_nginx_config
@@ -81,17 +36,6 @@ ynh_script_progression --message="Removing dependencies..." --weight=10
 # Remove metapackage and its dependencies
 ynh_remove_ruby
 ynh_remove_nodejs
-ynh_remove_app_dependencies
-
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# REMOVE DEDICATED USER
-#=================================================
-ynh_script_progression --message="Removing the dedicated system user..." --weight=1
-
-# Delete a system user
-ynh_system_user_delete --username=$app
 
 #=================================================
 # END OF SCRIPT

scripts/restore

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-#=================================================
-# GENERIC START
 #=================================================
 # IMPORT GENERIC HELPERS
 #=================================================
@@ -12,147 +10,71 @@ source ../settings/scripts/ynh_install_ruby__2
 source /usr/share/yunohost/helpers
 
 #=================================================
-# MANAGE SCRIPT FAILURE
+# REINSTALL DEPENDENCIES
 #=================================================
+ynh_script_progression --message="Reinstalling Ruby..." --weight=5
+ynh_exec_warn_less ynh_install_ruby --ruby_version="$ruby_version"
 
-ynh_clean_setup () {
+ynh_script_progression --message="Reinstalling NodeJS..." --weight=5
-	true
+ynh_exec_warn_less ynh_install_nodejs --nodejs_version="$nodejs_version"
-}
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
-#=================================================
-# LOAD SETTINGS
-#=================================================
-ynh_script_progression --message="Loading installation settings..." --weight=1
-
-app=$YNH_APP_INSTANCE_NAME
-
-domain=$(ynh_app_setting_get --app=$app --key=domain)
-final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-db_name=$(ynh_app_setting_get --app=$app --key=db_name)
-db_user=$db_name
-
-#=================================================
-# CHECK IF THE APP CAN BE RESTORED
-#=================================================
-ynh_script_progression --message="Validating restoration parameters..." --weight=1
-
-test ! -d $final_path \
-	|| ynh_die --message="There is already a directory: $final_path "
-
-#=================================================
-# STANDARD RESTORATION STEPS
-#=================================================
-# RECREATE THE DEDICATED USER
-#=================================================
-ynh_script_progression --message="Recreating the dedicated system user..." --weight=1
-
-# Create the dedicated user (if not existing)
-ynh_system_user_create --username=$app --home_dir="$final_path"
 
 #=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================
 ynh_script_progression --message="Restoring the app main directory..." --weight=1
 
-ynh_restore_file --origin_path="$final_path"
+ynh_restore_file --origin_path="$install_dir"
 
-chmod 750 "$final_path"
+chmod -R o-rwx "$install_dir"
-chmod -R o-rwx "$final_path"
+chown -R "$app:www-data" "$install_dir"
-chown -R $app:www-data "$final_path"
-
-#=================================================
-# SPECIFIC RESTORATION
-#=================================================
-# REINSTALL DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Reinstalling dependencies..." --weight=5
-
-ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies $build_pkg_dependencies
-ynh_exec_warn_less ynh_install_ruby --ruby_version=$ruby_version
-ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
-
-#=================================================
-# RESTORE THE NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1
-
-ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
 #=================================================
 # RESTORE THE POSTGRESQL DATABASE
 #=================================================
 ynh_script_progression --message="Restoring the PostgreSQL database..." --weight=1
 
-ynh_psql_test_if_first_run
+ynh_psql_connect_as --user="$db_user" --password="$db_pwd" --database="$db_name" < ./db.sql
-db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd)
-ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd
-ynh_psql_execute_file_as_root --file="./db.sql" --database="$db_name"
 
 #=================================================
 # BUILD APP
 #=================================================
 ynh_script_progression --message="Building app..." --weight=40
 
-pushd $final_path/live
+pushd "$install_dir/live"
   ynh_use_ruby
   ynh_use_nodejs
-  ynh_gem install bundler:$bundler_version
+  ynh_gem install "bundler:$bundler_version"
-  ynh_exec_as $app $ynh_ruby_load_path $ld_preload script/configure_bundler
+  ynh_exec_as "$app" "$ynh_ruby_load_path" "$ld_preload" script/configure_bundler
 popd
 
-ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
+#=================================================
-ynh_package_autoremove
+# RESTORE SYSTEM CONFIGURATIONS
+#=================================================
+ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1
 
-#=================================================
+ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
-# RESTORE SYSTEMD
-#=================================================
-ynh_script_progression --message="Restoring the systemd configuration..." --weight=1
 
 ynh_restore_file --origin_path="/etc/systemd/system/${app}_web.service"
 ynh_restore_file --origin_path="/etc/systemd/system/${app}_sidekiq.service"
-
+ynh_restore_file --origin_path="/etc/systemd/system/${app}.target"
-# tmp files
-install -T --mode=0644 -v ../settings/conf/diaspora.tmpfiles.d /etc/tmpfiles.d/${app}.conf
-ynh_replace_string --match_string=__APP__ --replace_string=$app --target_file=/etc/tmpfiles.d/${app}.conf
-
-# target unit
-install -T --mode=0644 -v ../settings/conf/diaspora.target /etc/systemd/system/${app}.target
-ynh_replace_string --match_string=__APP__ --replace_string=$app --target_file=/etc/systemd/system/${app}.target
-
-# reload, create, enable and start stuff
-systemctl daemon-reload
-systemd-tmpfiles --create
 systemctl enable "${app}_web" "${app}_sidekiq" "$app.target" --quiet
+yunohost service add "$app.target" --description "Diaspora service (unicorn web and sidekiq)" \
+  --log "$install_dir/live/log/production.log" \
+        "$install_dir/live/log/unicorn-stderr.log" \
+        "$install_dir/live/log/unicorn-stdout.log" \
+        "$install_dir/live/log/sidekiq.log"
+
+ynh_restore_file --origin_path="/etc/tmpfiles.d/${app}.conf"
+systemd-tmpfiles --create
 
 #=================================================
-# INTEGRATE SERVICE IN YUNOHOST
+# RELOAD NGINX AND PHP-FPM OR THE APP SERVICE
 #=================================================
-ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
+ynh_script_progression --message="Reloading NGINX web server and $app's service..." --weight=1
 
-yunohost service add $app.target \
+systemctl restart "${app}.target"
-  --log $final_path/live/log/production.log \
+ynh_systemd_action --service_name="${app}_web.service" --action=restart --log_path="$install_dir/live/log/production.log" --line_match="successfully configured the federation library"
-        $final_path/live/log/unicorn-stderr.log\
+ynh_systemd_action --service_name="${app}_sidekiq.service" --action=restart --log_path="systemd" --line_match="Running in ruby"
-        $final_path/live/log/unicorn-stdout.log\
-        $final_path/live/log/sidekiq.log\
-  --description "Diaspora service (unicorn web and sidekiq)"
-
-#=================================================
-# START SYSTEMD SERVICE
-#=================================================
-ynh_script_progression --message="Starting a systemd service..." --weight=1
-
-systemctl restart ${app}.target
-ynh_systemd_action --service_name=${app}_web.service --action=restart --log_path="$final_path/live/log/production.log" --line_match="successfully configured the federation library"
-ynh_systemd_action --service_name=${app}_sidekiq.service --action=restart --log_path="systemd" --line_match="Running in ruby"
-
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# RELOAD NGINX
-#=================================================
-ynh_script_progression --message="Reloading NGINX web server..." --weight=1
 
 ynh_systemd_action --service_name=nginx --action=reload
 

scripts/upgrade

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-#=================================================
-# GENERIC START
 #=================================================
 # IMPORT GENERIC HELPERS
 #=================================================
@@ -10,243 +8,144 @@ source _common.sh
 source ynh_install_ruby__2
 source /usr/share/yunohost/helpers
 
-#=================================================
-# LOAD SETTINGS
-#=================================================
-ynh_script_progression --message="Loading installation settings..." --weight=1
-
-app=$YNH_APP_INSTANCE_NAME
-
-domain=$(ynh_app_setting_get --app=$app --key=domain)
-path_url=$(ynh_app_setting_get --app=$app --key=path)
-admin=$(ynh_app_setting_get --app=$app --key=admin)
-final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-db_name=$(ynh_app_setting_get --app=$app --key=db_name)
-db_user=$db_name
-db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd)
-admin=$(ynh_app_setting_get --app=$app --key=admin)
-admin_mail=$(ynh_user_get_info --username=$admin --key=mail)
-
-#=================================================
-# CHECK VERSION
-#=================================================
-ynh_script_progression --message="Checking version..." --weight=1
-
-upgrade_type=$(ynh_check_app_version_changed)
-
-#=================================================
-# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
-#=================================================
-ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=1
-
-# Backup the current version of the app
-ynh_backup_before_upgrade
-ynh_clean_setup () {
-  # Restore it if the upgrade fails
-	ynh_restore_upgradebackup
-}
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
-#=================================================
-# STANDARD UPGRADE STEPS
 #=================================================
 # STOP SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message="Stopping a systemd service..." --weight=1
+ynh_script_progression --message="Stopping $app's systemd service..." --weight=1
 
-systemctl stop $app.target
+ynh_systemd_action --service_name="$app.target" --action="stop" --log_path="/var/log/$app/$app.log"
 
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY
 #=================================================
 ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
 
-# Cleaning legacy permissions
+if [ -e "$install_dir/.rvm" ]; then
-if ynh_legacy_permissions_exists; then
+    # migrate from rvm to rbenv
-	ynh_legacy_permissions_delete_all
+    ynh_script_progression --message="Remove rvm if needed..." --weight=1
+    ynh_exec_as "$app" --login rvm implode --force
 
-	ynh_app_setting_delete --app=$app --key=is_public
+    # remove old gpg keys for rvm
+    if gpg --list-keys mpapis@gmail.com >/dev/null 2>&1; then
+        ynh_exec_as "$app" gpg --delete-keys mpapis@gmail.com
+        ynh_secure_remove "$install_dir/mpapis@gmail.com.pgp"
+    fi
+    if gpg --list-keys piotr.kuczynski@gmail.com >/dev/null 2>&1; then
+        ynh_exec_as "$app" gpg --delete-keys piotr.kuczynski@gmail.com
+        ynh_secure_remove "$install_dir/piotr.kuczynski@gmail.com.pgp"
+    fi
 fi
 
-# migrate from rvm to rbenv
+# Move from diaspora/ to live/
-ynh_script_progression --message="Remove rvm if needed..." --weight=1
+if ! [ -d "$install_dir/live" ]; then
-if [ -e "$final_path/.rvm" ]; then
+    # NOTE if nobody never uploads anything, this won't exist yet
-  sudo -u $app --login << EOF
+    # creating it anyway, it's simpler if we can assume it exists always
-rvm implode --force
+    # but we CANNOT assume it exists from previous version
-EOF
+    if [ -d "$install_dir/diaspora/public/uploads" ]; then
+        mv "$install_dir/diaspora/public/uploads" "$install_dir/uploads"
+    else
+        mkdir "$install_dir/uploads"
+    fi
+
+    ynh_delete_file_checksum --file="$install_dir/diaspora/config/diaspora.yml"
+    ynh_delete_file_checksum --file="$install_dir/diaspora/config/database.yml"
+    mv "$install_dir/diaspora" "$install_dir/live"
+    ynh_store_file_checksum --file="$install_dir/live/config/diaspora.yml"
+    ynh_store_file_checksum --file="$install_dir/live/config/database.yml"
 fi
 
-# remove old gpg keys for rvm
+ynh_secure_remove "$install_dir/Experimental_helpers"
-ynh_script_progression --message="Remove old rvm keys..." --weight=1
+
-if gpg --list-keys mpapis@gmail.com >/dev/null 2>&1; then
+if [[ -z "${admin:-}" ]]; then
-  ynh_print_info --message="Found mpapis key: deleting"
+    admin=""
-  sudo -u $app gpg --delete-keys mpapis@gmail.com
+    ynh_app_setting_set --app="$app" --key=admin --value="$admin"
-  ynh_secure_remove "$final_path/mpapis@gmail.com.pgp"
-fi
-if gpg --list-keys piotr.kuczynski@gmail.com >/dev/null 2>&1; then
-  ynh_print_info --message="Found piotr.kuczynski: deleting"
-  sudo -u $app gpg --delete-keys piotr.kuczynski@gmail.com
-  ynh_secure_remove "$final_path/piotr.kuczynski@gmail.com.pgp"
 fi
 
-if ! [ -d "$final_path/live" ]; then
+admin_mail=$(ynh_user_get_info --username="$admin" --key=mail)
-  # NOTE if nobody never uploads anything, this won't exist yet
-  # creating it anyway, it's simpler if we can assume it exists always
-  # but we CANNOT assume it exists from previous version
-  if [ -d "$final_path/diaspora/public/uploads" ]; then
-    mv "$final_path/diaspora/public/uploads" "$final_path/uploads"
-  else
-    mkdir "$final_path/uploads"
-  fi
-  ynh_delete_file_checksum --file="$final_path/diaspora/config/diaspora.yml"
-  ynh_delete_file_checksum --file="$final_path/diaspora/config/database.yml"
-  mv "$final_path/diaspora" "$final_path/live"
-  ls -s "$final_path/uploads" "$final_path/live/public"
-  ynh_store_file_checksum --file="$final_path/live/config/diaspora.yml"
-  ynh_store_file_checksum --file="$final_path/live/config/database.yml"
-  chmod 750 "$final_path"
-  chmod -R o-rwx "$final_path"
-  chown -R $app:www-data "$final_path"
-fi
-
-ynh_secure_remove "$final_path/Experimental_helpers"
 
 #=================================================
-# CREATE DEDICATED USER
+# INSTALL DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1
+ynh_script_progression --message="Installing Ruby..." --weight=5
+ynh_exec_warn_less ynh_install_ruby --ruby_version=$ruby_version
 
-# Create a dedicated user (if not existing)
+ynh_script_progression --message="Installing NodeJS..." --weight=5
-ynh_system_user_create --username=$app --home_dir="$final_path"
+ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
+ynh_script_progression --message="Upgrading source files..." --weight=1
 
-if [ "$upgrade_type" == "UPGRADE_APP" ]
+# Download, check integrity, uncompress and patch the source from app.src
-then
+ynh_setup_source --dest_dir="$install_dir/live" --full_replace=1 --keep="config/diaspora.yml config/database.yml"
-	ynh_script_progression --message="Upgrading source files..." --weight=1
 
-	tmpdir="$(mktemp -d)"
+# create upload folder and link it
-	cp "$final_path/live/config/diaspora.yml" "$tmpdir/diaspora.yml"
+mkdir -p "$install_dir/uploads"
-	cp "$final_path/live/config/database.yml" "$tmpdir/database.yml"
+ln -s "$install_dir/uploads" "$install_dir/live/public"
-	ynh_secure_remove --file="$final_path/live"
 
-	# Download, check integrity, uncompress and patch the source from app.src
+chmod -R o-rwx "$install_dir"
-	ynh_setup_source --dest_dir="$final_path/live" --keep="config/diaspora.yml config/database.yml"
+chown -R "$app:www-data" "$install_dir"
 
-  ln -s "$final_path/uploads" "$final_path/live/public"
-
-	cp "$tmpdir/diaspora.yml" "$final_path/live/config/diaspora.yml"
-	cp "$tmpdir/database.yml" "$final_path/live/config/database.yml"
-	ynh_secure_remove --file="$tmpdir"
-fi
-
-chmod 750 "$final_path"
-chmod -R o-rwx "$final_path"
-chown -R $app:www-data "$final_path"
-
-#=================================================
-# UPGRADE DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Upgrading dependencies..." --weight=1
-
-ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies $build_pkg_dependencies
-ynh_exec_warn_less ynh_install_ruby --ruby_version=$ruby_version
-ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
-
-#=================================================
-# NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
-
-# Create a dedicated NGINX config
-ynh_add_nginx_config
-
-#=================================================
-# SPECIFIC UPGRADE
 #=================================================
 # UPDATE A CONFIG FILE
 #=================================================
 ynh_script_progression --message="Updating a configuration file..." --weight=1
 
-ynh_add_config --template="../conf/diaspora.yml" --destination="$final_path/live/config/diaspora.yml"
+ynh_add_config --template="diaspora.yml" --destination="$install_dir/live/config/diaspora.yml"
-chmod 400 "$final_path/live/config/diaspora.yml"
+chmod 400 "$install_dir/live/config/diaspora.yml"
-chown $app:$app "$final_path/live/config/diaspora.yml"
+chown "$app:$app" "$install_dir/live/config/diaspora.yml"
 
-ynh_add_config --template="../conf/database.yml" --destination="$final_path/live/config/database.yml"
+ynh_add_config --template="database.yml" --destination="$install_dir/live/config/database.yml"
-chmod 400 "$final_path/live/config/database.yml"
+chmod 400 "$install_dir/live/config/database.yml"
-chown $app:$app "$final_path/live/config/database.yml"
+chown "$app:$app" "$install_dir/live/config/database.yml"
 
 #=================================================
 # BUILD APP
 #=================================================
 ynh_script_progression --message="Building app..." --weight=40
 
-pushd $final_path/live
+pushd "$install_dir/live"
-  ynh_use_ruby
+    ynh_use_ruby
-  ynh_use_nodejs
+    ynh_use_nodejs
-  ynh_gem install bundler:$bundler_version
+    ynh_gem install "bundler:$bundler_version"
-  ynh_exec_as $app $ynh_ruby_load_path $ld_preload script/configure_bundler
+    ynh_exec_warn_less ynh_exec_as "$app" "$ynh_ruby_load_path" "$ld_preload" script/configure_bundler
-  ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle install --full-index --with=postgresql
+    ynh_exec_warn_less ynh_exec_as "$app" "$ynh_ruby_load_path" "$ld_preload" bin/bundle install --full-index --with=postgresql
-  ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rake db:migrate
+    ynh_exec_warn_less ynh_exec_as "$app" RAILS_ENV=production "$ynh_ruby_load_path" "$ld_preload" bin/bundle exec rake db:migrate
-  ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/rake assets:precompile
+    ynh_exec_warn_less ynh_exec_as "$app" RAILS_ENV=production "$ynh_ruby_load_path" "$ld_preload" bin/rake assets:precompile
 popd
 
-ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
-ynh_package_autoremove
-
 #=================================================
-# SETUP SYSTEMD
+# REAPPLY SYSTEM CONFIGURATIONS
 #=================================================
-ynh_script_progression --message="Upgrading systemd configuration..." --weight=1
+ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1
 
+# Create a dedicated NGINX config
+ynh_add_nginx_config
+
+# Create a dedicated systemd config
 ynh_add_systemd_config --service="${app}_sidekiq" --template="diaspora_sidekiq.service"
 ynh_add_systemd_config --service="${app}_web" --template="diaspora_web.service"
+# Create target unit
+_ynh_add_systemd_target
+yunohost service add "$app.target" --description "Diaspora service (unicorn web and sidekiq)" \
+  --log "$install_dir/live/log/production.log" \
+        "$install_dir/live/log/unicorn-stderr.log" \
+        "$install_dir/live/log/unicorn-stdout.log" \
+        "$install_dir/live/log/sidekiq.log"
 
-# tmp files
+# Create tmpfile
-install -T --mode=0644 -v ../conf/diaspora.tmpfiles.d /etc/tmpfiles.d/${app}.conf
+ynh_add_config --template="diaspora.tmpfiles.d" --destination="/etc/tmpfiles.d/${app}.conf"
-ynh_replace_string --match_string=__APP__ --replace_string=$app --target_file=/etc/tmpfiles.d/${app}.conf
-
-# target unit
-install -T --mode=0644 -v ../conf/diaspora.target /etc/systemd/system/${app}.target
-ynh_replace_string --match_string=__APP__ --replace_string=$app --target_file=/etc/systemd/system/${app}.target
-
-# reload, create, enable and start stuff
-systemctl daemon-reload
 systemd-tmpfiles --create
-systemctl enable ${app}.target --quiet
-
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# INTEGRATE SERVICE IN YUNOHOST
-#=================================================
-ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
-
-yunohost service add $app.target \
-  --log $final_path/live/log/production.log \
-        $final_path/live/log/unicorn-stderr.log\
-        $final_path/live/log/unicorn-stdout.log\
-        $final_path/live/log/sidekiq.log\
-  --description "Diaspora service (unicorn web and sidekiq)"
 
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message="Starting a systemd service..." --weight=1
+ynh_script_progression --message="Starting $app's systemd service..." --weight=1
 
-systemctl restart ${app}.target
+systemctl restart "${app}.target"
-ynh_systemd_action --service_name=${app}_web.service --action=restart --log_path="$final_path/live/log/production.log" --line_match="successfully configured the federation library"
+ynh_systemd_action --service_name="${app}_web.service" --action=restart --log_path="$install_dir/live/log/production.log" --line_match="successfully configured the federation library"
-ynh_systemd_action --service_name=${app}_sidekiq.service --action=restart --log_path="systemd" --line_match="Running in ruby"
+ynh_systemd_action --service_name="${app}_sidekiq.service" --action=restart --log_path="systemd" --line_match="Running in ruby"
-
-#=================================================
-# RELOAD NGINX
-#=================================================
-ynh_script_progression --message="Reloading NGINX web server..." --weight=1
-
-ynh_systemd_action --service_name=nginx --action=reload
 
 #=================================================
 # END OF SCRIPT

scripts/ynh_install_ruby__2

@@ -36,7 +36,7 @@ build_pkg_dependencies="$build_pkg_dependencies $build_ruby_dependencies"
 # However, $PATH is duplicated into $ruby_path to outlast any manipulation of $PATH
 # You can use the variable `$ynh_ruby_load_path` to quickly load your Ruby version
 #  in $PATH for an usage into a separate script.
-# Exemple: $ynh_ruby_load_path $final_path/script_that_use_gem.sh`
+# Exemple: $ynh_ruby_load_path $install_dir/script_that_use_gem.sh`
 #
 #
 # Finally, to start a Ruby service with the correct version, 2 solutions
@@ -81,7 +81,7 @@ ynh_use_ruby () {
     ynh_ruby_load_path="PATH=$PATH"
 
     # Sets the local application-specific Ruby version
-    pushd $final_path
+    pushd $install_dir
         $rbenv_install_dir/bin/rbenv local $ruby_version
     popd
 }
@@ -216,7 +216,7 @@ ynh_install_ruby () {
         final_ruby_version=$ruby_version
     fi
     ynh_print_info --message="Installing Ruby-$final_ruby_version"
-    CONFIGURE_OPTS="--disable-install-doc --with-jemalloc" MAKE_OPTS="-j2" rbenv install --skip-existing $final_ruby_version > /dev/null 2>&1
+    RUBY_CONFIGURE_OPTS="--disable-install-doc --with-jemalloc" MAKE_OPTS="-j2" rbenv install --skip-existing $final_ruby_version > /dev/null 2>&1
 
     # Store ruby_version into the config of this app
     ynh_app_setting_set --app=$YNH_APP_INSTANCE_NAME --key=ruby_version --value=$final_ruby_version

tests.toml

@@ -0,0 +1,9 @@
+#:schema https://raw.githubusercontent.com/YunoHost/apps/master/schemas/tests.v1.schema.json
+
+test_format = 1.0
+
+[default]
+
+    test_upgrade_from.ee7996edba39c1978b0986aabc89042f949e335f.name = "0.7.16.0-ynh1"
+    test_upgrade_from.f6bc22257c54478420ed42480f346f25601ee87a.name = "0.7.17.0~ynh1"
+    test_upgrade_from.bcba30ecc623956f98ba0ab0b4e545ba665ffe27.name = "0.7.18.1~ynh1"