Merge pull request #32 from YunoHost-Apps/testing

3.8.25~ynh2

README.md

@@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 The Standard Notes Web App. An end-to-end encrypted note-taking app. Web, Mac, Windows, Linux, iOS, and Android.
 
-**Shipped version:** 3.8.25~ynh1
+**Shipped version:** 3.8.25~ynh2
 
 **Demo:** https://standardnotes.org/demo
 
@@ -27,17 +27,16 @@ The Standard Notes Web App. An end-to-end encrypted note-taking app. Web, Mac, W
 
 ## Disclaimers / important information
 
-* Any known limitations, constrains or stuff not working, such as (but not limited to):
+* No single-sign on or LDAP integration
-    * No single-sign on or LDAP integration
+* The app requires up 1500MB of RAM to install
-    * The app requires up 1500MB of RAM to install
+* The app requires at least 80MB of RAM to work properly.
-    * The app requires at least 80MB of RAM to work properly.
+* The app requires around 1000MB of disk.
-    * The app requires around 1000MB of disk.
-    * A dedicated domain is requierd if you want to use extensions.
-        * notes.your-domain.tld/ -> Extension Manager is working
-        * your-domain.tld/notes/ -> Extension Manager is not working
 
-* Other infos that people should be aware of, such as:
+* A dedicated domain is requierd if you want to use extensions.
-    * The config-file is stored under "/opt/yunohost/$app/live/.env"
+    * notes.your-domain.tld/ -> Extension Manager is working
+    * your-domain.tld/notes/ -> Extension Manager is not working
+
+* The config-file is stored under "/opt/yunohost/$app/live/.env"
 
 ## Documentation and resources
 

README_fr.md

@@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 
 
-**Version incluse :** 3.8.25~ynh1
+**Version incluse :** 3.8.25~ynh2
 
 **Démo :** https://standardnotes.org/demo
 
@@ -23,17 +23,16 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 ## Avertissements / informations importantes
 
-* Any known limitations, constrains or stuff not working, such as (but not limited to):
+* No single-sign on or LDAP integration
-    * No single-sign on or LDAP integration
+* The app requires up 1500MB of RAM to install
-    * The app requires up 1500MB of RAM to install
+* The app requires at least 80MB of RAM to work properly.
-    * The app requires at least 80MB of RAM to work properly.
+* The app requires around 1000MB of disk.
-    * The app requires around 1000MB of disk.
-    * A dedicated domain is requierd if you want to use extensions.
-        * notes.your-domain.tld/ -> Extension Manager is working
-        * your-domain.tld/notes/ -> Extension Manager is not working
 
-* Other infos that people should be aware of, such as:
+* A dedicated domain is requierd if you want to use extensions.
-    * The config-file is stored under "/opt/yunohost/$app/live/.env"
+    * notes.your-domain.tld/ -> Extension Manager is working
+    * your-domain.tld/notes/ -> Extension Manager is not working
+
+* The config-file is stored under "/opt/yunohost/$app/live/.env"
 
 ## Documentations et ressources
 

check_process

@@ -11,10 +11,8 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
-		# 3.8.21~ynh1
+		# 3.8.25~ynh1
-		upgrade=1 from_commit=5df29231f1fb18e7ce49949fdcf7c9275ce19ffc
+		upgrade=1 from_commit=e513a1b7cf3977272abefbaac6a32cfac596858d
-		# 3.6.8~ynh2
-		upgrade=1 from_commit=89de808ffc824be93a4394abcf45219f9376dfa5
 		backup_restore=1
 		multi_instance=1
 		port_already_use=0
@@ -23,6 +21,6 @@
 Email=
 Notification=none
 ;;; Upgrade options
-	; commit=5df29231f1fb18e7ce49949fdcf7c9275ce19ffc
+	; commit=e513a1b7cf3977272abefbaac6a32cfac596858d
-		name=3.8.21~ynh1
+		name=3.8.25~ynh1
 		manifest_arg=domain=DOMAIN&is_public=1

conf/nginx.conf

