From fb93b9c7588a8e95d8b44e1dcc541348c617bc93 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>
Date: Wed, 13 Sep 2017 21:39:29 +0200
Subject: [PATCH] Fix nginx file, manifest and app.src

---
 conf/app.src    |  2 +-
 conf/nginx.conf | 22 ++++++++++------------
 manifest.json   | 11 +++++------
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/conf/app.src b/conf/app.src
index c2ad4dc..729f27c 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,6 +1,6 @@
 SOURCE_URL=https://dl.cihar.com/weblate/Weblate-2.16.tar.xz
 SOURCE_SUM=0cd67d3eef8fb414c55d9447a361feb9718e39460c85de51fc0c636838625c70
-SOURCE_SUM_PRG=sha256
+SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.xz
 SOURCE_IN_SUBDIR=true
 SOURCE_FILENAME=Weblate-2.16.tar.xz
diff --git a/conf/nginx.conf b/conf/nginx.conf
index fe8bcb8..a7f18bf 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -3,38 +3,36 @@ location __PATH__ {
 	# Path to source
 	alias __FINALPATH__/ ;
 
-	location /favicon.ico {
+	location __PATH__/favicon.ico {
 		# DATA_DIR/static/favicon.ico
 		alias __FINALPATH__/static/favicon.ico;
 		expires 30d;
 	}
 
-	location /robots.txt {
+	location __PATH__/robots.txt {
 		# DATA_DIR/static/robots.txt
 		alias __FINALPATH__/static/robots.txt;
 		expires 30d;
 	}
 
-	location /static {
+	location __PATH__/static {
 		# DATA_DIR/static/
 		alias __FINALPATH__/static/;
 		expires 30d;
 	}
 
-	location /media {
+	location __PATH__/media {
 		# DATA_DIR/media/
 		alias __FINALPATH__/media/;
 		expires 30d;
 	}
 
-	location / {
-		include uwsgi_params;
-		# Needed for long running operations in admin interface
-		uwsgi_read_timeout 3600;
-		# Adjust based to uwsgi configuration:
-		uwsgi_pass unix:///run/uwsgi/app/weblate/socket;
-		# uwsgi_pass 127.0.0.1:8080;
-	}
+	include uwsgi_params;
+	# Needed for long running operations in admin interface
+	uwsgi_read_timeout 3600;
+	# Adjust based to uwsgi configuration:
+	uwsgi_pass unix:///opt/__APP__/uwsgi.sock
+	# uwsgi_pass 127.0.0.1:8080;
 
 	# Include SSOWAT user panel.
 	include conf.d/yunohost_panel.conf.inc;
diff --git a/manifest.json b/manifest.json
index 53a6312..ef27c50 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
 		"yunohost": ">= 2.7.0"
 	},
 	"description": {
-		"en": "Instant messaging server who use matrix"
+		"en": "A translation platform using Git and Python"
 	},
 	"version": "2.16.0",
 	"url": "https://weblate.org",
@@ -25,7 +25,7 @@
 				"name": "domain",
 				"type": "domain",
 				"ask": {
-					"en": "Choose a domain:"
+					"en": "Choose a domain for Weblate:"
 				},
 				"example": "domain.org"
 			},
@@ -42,7 +42,7 @@
 				"name": "is_public",
 				"type": "boolean",
 				"ask": {
-					"en": "Is it a public server ?"
+					"en": "Should Weblate be public accessible?"
 				},
 				"default": "0"
 			},
@@ -50,11 +50,10 @@
 				"name": "admin",
 				"type": "user",
 				"ask": {
-				    "en": "Choose an admin user"
+				    "en": "Choose an admin user for Weblate"
 				},
 				"example": "simon"
-			},
-
+			}
 		]
 	}
 }