Update conf/,scripts/

conf/nginx.conf

@@ -17,7 +17,7 @@ location = __PATH__/ {
     return 200 "
 This is where Standard Notes - Sycning Server is installed.
 
-Add   https://__DOMAIN__PATH__/   as Sync Server Domain in the Advanced Options to use this Syncing Server.";
+Add   https://__DOMAIN____PATH__/   as Sync Server Domain in the Advanced Options to use this Syncing Server.";
 }
 
 location = __PATH__/extensions {

conf/systemd_api-gateway.service

@@ -9,7 +9,7 @@ Type=simple
 User=__APP__
 Group=__APP__
 WorkingDirectory=__FINALPATH__/live/api-gateway
-EnvironmentFile=__FINALPATH__/live/api-gateway/.env
+EnvironmentFile=__FINALPATH__/live/api-gateway.env
 ExecStart=/usr/bin/yarn start
 StandardOutput=append:/var/log/__APP__/api-gateway.log
 StandardError=inherit

conf/systemd_auth-worker.service

@@ -10,7 +10,7 @@ Type=simple
 User=__APP__
 Group=__APP__
 WorkingDirectory=__FINALPATH__/live/auth-worker
-EnvironmentFile=__FINALPATH__/live/auth-worker/.env
+EnvironmentFile=__FINALPATH__/live/auth-worker.env
 ExecStart=/usr/bin/yarn worker
 StandardOutput=append:/var/log/__APP__/auth-worker.log
 StandardError=inherit

conf/systemd_auth.service

@@ -3,14 +3,14 @@ Description=StandardNotes auth
 After=network.target
 After=mysql.service
 After=redis.service
-After=__APP__-synicing-server-js.service
+After=__APP__-syncing-server-js.service
 
 [Service]
 Type=simple
 User=__APP__
 Group=__APP__
 WorkingDirectory=__FINALPATH__/live/auth
-EnvironmentFile=__FINALPATH__/live/auth/.env
+EnvironmentFile=__FINALPATH__/live/auth.env
 ExecStart=/usr/bin/yarn start
 StandardOutput=append:/var/log/__APP__/auth.log
 StandardError=inherit

conf/systemd_syncing-server-js-worker.service

@@ -10,7 +10,7 @@ Type=simple
 User=__APP__
 Group=__APP__
 WorkingDirectory=__FINALPATH__/live/syncing-server-js-worker
-EnvironmentFile=__FINALPATH__/live/syncing-server-js-worker/.env
+EnvironmentFile=__FINALPATH__/live/syncing-server-js-worker.env
 ExecStart=/usr/bin/yarn worker
 StandardOutput=append:/var/log/__APP__/syncing-server-js-worker.log
 StandardError=inherit

conf/systemd_syncing-server-js.service

@@ -9,7 +9,7 @@ Type=simple
 User=__APP__
 Group=__APP__
 WorkingDirectory=__FINALPATH__/live/syncing-server-js
-EnvironmentFile=__FINALPATH__/live/syncing-server-js/.env
+EnvironmentFile=__FINALPATH__/live/syncing-server-js.env
 ExecStart=/usr/bin/yarn start
 StandardOutput=append:/var/log/__APP__/syncing-server-js.log
 StandardError=inherit

scripts/_common.sh

@@ -3,21 +3,17 @@
 #=================================================
 # COMMON VARIABLES
 #=================================================
-#RUBY_VERSION="2.7.3"
+RUBY_VERSION="2.7.3"
 NODEJS_VERSION="15.11.0"
 
+syncing_server_js_version="1.35.1"
+auth_version="1.11.0"
+api_gateway_version="1.19.6"
+extensions_version="2021.03.15"
+
 # dependencies used by the app
 pkg_dependencies=""
 
-#pkg_dependencies="\
-#    zlib1g-dev \
-#    libsqlite3-dev \
-#    default-libmysqlclient-dev \
-#    libssl-dev \
-#    libreadline-dev \
-#    libjemalloc-dev \
-#	"
-
 #=================================================
 # PERSONAL HELPERS
 #=================================================

scripts/backup

@@ -29,6 +29,7 @@ ynh_print_info "Loading installation settings..."
 app=$YNH_APP_INSTANCE_NAME
 
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
+final_path_www=$(ynh_app_setting_get --app=$app --key=final_path_www)
 domain=$(ynh_app_setting_get --app=$app --key=domain)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 
@@ -38,6 +39,7 @@ db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 ynh_print_info "Backing up the main app directory..."
 
 ynh_backup --src_path="$final_path"
+ynh_backup --src_path="$final_path_www"
 
 #=================================================
 # BACKUP THE NGINX CONFIGURATION
@@ -75,7 +77,11 @@ ynh_backup --src_path="/etc/logrotate.d/$app"
 #=================================================
 ynh_print_info "Backing up systemd configuration..."
 
-ynh_backup --src_path="/etc/systemd/system/$app.service"
+ynh_backup --src_path="/etc/systemd/system/$app-syncing-server-js.service"
+ynh_backup --src_path="/etc/systemd/system/$app-syncing-server-js-worker.service"
+ynh_backup --src_path="/etc/systemd/system/$app-auth.service"
+ynh_backup --src_path="/etc/systemd/system/$app-auth-worker.service"
+ynh_backup --src_path="/etc/systemd/system/$app-api-gateway.service"
 
 #=================================================
 # END OF SCRIPT

scripts/change_url

@@ -29,7 +29,13 @@ ynh_script_progression --message="Loading installation settings..." --weight=1
 
 # Needed for helper "ynh_add_nginx_config"
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-port=$(ynh_app_setting_get --app=$app --key=port)
+final_path_www=$(ynh_app_setting_get --app=$app --key=final_path_www)
+final_path_extensions=$(ynh_app_setting_get --app=$app --key=final_path_extensions)
+port_syncing_server_js=$(ynh_app_setting_get --app=$app --key=port_syncing_server_js)
+port_syncing_server_js_worker=$(ynh_app_setting_get --app=$app --key=port_syncing_server_js_worker)
+port_auth=$(ynh_app_setting_get --app=$app --key=port_auth)
+port_auth_worker=$(ynh_app_setting_get --app=$app --key=port_auth_worker)
+port_api_gateway=$(ynh_app_setting_get --app=$app --key=port_api_gateway)
 access_domain=$(ynh_app_setting_get --app=$app --key=access_domain)
 access_domain=$(echo $access_domain | sed "s@;@ @g")
 mail=$(ynh_app_setting_get --app=$app --key=mail)
@@ -77,9 +83,9 @@ fi
 #=================================================
 # STOP SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message="Stopping a systemd service..." --weight=1
+#ynh_script_progression --message="Stopping a systemd service..." --weight=1
-
+#
-ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log"
+#ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log"
 
 #=================================================
 # MODIFY URL IN NGINX CONF
@@ -113,18 +119,6 @@ fi
 #=================================================
 # SPECIFIC MODIFICATIONS
 #=================================================
-ynh_script_progression --message="Modifying a config file..." --weight=1
-
-config_file="$final_path/live/.env"
-ynh_replace_string --match_string="RAILS_RELATIVE_URL_ROOT=$old_path" --replace_string="RAILS_RELATIVE_URL_ROOT=$new_path" --target_file="$config_file"
-
-if [ $change_domain -eq 1 ]
-then
-    new_mail="$app@$new_domain"
-    ynh_replace_string --match_string="$mail" --replace_string="$new_mail" --target_file="$final_path/live/app/mailers/application_mailer.rb"
-fi
-ynh_replace_string --match_string="$old_domain$old_path" --replace_string="$new_domain$new_path" --target_file="$final_path/live/app/views/user_mailer/welcome.html.erb"
-
 #=================================================
 # Modify Standard Notes - Extensions
 #=================================================
@@ -137,9 +131,17 @@ else
     path=$new_path
 fi
 
-find "$final_path/live/public/extensions/src/" -name "*.json" -print0 | while read -d $'\0' file
+ynh_replace_string \
+	--match_string='url": "https://.*/extensions/src/' \
+	--replace_string='url": "https://'$domain$path'/extensions/src/' \
+	--target_file="$final_path_extensions/repo.json"
+
+find "$final_path_extensions/src/" -name "*.json" -print0 | while read -d $'\0' file
 do
-    ynh_replace_string --match_string='"url": "https://.*/extensions/src/' --replace_string='"url": "https://$domain$path/extensions/src/' --target_file="$file"
+    ynh_replace_string \
+		--match_string='url": "https://.*/extensions/src/' \
+		--replace_string='url": "https://'$domain$path'extensions/src/' \
+		--target_file="$file"
 done
 
 #=================================================
@@ -158,9 +160,9 @@ ynh_add_fail2ban_config --use_template
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message="Starting a systemd service..." --weight=2
+#ynh_script_progression --message="Starting a systemd service..." --weight=2
-
+#
-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
+#ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
 
 #=================================================
 # RELOAD NGINX
@@ -169,13 +171,6 @@ ynh_script_progression --message="Reloading nginx web server..." --weight=1
 
 ynh_systemd_action --service_name=nginx --action=reload
 
-#=================================================
-# WAITING FOR SERVICE
-#=================================================
-ynh_script_progression --message="Waiting for service..."  --weight=1
-
-is_service_ready
-
 #=================================================
 # SEND A README FOR THE ADMIN
 #=================================================
@@ -188,7 +183,7 @@ admin_mail_info="You changed the url of the server. All Extensions have to be re
 
 echo -e "\
 Standard Notes - Syncing Server's url was successfully changed.\n\
-Please configure the Standard Notes web app or mobile app to use this syning server: https://$domain$path_url/\n\
+Please configure the Standard Notes web app or mobile app to use this syncing server: https://$domain$path_url/\n\
 $config_panel\n\n\
 $admin_mail_info\
 " > message

scripts/install

@@ -65,6 +65,15 @@ ynh_app_setting_set --app=$app --key=mail --value=$mail
 redis_db=$(ynh_redis_get_free_db)
 ynh_app_setting_set --app=$app --key=redis_db --value="$redis_db"
 
+#=================================================
+# STORE SETTINGS
+#=================================================
+ynh_app_setting_set --app=$app --key=syncing_server_js_version --value=$syncing_server_js_version
+ynh_app_setting_set --app=$app --key=auth_version --value=$auth_version
+ynh_app_setting_set --app=$app --key=api_gateway_version --value=$api_gateway_version
+ynh_app_setting_set --app=$app --key=extensions_version --value=$extensions_version
+ynh_app_setting_set --app=$app --key=standalone --value="true"
+
 #=================================================
 # STANDARD MODIFICATIONS
 #=================================================
@@ -161,12 +170,11 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Modifying a config file..."  --weight=2
 
-config_syncing_server_js="$final_path/live/syncing-server-js/.env"
+config_syncing_server_js="$final_path/live/syncing-server-js.env"
-config_syncing_server_js_worker="$final_path/live/syncing-server-js-worker/.env"
+config_syncing_server_js_worker="$final_path/live/syncing-server-js-worker.env"
-config_auth="$final_path/live/auth/.env"
+config_auth="$final_path/live/auth.env"
-config_auth_worker="$final_path/live/auth-worker/.env"
+config_auth_worker="$final_path/live/auth-worker.env"
-config_api_gateway="$final_path/live/api-gateway/.env"
+config_api_gateway="$final_path/live/api-gateway.env"
-
 
 jwt_secret=$(ynh_string_random --length=48 | base64)
 legacy_jwt_secret=$(ynh_string_random --length=48 | base64)
@@ -300,11 +308,11 @@ ynh_use_logrotate --logfile="/var/log/$app/api-gateway.log"
 #=================================================
 ynh_script_progression --message="Integrate $app service in Yunohost..."  --weight=1
 
-yunohost service add $app --description="Standard Notes - Syncing Server" --log="/var/log/$app/syncing-server-js.log"
+yunohost service add "$app-syncing-server-js" --description="Standard Notes - Syncing Server" --log="/var/log/$app/syncing-server-js.log"
-yunohost service add $app --description="Standard Notes - Syncing Server - Worker" --log="/var/log/$app/syncing-server-js-worker.log"
+yunohost service add "$app-syncing-server-js-worker" --description="Standard Notes - Syncing Server - Worker" --log="/var/log/$app/syncing-server-js-worker.log"
-yunohost service add $app --description="Standard Notes - Auth" --log="/var/log/$app/auth.log"
+yunohost service add "$app-auth" --description="Standard Notes - Auth" --log="/var/log/$app/auth.log"
-yunohost service add $app --description="Standard Notes - Auth - Worker" --log="/var/log/$app/auth-worker.log"
+yunohost service add "$app-auth-worker" --description="Standard Notes - Auth - Worker" --log="/var/log/$app/auth-worker.log"
-yunohost service add $app --description="Standard Notes - API Gateway" --log="/var/log/$app/api-gateway.log"
+yunohost service add "$app-api-gateway" --description="Standard Notes - API Gateway" --log="/var/log/$app/api-gateway.log"
 
 #=================================================
 # SETUP FAIL2BAN

scripts/remove

@@ -39,7 +39,11 @@ final_path_www=$(ynh_app_setting_get --app=$app --key=final_path_www)
 if ynh_exec_warn_less yunohost service status $app >/dev/null
 then
     ynh_script_progression --message="Removing $app service..."  --weight=1
-    yunohost service remove $app
+    yunohost service remove "$app-syncing-server-js"
+    yunohost service remove "$app-syncing-server-js-worker"
+    yunohost service remove "$app-auth"
+    yunohost service remove "$app-auth-worker"
+    yunohost service remove "$app-api-gateway"
 fi
 
 #=================================================
@@ -76,6 +80,7 @@ ynh_script_progression --message="Removing dependencies..."  --weight=10
 
 # Remove metapackage and its dependencies
 ynh_remove_app_dependencies
+ynh_remove_nodejs
 
 #=================================================
 # REMOVE APP MAIN DIR

scripts/restore

@@ -33,6 +33,7 @@ app=$YNH_APP_INSTANCE_NAME
 domain=$(ynh_app_setting_get --app=$app --key=domain)
 path_url=$(ynh_app_setting_get --app=$app --key=path)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
+final_path_www=$(ynh_app_setting_get --app=$app --key=final_path_www)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 db_user=$db_name
 db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
@@ -40,20 +41,40 @@ db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
 redis_db=$(ynh_redis_get_free_db)
 ynh_app_setting_set --app=$app --key=redis_db --value="$redis_db"
 
-config_file="$final_path/live/.env"
+config_syncing_server_js="$final_path/live/syncing-server-js.env"
+config_syncing_server_js_worker="$final_path/live/syncing-server-js-worker.env"
+config_auth="$final_path/live/auth.env"
+config_auth_worker="$final_path/live/auth-worker.env"
+config_api_gateway="$final_path/live/api-gateway.env"
 
 #=================================================
 # CHECK IF THE APP CAN BE RESTORED
 #=================================================
 ynh_script_progression --message="Validating restoration parameters..." --weight=2
 
-ynh_webpath_available --domain=$domain --path_url=$path_url \
+ynh_webpath_available --domain=$domain --path_url=$path_url || ynh_die --message="Path not available: ${domain}${path_url}"
-    || ynh_die --message="Path not available: ${domain}${path_url}"
+test ! -d $final_path || ynh_die --message="There is already a directory: $final_path "
-test ! -d $final_path \
+test ! -d $final_path_www || ynh_die --message="There is already a directory: $final_path_www "
-    || ynh_die --message="There is already a directory: $final_path "
 
 #=================================================
 # STANDARD RESTORATION STEPS
+#=================================================
+# FIND AND OPEN A PORT
+#=================================================
+ynh_script_progression --message="Finding an available port..."  --weight=1
+
+# Find an available port
+port_syncing_server_js=$(ynh_find_port --port=3000)
+port_syncing_server_js_worker=$(ynh_find_port --port=$((port_syncing_server_js+1)))
+port_auth=$(ynh_find_port --port=$((port_syncing_server_js_worker+1)))
+port_auth_worker=$(ynh_find_port --port=$((port_auth+1)))
+port_api_gateway=$(ynh_find_port --port=$((port_auth_worker+1)))
+ynh_app_setting_set --app=$app --key=port_syncing_server_js --value=$port_syncing_server_js
+ynh_app_setting_set --app=$app --key=port_syncing_server_js_worker --value=$port_syncing_server_js_worker
+ynh_app_setting_set --app=$app --key=port_auth --value=$port_auth
+ynh_app_setting_set --app=$app --key=port_auth_worker --value=$port_auth_worker
+ynh_app_setting_set --app=$app --key=port_api_gateway --value=$port_api_gateway
+
 #=================================================
 # RESTORE THE NGINX CONFIGURATION
 #=================================================
@@ -66,6 +87,7 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 ynh_script_progression --message="Restoring the app main directory..." --weight=1
 
 ynh_restore_file --origin_path="$final_path"
+ynh_restore_file --origin_path="$final_path_www"
 
 #=================================================
 # RECREATE THE DEDICATED USER
@@ -82,12 +104,11 @@ ynh_system_user_create --username=$app --home_dir=$final_path
 # Restore permissions on app files
 chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
-chown -R $app: "$final_path"
+chown -R $app:$app "$final_path"
 
-mkdir -p "$final_path/live/log"
+chmod 750 "$final_path_www"
-chown -R $app: "$final_path/live/log/"
+chmod -R o-rwx "$final_path_www"
-mkdir -p "$final_path/live/tmp"
+chown -R "www-data":"www-data" "$final_path_www"
-chown -R $app: "$final_path/live/tmp/"
 
 mkdir -p "/var/log/$app"
 chown -R $app: "/var/log/$app"
@@ -101,18 +122,8 @@ ynh_script_progression --message="Reinstalling dependencies..." --weight=17
 
 # Define and install dependencies
 ynh_install_app_dependencies $pkg_dependencies
-ynh_install_ruby --ruby_version=$RUBY_VERSION
+ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
-
+ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg"
-#=================================================
-# INSTALLING RUBY
-#=================================================
-ynh_script_progression --message="Installing Ruby...( This may take a while... )" --weight=100 #331
-
-pushd "$final_path/live"
-	ynh_use_ruby
-	ynh_gem update --system --no-document
-	ynh_gem install bundler --no-document
-popd
 
 #=================================================
 # RESTORE THE MYSQL DATABASE
@@ -123,33 +134,91 @@ ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd
 ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql
 
 #=================================================
-# SETUP REDIS DATABASE
+# MODIFY CONFIG
 #=================================================
-ynh_script_progression --message="Setup Redis database..." --weight=2
+ynh_script_progression --message="Modify config files..." --weight=2
+
+# Redis Port
+ynh_replace_string --match_string="^REDIS_URL.*$" --replace_string="REDIS_URL=redis://localhost:6379/$redis_db" --target_file="$config_syncing_server_js"
+ynh_replace_string --match_string="^REDIS_URL.*$" --replace_string="REDIS_URL=redis://localhost:6379/$redis_db" --target_file="$config_syncing_server_js_worker"
+ynh_replace_string --match_string="^REDIS_URL.*$" --replace_string="REDIS_URL=redis://localhost:6379/$redis_db" --target_file="$config_auth"
+ynh_replace_string --match_string="^REDIS_URL.*$" --replace_string="REDIS_URL=redis://localhost:6379/$redis_db" --target_file="$config_auth_worker"
+# Syncing_Server_JS Port
+ynh_replace_string --match_string="^PORT.*$" --replace_string="PORT=$port_syncing_server_js" --target_file="$config_syncing_server_js"
+ynh_replace_string --match_string="^SYNCING_SERVER_URL.*$" --replace_string="SYNCING_SERVER_URL=$port_syncing_server_js" --target_file="$config_auth"
+ynh_replace_string --match_string="^SYNCING_SERVER_URL.*$" --replace_string="SYNCING_SERVER_URL=$port_syncing_server_js" --target_file="$config_auth_worker"
+ynh_replace_string --match_string="^SYNCING_SERVER_URL.*$" --replace_string="SYNCING_SERVER_URL=$port_syncing_server_js" --target_file="$config_api_gateway"
+# Syncing_Server_JS_Worker Port
+ynh_replace_string --match_string="^PORT.*$" --replace_string="PORT=$port_syncing_server_js_worker" --target_file="$config_syncing_server_js_worker"
+# Auth Port
+ynh_replace_string --match_string="^PORT.*$" --replace_string="PORT=$port_auth" --target_file="$config_auth"
+ynh_replace_string --match_string="^AUTH_SERVER_URL.*$" --replace_string="AUTH_SERVER_URL=$port_auth" --target_file="$config_syncing_server_js"
+ynh_replace_string --match_string="^AUTH_SERVER_URL.*$" --replace_string="AUTH_SERVER_URL=$port_auth" --target_file="$config_syncing_server_js_worker"
+ynh_replace_string --match_string="^AUTH_SERVER_URL.*$" --replace_string="AUTH_SERVER_URL=$port_auth" --target_file="$config_api_gateway"
+# Auth_Worker Port
+ynh_replace_string --match_string="^PORT.*$" --replace_string="PORT=$port_auth_worker" --target_file="$config_auth_worker"
+# API-Gateway Port
+ynh_replace_string --match_string="^PORT.*$" --replace_string="PORT=$port_api_gateway" --target_file="$config_api_gateway"
+
 
-ynh_replace_string --match_string=".*REDIS_URL.*$" --replace_string="REDIS_URL=redis://localhost:6379/$redis_db" --target_file="$config_file"
 
 #=================================================
 # RESTORE SYSTEMD
 #=================================================
 ynh_script_progression --message="Restoring the systemd configuration..." --weight=1
 
-ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
+ynh_restore_file --origin_path="/etc/systemd/system/$app-syncing-server-js.service"
-systemctl enable $app.service --quiet
+ynh_restore_file --origin_path="/etc/systemd/system/$app-syncing-server-js-worker.service"
+ynh_restore_file --origin_path="/etc/systemd/system/$app-auth.service"
+ynh_restore_file --origin_path="/etc/systemd/system/$app-auth-worker.service"
+ynh_restore_file --origin_path="/etc/systemd/system/$app-api-gateway.service"
+systemctl enable $app-syncing-server-js.service --quiet
+systemctl enable $app-syncing-server-js-worker.service --quiet
+systemctl enable $app-auth.service --quiet
+systemctl enable $app-auth-worker.service --quiet
+systemctl enable $app-api-gateway.service --quiet
 
 #=================================================
 # INTEGRATE SERVICE IN YUNOHOST
 #=================================================
 ynh_script_progression --message="Integrate $app service in Yunohost..."  --weight=1
 
-yunohost service add $app --description "Standard Notes - Syncing Server" --log "/var/log/$app/$app.log"
+yunohost service add "$app-syncing-server-js" --description="Standard Notes - Syncing Server" --log="/var/log/$app/syncing-server-js.log"
+yunohost service add "$app-syncing-server-js-worker" --description="Standard Notes - Syncing Server - Worker" --log="/var/log/$app/syncing-server-js-worker.log"
+yunohost service add "$app-auth" --description="Standard Notes - Auth" --log="/var/log/$app/auth.log"
+yunohost service add "$app-auth-worker" --description="Standard Notes - Auth - Worker" --log="/var/log/$app/auth-worker.log"
+yunohost service add "$app-api-gateway" --description="Standard Notes - API Gateway" --log="/var/log/$app/api-gateway.log"
 
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --weight=1
 
-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
+ynh_systemd_action \
+	--service_name="$app-syncing-server-js" \
+	--action="start" \
+	--log_path="/var/log/$app/syncing-server-js.log" \
+	--line_match='{"message":"Server started on port '$port_syncing_server_js'","level":"info"}'
+ynh_systemd_action \
+	--service_name="$app-syncing-server-js-worker" \
+	--action="start" \
+	--log_path="/var/log/$app/syncing-server-js-worker.log" \
+	--line_match='{"message":"Starting worker...","level":"info"}'
+ynh_systemd_action \
+	--service_name="$app-auth" \
+	--action="start" \
+	--log_path="/var/log/$app/auth.log" \
+	--line_match='{"message":"Server started on port '$port_auth'","level":"info"}'
+ynh_systemd_action \
+	--service_name="$app-auth-worker" \
+	--action="start" \
+	--log_path="/var/log/$app/auth-worker.log" \
+	--line_match='{"message":"Starting worker...","level":"info"}'
+ynh_systemd_action \
+	--service_name="$app-api-gateway" \
+	--action="start" \
+	--log_path="/var/log/$app/api-gateway.log" \
+	--line_match='{"message":"Server started on port '$port_api_gateway'","level":"info"}'
 
 #=================================================
 # RESTORE THE LOGROTATE CONFIGURATION
@@ -163,7 +232,6 @@ ynh_restore_file --origin_path="/etc/logrotate.d/$app"
 #=================================================
 ynh_script_progression --message="Restoring the fail2ban configuration..." --weight=1
 
-touch "/var/log/$app/$app.log"
 ynh_restore_file "/etc/fail2ban/jail.d/$app.conf"
 ynh_restore_file "/etc/fail2ban/filter.d/$app.conf"
 ynh_systemd_action --action=restart --service_name=fail2ban
@@ -177,13 +245,6 @@ ynh_script_progression --message="Reloading nginx web server..." --weight=2
 
 ynh_systemd_action --service_name=nginx --action=reload
 
-#=================================================
-# WAITING FOR SERVICE
-#=================================================
-ynh_script_progression --message="Waiting for service..."  --weight=1
-
-is_service_ready
-
 #=================================================
 # END OF SCRIPT
 #=================================================

scripts/upgrade

@@ -21,17 +21,44 @@ app=$YNH_APP_INSTANCE_NAME
 
 domain=$(ynh_app_setting_get --app=$app --key=domain)
 path_url=$(ynh_app_setting_get --app=$app --key=path)
+
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
+final_path_www=$(ynh_app_setting_get --app=$app --key=final_path_www)
+final_path_extensions=$(ynh_app_setting_get --app=$app --key=final_path_extensions)
+
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 db_user=$db_name
 db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
-port=$(ynh_app_setting_get --app=$app --key=port)
+
+port_syncing_server_js=$(ynh_app_setting_get --app=$app --key=port_syncing_server_js)
+port_syncing_server_js_worker=$(ynh_app_setting_get --app=$app --key=port_syncing_server_js_worker)
+port_auth=$(ynh_app_setting_get --app=$app --key=port_auth)
+port_auth_worker=$(ynh_app_setting_get --app=$app --key=port_auth_worker)
+port_api_gateway=$(ynh_app_setting_get --app=$app --key=port_api_gateway)
+
 access_domain=$(ynh_app_setting_get --app=$app --key=access_domain)
 access_domain=$(echo $access_domain | sed "s@;@ @g")
 mail=$(ynh_app_setting_get --app=$app --key=mail)
 redis_db=$(ynh_app_setting_get --app=$app --key=redis_db)
 
-config_file="$final_path/live/.env"
+jwt_secret=$(ynh_app_setting_get --app=$app --key=jwt_secret)
+legacy_jwt_secret=$(ynh_app_setting_get --app=$app --key=legacy_jwt_secret)
+auth_jwt_secret=$(ynh_app_setting_get --app=$app --key=auth_jwt_secret)
+pseudo_key_params_key=$(ynh_app_setting_get --app=$app --key=pseudo_key_params_key)
+encryption_server_key=$(ynh_app_setting_get --app=$app --key=encryption_server_key)
+
+syncing_server_js_version_installed=$(ynh_app_setting_get --app=$app --key=syncing_server_js_version)
+auth_version_installed=$(ynh_app_setting_get --app=$app --key=auth_version)
+api_gateway_version_installed=$(ynh_app_setting_get --app=$app --key=api_gateway_version)
+extensions_version_installed=$(ynh_app_setting_get --app=$app --key=extension_version)
+
+config_syncing_server_js="$final_path/live/syncing-server-js.env"
+config_syncing_server_js_worker="$final_path/live/syncing-server-js-worker.env"
+config_auth="$final_path/live/auth.env"
+config_auth_worker="$final_path/live/auth-worker.env"
+config_api_gateway="$final_path/live/api-gateway.env"
+
+standalone=$(ynh_app_setting_get --app=$app --key=standalone)
 
 #=================================================
 # CHECK VERSION
@@ -59,6 +86,39 @@ ynh_clean_setup () {
 # 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
+
+if [[ ! $standalone ]];
+then
+    ynh_remove_systemd_config --service=$app
+else
+    ynh_systemd_action \
+        --service_name="$app-syncing-server-js" \
+        --action="stop" \
+        --log_path="/var/log/$app/syncing-server-js.log"
+    ynh_systemd_action \
+        --service_name="$app-syncing-server-js-worker" \
+        --action="stop" \
+        --log_path="/var/log/$app/syncing-server-js-worker.log"
+    ynh_systemd_action \
+        --service_name="$app-auth" \
+        --action="stop" \
+        --log_path="/var/log/$app/auth.log"
+    ynh_systemd_action \
+        --service_name="$app-auth-worker" \
+        --action="stop" \
+        --log_path="/var/log/$app/auth-worker.log"
+    ynh_systemd_action \
+        --service_name="$app-api-gateway" \
+        --action="stop" \
+        --log_path="/var/log/$app/api-gateway.log"
+fi
+
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY
 #=================================================
@@ -71,18 +131,24 @@ if ynh_legacy_permissions_exists; then
     ynh_app_setting_delete --app=$app --key=is_public
 fi
 
-# If db_name doesn't exist, create it
-if [ -z "$db_name" ]; then
-    db_name=$(ynh_sanitize_dbid --db_name=$app)
-    ynh_app_setting_set --app=$app --key=db_name --value=$db_name
-fi
-
 # If final_path doesn't exist, create it
 if [ -z "$final_path" ]; then
     final_path=/opt/yunohost/$app
     ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 fi
 
+# If final_path doesn't exist, create it
+if [ -z "$final_path_www" ]; then
+    final_path_www=/var/www/$app
+    ynh_app_setting_set --app=$app --key=final_path_www --value=$final_path_www
+fi
+
+# If final_path doesn't exist, create it
+if [ -z "$final_path_extensions" ]; then
+    final_path_extensions=/var/www/$app/extensions
+    ynh_app_setting_set --app=$app --key=final_path_extensions --value=$final_path_extensions
+fi
+
 # If access_domain doesn't exist, create it
 if [ -z "$access_domain" ]; then
     access_domain=$domain
@@ -101,102 +167,159 @@ if [ -z "$redis_db" ]; then
     ynh_app_setting_set --app=$app --key=redis_db --value="$redis_db"
 fi
 
-if ynh_compare_current_package_version --comparison lt --version "3.13.6~ynh4"
+# If port exist, delete it
-then
+if [ -n $(ynh_app_setting_get --app="$app" --key=port) ]; then
-    # Add variables to .env config file
+    ynh_app_setting_delete --app=$app --key=port
-    echo -e "\
-\n# Public file server\
-\n# Empty is disabled\
-\n# Any value is enabled\
-\nRAILS_SERVE_STATIC_FILES=\
-" >> "$config_file"
-
-    # Apply Patch
-    if [ -f "$YNH_CWD/../sources/patches/app-01-add-mail.patch" ]
-    then
-        pushd "$final_path/live"
-            patch --strip=1 < "$YNH_CWD/../sources/patches/app-01-add-mail.patch"
-        popd
-    fi
 fi
 
-if ynh_compare_current_package_version --comparison lt --version "3.20.4~ynh1"
+# If port_syncing_server_js doesn't exist, create it
-then
+if [ -z "$port_syncing_server_js" ]; then
-    # Add variables to .env config file
+    port_syncing_server_js=$(ynh_find_port --port=3000)
-    echo -e "\
+    ynh_app_setting_set --app=$app --key=port_syncing_server_js --value=$port_syncing_server_js
-\n# (Optional) Redis Cache for ephemeral sessions\
-\nREDIS_URL=redis://cache:6379\
-\n\
-\n# (Optional) Change URLs to Internal DNS\
-\n#INTERNAL_DNS_REROUTE_ENABLED=false\
-\n\
-\n# (Optional) Auth Proxy JWT Secret\
-\n#AUTH_JWT_SECRET=changeme123\
-\n\
-\n# (Optional) User Management Server - registration emails, subscriptions etc.\
-\n#USER_MANAGEMENT_SERVER=\
-" >> "$config_file"
-
-    # Change variables to .env config file
-    ynh_replace_string \
-        --match_string="RAILS_LOG_LEVEL=.*$" \
-        --replace_string='# Log Level options: "INFO" | "DEBUG" | "INFO" | "WARN" | "ERROR" | "FATAL"\nRAILS_LOG_LEVEL=INFO' \
-        --target_file="$config_file"
-
-    ynh_replace_string --match_string="REDIS_URL.*$" --replace_string="REDIS_URL=redis://localhost:6379/$redis_db" --target_file="$config_file"
-
 fi
 
-#=================================================
+# If port_syncing_server_js_worker doesn't exist, create it
-# STANDARD UPGRADE STEPS
+if [ -z "$port_syncing_server_js_worker" ]; then
-#=================================================
+    port_syncing_server_js_worker=$(ynh_find_port --port=$((port_syncing_server_js+1)))
-# STOP SYSTEMD SERVICE
+    ynh_app_setting_set --app=$app --key=port_syncing_server_js_worker --value=$port_syncing_server_js_worker
-#=================================================
+fi
-ynh_script_progression --message="Stopping a systemd service..." --weight=1
 
-ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log"
+# If port_auth doesn't exist, create it
+if [ -z "$port_auth" ]; then
+    port_auth=$(ynh_find_port --port=$((port_syncing_server_js_worker+1)))
+    ynh_app_setting_set --app=$app --key=port_auth --value=$port_auth
+fi
+
+# If port_auth_worker doesn't exist, create it
+if [ -z "$port_auth_worker" ]; then
+    port_auth_worker=$(ynh_find_port --port=$((port_auth+1)))
+    ynh_app_setting_set --app=$app --key=port_auth_worker --value=$port_auth_worker
+fi
+
+# If port_api_gateway doesn't exist, create it
+if [ -z "$port_api_gateway" ]; then
+    port_api_gateway=$(ynh_find_port --port=$((port_auth_worker+1)))
+    ynh_app_setting_set --app=$app --key=port_api_gateway --value=$port_api_gateway
+fi
+
+# If jwt_secret doesn't exist, create it
+if [ -z "$jwt_secret" ]; then
+    jwt_secret=$(ynh_string_random --length=48 | base64)
+    ynh_app_setting_set --app=$app --key=jwt_secret --value=$jwt_secret
+fi
+
+# If legacy_jwt_secret doesn't exist, create it
+if [ -z "$legacy_jwt_secret" ]; then
+    legacy_jwt_secret=$(ynh_string_random --length=48 | base64)
+    ynh_app_setting_set --app=$app --key=legacy_jwt_secret --value=$legacy_jwt_secret
+fi
+
+# If auth_jwt_secret doesn't exist, create it
+if [ -z "$auth_jwt_secret" ]; then
+    auth_jwt_secret=$(ynh_string_random --length=48 | base64)
+    ynh_app_setting_set --app=$app --key=auth_jwt_secret --value=$auth_jwt_secret
+fi
+
+# If pseudo_key_params_key doesn't exist, create it
+if [ -z "$pseudo_key_params_key" ]; then
+    pseudo_key_params_key=$(ynh_string_random --length=48 | base64)
+    ynh_app_setting_set --app=$app --key=pseudo_key_params_key --value=$pseudo_key_params_key
+fi
+
+# If encryption_server_key doesn't exist, create it
+if [ -z "$encryption_server_key" ]; then
+    encryption_server_key=$(hexdump -n 32 -e '4/4 "%08X"' /dev/random) # 32bytes hex key is required
+    ynh_app_setting_set --app=$app --key=encryption_server_key --value=$encryption_server_key
+fi
+
+if [[ ! $standalone ]];
+then
+    ynh_remove_ruby
+    ynh_remove_app_dependencies
+fi
+#=================================================
+# CREATE DEDICATED USER
+#=================================================
+ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1
+
+# Create a dedicated user (if not existing)
+ynh_system_user_create --username=$app --home_dir=$final_path
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
 
 ynh_script_progression --message="Upgrading source files..." --weight=1
-if [ "$upgrade_type" == "UPGRADE_APP" ]
+# Remove all files if the old syncing-server is used
+if [[ ! $standalone ]];
+then
+    ynh_secure_remove --file="$final_path/*"
+    ynh_secure_remove --file="/var/log/$app"
+fi
+
+if [[ "$syncing_server_js_version_installed" < "$syncing_server_js_version" ]]
 then
     # Backup files to keep
-    tmpdir=$(mktemp -d)
+    ynh_backup_if_checksum_is_different --file=$config_syncing_server_js
-    if [ -f "$final_path/live/.env" ] ; then
+    ynh_backup_if_checksum_is_different --file=$config_syncing_server_js_worker
-        cp -Rp "$final_path/live/.env" "$tmpdir"
-    fi
-    if [ -d "$final_path/live/log" ] ; then
-        cp -Rp "$final_path/live/log" "$tmpdir"
-    fi
     # Remove destination directory
-    ynh_secure_remove --file="$final_path/live"
+    ynh_secure_remove --file="$final_path/live/syncing_server_js"
+    ynh_secure_remove --file="$final_path/live/syncing_server_js_worker"
+    ynh_secure_remove --file="$config_syncing_server_js"
+    ynh_secure_remove --file="$config_syncing_server_js_worker"
     # Download, check integrity, uncompress and patch the source from app.src
-    mkdir -p "$final_path"
+    mkdir -p "$final_path/live"
-    ynh_setup_source --dest_dir="$final_path/live"
+    ynh_setup_source --source_id=app_syncing-server-js --dest_dir="$final_path/live/syncing-server-js"
-    if [ -f "$tmpdir/.env" ] ; then
+    ynh_setup_source --source_id=app_syncing-server-js --dest_dir="$final_path/live/syncing-server-js-worker"
-        cp -Rp "$tmpdir/.env" "$final_path/live"
 fi
-    if [ -d "$tmpdir/log" ] ; then
+
-        cp -Rp "$tmpdir/log" "$final_path/live"
+if [[ "$auth_version_installed" < "$auth_version" ]]
+then
+    # Backup files to keep
+    ynh_backup_if_checksum_is_different --file=$config_auth
+    ynh_backup_if_checksum_is_different --file=$config_auth_worker
+    # Remove destination directory
+    ynh_secure_remove --file="$final_path/live/auth"
+    ynh_secure_remove --file="$final_path/live/auth_worker"
+    ynh_secure_remove --file="$config_auth"
+    ynh_secure_remove --file="$config_auth_worker"
+    # Download, check integrity, uncompress and patch the source from app.src
+    mkdir -p "$final_path/live"
+    ynh_setup_source --source_id=app_auth --dest_dir="$final_path/live/auth"
+    ynh_setup_source --source_id=app_auth --dest_dir="$final_path/live/auth-worker"
+fi
+
+if [[ "$api_gateway_version_installed" < "$api_gateway_version" ]]
+then
+    # Backup files to keep
+    ynh_backup_if_checksum_is_different --file=$config_api_gateway
+    # Remove destination directory
+    ynh_secure_remove --file="$final_path/live/api_gateway"
+    ynh_secure_remove --file="$config_api_gateway"
+    # Download, check integrity, uncompress and patch the source from app.src
+    mkdir -p "$final_path/live"
+    ynh_setup_source --source_id=app_api_gateway --dest_dir="$final_path/live/api-gateway"
+fi
+
+if [[ "$extensions_version_installed" < "$extensions_version" ]]
+then
+    # Remove destination directory
+    ynh_secure_remove --file="$final_path_extensions"
+    # Download, check integrity, uncompress and patch the source from app.src
+    mkdir -p "$final_path_extensions"
+    if test -e "../sources/extra_files/extensions"
+    then
+        cp -a "../sources/extra_files/extensions/." "$final_path_extensions"
     fi
 fi
 
-if [ "$upgrade_type" == "UPGRADE_PACKAGE" ]
+chmod 750 "$final_path"
-then
+chmod -R o-rwx "$final_path"
-    ynh_secure_remove --file="$final_path/live/public/extensions"
+chown -R $app:$app "$final_path"
-fi
 
-if [[ ! -d "$final_path/live/public/extensions/" || \
+chmod 750 "$final_path_www"
-      ! -d "$final_path/live/public/extensions/src/" ]]
+chmod -R o-rwx "$final_path_www"
-then
+chown -R "www-data":"www-data" "$final_path_www"
-    if test -e "../sources/extra_files/app"
-    then
-        cp -a "../sources/extra_files/app/." "$final_path/live"
-    fi
-fi
 
 #=================================================
 # NGINX CONFIGURATION
@@ -212,26 +335,9 @@ ynh_add_nginx_config
 ynh_script_progression --message="Upgrading dependencies..." --weight=1
 
 ynh_install_app_dependencies $pkg_dependencies
-ynh_install_ruby --ruby_version=$RUBY_VERSION
+ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
+ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg"
 
-#=================================================
-# INSTALL RUBY
-#=================================================
-ynh_script_progression --message="Installing Ruby...( This may take a while... )" --weight=100 #331
-
-pushd "$final_path/live"
-	ynh_use_ruby
-	ynh_gem update --system --no-document
-	ynh_gem install bundler --no-document
-popd
-
-#=================================================
-# CREATE DEDICATED USER
-#=================================================
-ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1
-
-# Create a dedicated user (if not existing)
-ynh_system_user_create --username=$app --home_dir=$final_path
 
 #=================================================
 # SPECIFIC UPGRADE
@@ -239,23 +345,13 @@ ynh_system_user_create --username=$app --home_dir=$final_path
 #=================================================
 # MODIFY A CONFIG FILE
 #=================================================
-config_file="$final_path/live/.env"
+ynh_script_progression --message="Modify a config file..."  --weight=2
-ynh_script_progression --message="Modifying a config file..."  --weight=2
 
-if ynh_compare_current_package_version --comparison lt --version "3.13.6~ynh4"
+ynh_add_config --template="env_syncing-server-js.env.sample" --destination="$config_syncing_server_js"
-then
+ynh_add_config --template="env_syncing-server-js-worker.env.sample" --destination="$config_syncing_server_js_worker"
-    ynh_replace_string --match_string="SMTP_HOST=.*$" --replace_string="SMTP_HOST=localhost" --target_file="$config_file"
+ynh_add_config --template="env_auth.env.sample" --destination="$config_auth"
-    ynh_replace_string --match_string="SMTP_PORT=.*$" --replace_string="SMTP_PORT=25" --target_file="$config_file"
+ynh_add_config --template="env_auth-worker.env.sample" --destination="$config_auth_worker"
-    ynh_replace_string --match_string="SMTP_USERNAME=.*$" --replace_string="#&" --target_file="$config_file"
+ynh_add_config --template="env_api-gateway.env.sample" --destination="$config_api_gateway"
-    ynh_replace_string --match_string="SMTP_PASSWORD=.*$" --replace_string="#&" --target_file="$config_file"
-    ynh_replace_string --match_string="SMTP_DOMAIN=.*$" --replace_string="SMTP_DOMAIN=localhost" --target_file="$config_file"
-    ynh_replace_string --match_string="SMTP_DOMAIN=.*$" --replace_string="&\n# Enable STARTTLS\n# Empty is disabled\n# Any value is enabled\nSMTP_STARTTLS=" --target_file="$config_file"
-    ynh_replace_string --match_string="RAILS_SERVE_STATIC_FILES=.*$" --replace_string="RAILS_SERVE_STATIC_FILES=true" --target_file="$config_file"
-fi
-
-ynh_replace_string --match_string="__MAIL__" --replace_string="$mail" --target_file="$final_path/live/app/mailers/application_mailer.rb"
-ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$final_path/live/app/views/user_mailer/welcome.html.erb"
-ynh_replace_string --match_string="__PATH__" --replace_string="$path_url" --target_file="$final_path/live/app/views/user_mailer/welcome.html.erb"
 
 #=================================================
 # INSTALLING Standard Notes - Syncing Server
@@ -263,22 +359,46 @@ ynh_replace_string --match_string="__PATH__" --replace_string="$path_url" --targ
 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
     ynh_script_progression --message="Installing Standard Notes - Syncing Server..."  --weight=93
-
+    ynh_use_nodejs
-    chown -R $app: "$final_path"
+    if [[ "$syncing_server_js_version_installed" < "$syncing_server_js_version" ]]
-
+    then
-    pushd "$final_path/live"
+        pushd "$final_path/live/syncing-server-js"
-        ynh_exec_as $app $ynh_ruby_load_path bin/bundle config set --local path 'vendor/bundle'
+            ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn install --pure-lockfile
-        ynh_exec_as $app $ynh_ruby_load_path bin/bundle config set with 'development'
+            ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn build
-        ynh_exec_as $app $ynh_ruby_load_path bin/bundle install -j$(getconf _NPROCESSORS_ONLN)
-        ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path bin/bundle exec rails db:migrate --quiet
-        ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path bin/bundle exec rails db:seed --quiet
-#        ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path bin/bundle exec rails assets:precompile --quiet
         popd
+        pushd "$final_path/live/syncing-server-js-worker"
+            ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn install --pure-lockfile
+            ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn build
+        popd
+        ynh_app_setting_set --app=$app --key=syncing_server_js_version --value=$syncing_server_js_version
+    fi
+    if [[ "$auth_version_installed" < "$auth_version" ]]
+    then
+        pushd "$final_path/live/auth"
+            ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn install --pure-lockfile
+            ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn build
+        popd
+        pushd "$final_path/live/auth-worker"
+            ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn install --pure-lockfile
+            ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn build
+        popd
+        ynh_app_setting_set --app=$app --key=auth_version --value=$auth_version
+    fi
+    if [[ "$api_gateway_version_installed" < "$api_gateway_version" ]]
+    then
+        pushd "$final_path/live/api-gateway"
+            ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn install --pure-lockfile
+            ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn build
+        popd
+        ynh_app_setting_set --app=$app --key=api_gateway_version --value=$api_gateway_version
+    fi
 fi
 
 #=================================================
 # INSTALLING Standard Notes - Extensions
 #=================================================
+if [[ "$extensions_version_installed" < "$extensions_version" ]]
+then
     ynh_script_progression --message="Installing Standard Notes - Extensions..."  --weight=1
 
     if [ $path_url = "/" ]
@@ -288,18 +408,14 @@ else
         path=$path_url
     fi
 
-ynh_replace_string --match_string="__DOMAIN__PATH__" --replace_string="$domain$path" --target_file="$final_path/live/public/extensions/repo.json"
+    ynh_replace_string --match_string="__DOMAIN__PATH__" --replace_string="$domain$path" --target_file="$final_path_extensions/repo.json"
 
-find "$final_path/live/public/extensions/src/" -name "*.json" -print0 | while read -d $'\0' file
+    find "$final_path_extensions/src/" -name "*.json" -print0 | while read -d $'\0' file
     do
         ynh_replace_string --match_string="__DOMAIN__PATH__" --replace_string="$domain$path" --target_file="$file"
     done
-
+    ynh_app_setting_set --app=$app --key=extensions_version --value=$extensions_version
-find "../conf/" -name "ext_*.src" -print0 | while read -d $'\0' file
+fi
-do
-    basename=$(basename -as .src $file)
-    ynh_setup_source  --dest_dir="$final_path/live/public/extensions/src/${basename#'ext_'}" --source_id="$basename"
-done
 
 #=================================================
 # SETUP SYSTEMD
@@ -307,59 +423,52 @@ done
 ynh_script_progression --message="Upgrading systemd configuration..." --weight=1
 
 # Create a dedicated systemd config
-ynh_add_systemd_config
+ynh_add_systemd_config --service="$app-syncing-server-js" --template="systemd_syncing-server-js.service"
+ynh_add_systemd_config --service="$app-syncing-server-js-worker" --template="systemd_syncing-server-js-worker.service"
+ynh_add_systemd_config --service="$app-auth" --template="systemd_auth.service"
+ynh_add_systemd_config --service="$app-auth-worker" --template="systemd_auth-worker.service"
+ynh_add_systemd_config --service="$app-api-gateway" --template="systemd_api-gateway.service"
 
 #=================================================
 # STORE THE CONFIG FILE CHECKSUM
 #=================================================
 
 # Calculate and store the config file checksum into the app settings
-ynh_store_file_checksum --file="$config_file"
+ynh_store_file_checksum --file="$config_syncing_server_js"
+ynh_store_file_checksum --file="$config_syncing_server_js_worker"
+ynh_store_file_checksum --file="$config_auth"
+ynh_store_file_checksum --file="$config_auth_worker"
+ynh_store_file_checksum --file="$config_api_gateway"
 ynh_store_file_checksum --file="/etc/nginx/conf.d/$domain.d/$app.conf"
 
 #=================================================
 # GENERIC FINALIZATION
 #=================================================
-#=================================================
-# SECURE FILES AND DIRECTORIES
-#=================================================
-
-# Set permissions to app files
-chmod 750 "$final_path"
-chmod -R o-rwx "$final_path"
-chown -R $app: "$final_path"
-
-mkdir -p "$final_path/live/log"
-chown -R $app: "$final_path/live/log/"
-mkdir -p "$final_path/live/tmp"
-chown -R $app: "$final_path/live/tmp/"
-
-mkdir -p "/var/log/$app"
-chown -R $app: "/var/log/$app"
-
 #=================================================
 # SETUP LOGROTATE
 #=================================================
 ynh_script_progression --message="Upgrading logrotate configuration..." --weight=1
 
+mkdir -p "/var/log/$app"
+chown -R "$app": "/var/log/$app"
+
 # Use logrotate to manage application logfile(s)
-ynh_use_logrotate --logfile="$final_path/live/log/production.log"
+ynh_use_logrotate --logfile="/var/log/$app/syncing-server.log"
-ynh_use_logrotate --logfile="/var/log/$app/$app.log"
+ynh_use_logrotate --logfile="/var/log/$app/syncing-server-worker.log"
+ynh_use_logrotate --logfile="/var/log/$app/auth.log"
+ynh_use_logrotate --logfile="/var/log/$app/auth-worker.log"
+ynh_use_logrotate --logfile="/var/log/$app/api-gateway.log"
 
 #=================================================
 # INTEGRATE SERVICE IN YUNOHOST
 #=================================================
+ynh_script_progression --message="Integrate $app service in Yunohost..."  --weight=1
 
-yunohost service add $app --description "Standard Notes - Syncing Server" --log "/var/log/$app/$app.log"
+yunohost service add "$app-syncing-server-js" --description="Standard Notes - Syncing Server" --log="/var/log/$app/syncing-server-js.log"
-
+yunohost service add "$app-syncing-server-js-worker" --description="Standard Notes - Syncing Server - Worker" --log="/var/log/$app/syncing-server-js-worker.log"
-#=================================================
+yunohost service add "$app-auth" --description="Standard Notes - Auth" --log="/var/log/$app/auth.log"
-# SETUP FAIL2BAN
+yunohost service add "$app-auth-worker" --description="Standard Notes - Auth - Worker" --log="/var/log/$app/auth-worker.log"
-#=================================================
+yunohost service add "$app-api-gateway" --description="Standard Notes - API Gateway" --log="/var/log/$app/api-gateway.log"
-ynh_script_progression --message="Reconfiguring fail2ban..." --weight=1
-
-# Create a dedicated fail2ban config
-touch "/var/log/$app/$app.log"
-ynh_add_fail2ban_config --use_template
 
 #=================================================
 # START SYSTEMD SERVICE
@@ -367,7 +476,39 @@ ynh_add_fail2ban_config --use_template
 ynh_script_progression --message="Starting a systemd service..." --weight=1
 
 # Start a systemd service
-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
+ynh_systemd_action \
+    --service_name="$app-syncing-server-js" \
+    --action="start" \
+    --log_path="/var/log/$app/syncing-server-js.log" \
+    --line_match='{"message":"Server started on port '$port_syncing_server_js'","level":"info"}'
+ynh_systemd_action \
+    --service_name="$app-syncing-server-js-worker" \
+    --action="start" \
+    --log_path="/var/log/$app/syncing-server-js-worker.log" \
+    --line_match='{"message":"Starting worker...","level":"info"}'
+ynh_systemd_action \
+    --service_name="$app-auth" \
+    --action="start" \
+    --log_path="/var/log/$app/auth.log" \
+    --line_match='{"message":"Server started on port '$port_auth'","level":"info"}'
+ynh_systemd_action \
+    --service_name="$app-auth-worker" \
+    --action="start" \
+    --log_path="/var/log/$app/auth-worker.log" \
+    --line_match='{"message":"Starting worker...","level":"info"}'
+ynh_systemd_action \
+    --service_name="$app-api-gateway" \
+    --action="start" \
+    --log_path="/var/log/$app/api-gateway.log" \
+    --line_match='{"message":"Server started on port '$port_api_gateway'","level":"info"}'
+
+#=================================================
+# SETUP FAIL2BAN
+#=================================================
+ynh_script_progression --message="Reconfiguring fail2ban..." --weight=1
+
+# Create a dedicated fail2ban config
+ynh_add_fail2ban_config --use_template
 
 #=================================================
 # RELOAD NGINX
@@ -376,13 +517,6 @@ ynh_script_progression --message="Reloading nginx web server..." --weight=1
 
 ynh_systemd_action --service_name=nginx --action=reload
 
-#=================================================
-# WAITING FOR SERVICE
-#=================================================
-ynh_script_progression --message="Waiting for service..."  --weight=1
-
-is_service_ready
-
 #=================================================
 # SEND A README FOR THE ADMIN
 #=================================================
@@ -408,6 +542,11 @@ $admin_mail_info\
 
 ynh_send_readme_to_admin --app_message="message" --type='upgrade'
 
+#=================================================
+# STORE SETTINGS
+#=================================================
+ynh_app_setting_set --app=$app --key=standalone --value="true"
+
 #=================================================
 # END OF SCRIPT
 #=================================================