@@ -3,11 +3,6 @@ location __PATH__/ {
   # Path to source
   alias __FINALPATH__/live/public ;
 
-  # Force usage of https
-  if ($scheme = http) {
-    rewrite ^ https://$server_name$request_uri? permanent;
-  }
-
   # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file
   client_max_body_size 25M;
 

doc/DISCLAIMER.md

@@ -1,11 +1,10 @@
-* Any known limitations, constrains or stuff not working, such as (but not limited to):
+* No single-sign on or LDAP integration
-    * No single-sign on or LDAP integration
+* The app requires up 1500MB of RAM to install
-    * The app requires up 1500MB of RAM to install
+* The app requires at least 80MB of RAM to work properly.
-    * The app requires at least 80MB of RAM to work properly.
+* The app requires around 1000MB of disk.
-    * The app requires around 1000MB of disk.
-    * A dedicated domain is requierd if you want to use extensions.
-        * notes.your-domain.tld/ -> Extension Manager is working
-        * your-domain.tld/notes/ -> Extension Manager is not working
 
-* Other infos that people should be aware of, such as:
+* A dedicated domain is requierd if you want to use extensions.
-    * The config-file is stored under "/opt/yunohost/$app/live/.env"
+    * notes.your-domain.tld/ -> Extension Manager is working
+    * your-domain.tld/notes/ -> Extension Manager is not working
+
+* The config-file is stored under "/opt/yunohost/$app/live/.env"

manifest.json

@@ -5,7 +5,7 @@
     "description": {
         "en": "The Standard Notes Web App. An end-to-end encrypted note-taking app. Web, Mac, Windows, Linux, iOS, and Android."
     },
-    "version": "3.8.25~ynh1",
+    "version": "3.8.25~ynh2",
     "url": "https://github.com/standardnotes/web",
     "upstream": {
         "license": "AGPL-3.0-or-later",
@@ -31,8 +31,7 @@
         "install": [
             {
                 "name": "domain",
-                "type": "domain",
+                "type": "domain"
-                "example": "example.com"
             },
             {
                 "name": "path",

scripts/_common.sh

@@ -19,6 +19,8 @@ NODEJS_VERSION="15.11.0"
 SOURCE="https://github.com/standardnotes/web"
 COMMIT="e856ce7bfd3a7b357544e43ca343b1ec861debb3"
 
+node_max_old_space_size=2048
+
 #=================================================
 # PERSONAL HELPERS
 #=================================================

scripts/install

@@ -161,10 +161,10 @@ pushd "$final_path/live"
     ynh_use_nodejs
     ynh_exec_as $app $ynh_ruby_load_path bin/bundle config set --local path 'vendor/bundle'
     ynh_exec_as $app $ynh_ruby_load_path bin/bundle config set with 'development'
-    ynh_exec_warn_less "ynh_exec_as $app $ynh_ruby_load_path bin/bundle install -j$(getconf _NPROCESSORS_ONLN) --quiet"
+    ynh_exec_warn_less ynh_exec_as $app $ynh_ruby_load_path bin/bundle install -j$(getconf _NPROCESSORS_ONLN) --quiet
-    ynh_exec_warn_less "ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn install --pure-lockfile"
+    ynh_exec_warn_less ynh_exec_as $app env NODE_OPTIONS="--max-old-space-size=$node_max_old_space_size" PATH=$ynh_node_load_PATH yarn install --pure-lockfile
-    ynh_exec_warn_less "ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn bundle"
+    ynh_exec_warn_less ynh_exec_as $app env NODE_OPTIONS="--max-old-space-size=$node_max_old_space_size" PATH=$ynh_node_load_PATH yarn bundle
-    ynh_exec_warn_less "ynh_exec_as $app $ynh_ruby_load_path bin/bundle exec rails assets:precompile --quiet"
+    ynh_exec_warn_less ynh_exec_as $app $ynh_ruby_load_path bin/bundle exec rails assets:precompile --quiet
 popd
 
 #=================================================

scripts/restore

@@ -37,8 +37,6 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 #=================================================
 ynh_script_progression --message="Validating restoration parameters..." --weight=1
 
-ynh_webpath_available --domain=$domain --path_url=$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 "
 

scripts/upgrade

@@ -181,10 +181,10 @@ then
 		ynh_use_nodejs
 		ynh_exec_as $app $ynh_ruby_load_path bin/bundle config set --local path 'vendor/bundle'
 		ynh_exec_as $app $ynh_ruby_load_path bin/bundle config set with 'development'
-		ynh_exec_warn_less "ynh_exec_as $app $ynh_ruby_load_path bin/bundle install -j$(getconf _NPROCESSORS_ONLN) --quiet"
+		ynh_exec_warn_less ynh_exec_as $app $ynh_ruby_load_path bin/bundle install -j$(getconf _NPROCESSORS_ONLN) --quiet
-		ynh_exec_warn_less "ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn install --pure-lockfile"
+		ynh_exec_warn_less ynh_exec_as $app env NODE_OPTIONS="--max-old-space-size=$node_max_old_space_size" PATH=$ynh_node_load_PATH yarn install --pure-lockfile
-		ynh_exec_warn_less "ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn bundle"
+		ynh_exec_warn_less ynh_exec_as $app env NODE_OPTIONS="--max-old-space-size=$node_max_old_space_size" PATH=$ynh_node_load_PATH yarn bundle
-		ynh_exec_warn_less "ynh_exec_as $app $ynh_ruby_load_path bin/bundle exec rails assets:precompile --quiet"
+		ynh_exec_warn_less ynh_exec_as $app $ynh_ruby_load_path bin/bundle exec rails assets:precompile --quiet
 	popd
 fi