Merge pull request #66 from YunoHost-Apps/dev

Fixed cors headers for data

README.md

@@ -32,7 +32,7 @@ This Yunohost app installs the server part (services + mongo database) needed to
 - As well any documents or images uploaded by users will be backed up
 
 
-**Shipped version:** 0.3.2~ynh1
+**Shipped version:** 0.3.2~ynh2
 
 **Demo:** <https://dont-code.net/apps.html>
 

README_es.md

@@ -32,7 +32,7 @@ This Yunohost app installs the server part (services + mongo database) needed to
 - As well any documents or images uploaded by users will be backed up
 
 
-**Versión actual:** 0.3.2~ynh1
+**Versión actual:** 0.3.2~ynh2
 
 **Demo:** <https://dont-code.net/apps.html>
 

README_eu.md

@@ -32,7 +32,7 @@ This Yunohost app installs the server part (services + mongo database) needed to
 - As well any documents or images uploaded by users will be backed up
 
 
-**Paketatutako bertsioa:** 0.3.2~ynh1
+**Paketatutako bertsioa:** 0.3.2~ynh2
 
 **Demoa:** <https://dont-code.net/apps.html>
 

README_fr.md

@@ -32,7 +32,7 @@ This Yunohost app installs the server part (services + mongo database) needed to
 - As well any documents or images uploaded by users will be backed up
 
 
-**Version incluse :** 0.3.2~ynh1
+**Version incluse :** 0.3.2~ynh2
 
 **Démo :** <https://dont-code.net/apps.html>
 

README_gl.md

@@ -32,7 +32,7 @@ This Yunohost app installs the server part (services + mongo database) needed to
 - As well any documents or images uploaded by users will be backed up
 
 
-**Versión proporcionada:** 0.3.2~ynh1
+**Versión proporcionada:** 0.3.2~ynh2
 
 **Demo:** <https://dont-code.net/apps.html>
 

README_zh_Hans.md

@@ -32,7 +32,7 @@ This Yunohost app installs the server part (services + mongo database) needed to
 - As well any documents or images uploaded by users will be backed up
 
 
-**分发版本：** 0.3.2~ynh1
+**分发版本：** 0.3.2~ynh2
 
 **演示：** <https://dont-code.net/apps.html>
 

conf/nginx.conf

@@ -8,6 +8,7 @@ location __PATH__/ {
         # Handling preflight requests
     if ($request_method = OPTIONS) {
         more_set_headers 'Access-Control-Allow-Methods: *' 'Access-Control-Allow-Headers: *';
+        return 200;
     }
 
   # Path to source
@@ -37,6 +38,10 @@ location __PATH__/ {
     }
 
     location __PATH__/project  {
+        if ($request_method = OPTIONS) {
+            more_set_headers 'Access-Control-Allow-Methods: *' 'Access-Control-Allow-Headers: *';
+            return 200;
+        }
         proxy_pass http://localhost:__PORT_PROJECT__/project;
         proxy_set_header Host $host;
         proxy_read_timeout 86400s;
@@ -44,6 +49,10 @@ location __PATH__/ {
         }
 
     location __PATH__/data  {
+        if ($request_method = OPTIONS) {
+            more_set_headers 'Access-Control-Allow-Methods: *' 'Access-Control-Allow-Headers: *';
+            return 200;
+        }
         proxy_pass http://localhost:__PORT_DATA__/data;
         proxy_set_header Host $host;
         proxy_read_timeout 86400s;
@@ -51,6 +60,10 @@ location __PATH__/ {
        }
 
     location __PATH__/documents  {
+        if ($request_method = OPTIONS) {
+            more_set_headers 'Access-Control-Allow-Methods: *' 'Access-Control-Allow-Headers: *';
+            return 200;
+        }
         proxy_pass http://localhost:__PORT_DATA__/documents;
         proxy_set_header Host $host;
         proxy_read_timeout 86400s;

manifest.toml

@@ -7,7 +7,7 @@ name = "Dont-code Services"
 description.en = "Install services and databases needed to support Dont-code platform"
 description.fr = "Installe les services et base de données nécessaires pour utiliser la plateforme Dont-code"
 
-version = "0.3.2~ynh1"
+version = "0.3.2~ynh2"
 
 maintainers = ["Dont-code Team"]
 
@@ -20,7 +20,7 @@ userdoc = "https://dont-code.net/news.html"
 code = "https://github.com/dont-code"
 
 [integration]
-yunohost = ">= 11.0.0"
+yunohost = ">= 11.1.9"
 architectures = "all"
 multi_instance = true
 ldap = false

scripts/ynh_mongo_db__2

@@ -314,6 +314,7 @@ ynh_install_mongo() {
 
 	ynh_print_info --message="Installing MongoDB Community Edition ..."
 	local mongo_debian_release=$(ynh_get_debian_release)
+	local mongo_packages="mongodb-org"
 
 	if [[ $(cat /proc/cpuinfo) != *"avx"* && "$mongo_version" != "4.4" ]]; then
 		#Sadly mongo 4.4 is the only version not requiring avx instruction set, so we will install it
@@ -321,7 +322,13 @@ ynh_install_mongo() {
 		mongo_version="4.4"
 	fi
 
-	ynh_install_extra_app_dependencies --repo="deb http://repo.mongodb.org/apt/debian $mongo_debian_release/mongodb-org/$mongo_version main" --package="mongodb-org" --key="https://www.mongodb.org/static/pgp/server-$mongo_version.asc"
+	if [[ "$mongo_version" == "4.4" ]]; then
+    	ynh_print_warn --message="Switching to buster package install for Mongo 4.4."
+    	mongo_debian_release=buster
+    	mongo_packages="mongodb-org-server mongodb-database-tools mongodb-mongosh-shared-openssl11"
+  	fi
+
+	ynh_install_extra_app_dependencies --repo="deb http://repo.mongodb.org/apt/debian $mongo_debian_release/mongodb-org/$mongo_version main" --package="$mongo_packages" --key="https://www.mongodb.org/static/pgp/server-$mongo_version.asc"
   	mongodb_servicename=mongod
 
 	# Make sure MongoDB is started and enabled