From d97a1d99befb0d28881eacc05037dae58dcb4caf Mon Sep 17 00:00:00 2001 From: Julien Malik Date: Tue, 11 Mar 2014 15:01:01 +0100 Subject: [PATCH 1/6] Save is_public setting --- scripts/install | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install b/scripts/install index 5b67f28..4418973 100755 --- a/scripts/install +++ b/scripts/install @@ -31,6 +31,7 @@ sed -i "s@YNH_WWW_PATH@$path@g" ../conf/nginx.conf sed -i "s@YNH_WWW_ALIAS@$final_path/@g" ../conf/nginx.conf sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/zerobin.conf +sudo yunohost app setting zerobin is_public -v "$is_public" if [ $is_public = "Yes" ]; then sudo yunohost app setting zerobin skipped_uris -v "/" From 4ea3515fbbf3ec990fc082b1596d78eacd05a149 Mon Sep 17 00:00:00 2001 From: Julien Malik Date: Tue, 11 Mar 2014 15:02:21 +0100 Subject: [PATCH 2/6] Fix permission on nginx conf --- scripts/install | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 4418973..1be8b28 100755 --- a/scripts/install +++ b/scripts/install @@ -28,8 +28,11 @@ sudo chmod 700 $final_path/{data,tmp} # Modify Nginx configuration file and copy it to Nginx conf directory sed -i "s@YNH_WWW_PATH@$path@g" ../conf/nginx.conf -sed -i "s@YNH_WWW_ALIAS@$final_path/@g" ../conf/nginx.conf -sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/zerobin.conf +sed -i "s@YNH_WWW_ALIAS@$final_path/@g" ../conf/nginx. +nginxconf=/etc/nginx/conf.d/$domain.d/zerobin.conf +sudo cp ../conf/nginx.conf $nginxconf +sudo chown root: $nginxconf +sudo chmod 600 $nginxconf sudo yunohost app setting zerobin is_public -v "$is_public" if [ $is_public = "Yes" ]; From 217630099476b5c27e93841220e6482bb57f1a37 Mon Sep 17 00:00:00 2001 From: Julien Malik Date: Tue, 11 Mar 2014 15:03:25 +0100 Subject: [PATCH 3/6] Update upgrade --- scripts/upgrade | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index ecffa7c..d6997af 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -24,7 +24,10 @@ sudo chmod 700 $final_path/{data,tmp} # Modify Nginx configuration file and copy it to Nginx conf directory sed -i "s@YNH_WWW_PATH@$path@g" ../conf/nginx.conf sed -i "s@YNH_WWW_ALIAS@$final_path/@g" ../conf/nginx.conf -sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/zerobin.conf +nginxconf=/etc/nginx/conf.d/$domain.d/zerobin.conf +sudo cp ../conf/nginx.conf $nginxconf +sudo chown root: $nginxconf +sudo chmod 600 $nginxconf if [ $is_public = "Yes" ]; then From fee815ccd594aad95fa24cd893d9f014065a398f Mon Sep 17 00:00:00 2001 From: Julien Malik Date: Tue, 11 Mar 2014 15:08:09 +0100 Subject: [PATCH 4/6] Fix install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 1be8b28..e4f3eb1 100755 --- a/scripts/install +++ b/scripts/install @@ -28,7 +28,7 @@ sudo chmod 700 $final_path/{data,tmp} # Modify Nginx configuration file and copy it to Nginx conf directory sed -i "s@YNH_WWW_PATH@$path@g" ../conf/nginx.conf -sed -i "s@YNH_WWW_ALIAS@$final_path/@g" ../conf/nginx. +sed -i "s@YNH_WWW_ALIAS@$final_path/@g" ../conf/nginx.conf nginxconf=/etc/nginx/conf.d/$domain.d/zerobin.conf sudo cp ../conf/nginx.conf $nginxconf sudo chown root: $nginxconf From a03545d96cfcda6e1fda7aadc9dd38b8ed6ffd2e Mon Sep 17 00:00:00 2001 From: M5oul Date: Sun, 6 Apr 2014 10:41:14 +0200 Subject: [PATCH 5/6] Update manifest.json Adding french description --- manifest.json | 1 + 1 file changed, 1 insertion(+) diff --git a/manifest.json b/manifest.json index e902bbc..6d1f6ce 100644 --- a/manifest.json +++ b/manifest.json @@ -3,6 +3,7 @@ "id": "zerobin", "description": { "en": "A minimalist, opensource online pastebin where the server has zero knowledge of pasted data" + "fr": "Un minimaliste pastebin libre" }, "developer": { "name": "julien", From 25823a9b81e8f3066e6a978c1075d346ad8d80f2 Mon Sep 17 00:00:00 2001 From: Julien Malik Date: Sun, 6 Apr 2014 23:23:59 +0200 Subject: [PATCH 6/6] translation fr --- manifest.json | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/manifest.json b/manifest.json index 6d1f6ce..aa0011b 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name": "Zerobin", "id": "zerobin", "description": { - "en": "A minimalist, opensource online pastebin where the server has zero knowledge of pasted data" - "fr": "Un minimaliste pastebin libre" + "en": "A minimalist, opensource online pastebin where the server has zero knowledge of pasted data", + "fr": "Un pastebin minimaliste, libre, où le serveur n'a aucune connaissance des données copiées" }, "developer": { "name": "julien", @@ -16,14 +16,16 @@ { "name": "domain", "ask": { - "en": "Choose a domain for Zerobin" + "en": "Choose a domain for Zerobin", + "fr": "Choisissez un domaine pour Zerobin" }, "example": "domain.org" }, { "name": "path", "ask": { - "en": "Choose a path for Zerobin" + "en": "Choose a path for Zerobin", + "fr": "Choisissez un chemin pour Zerobin" }, "example": "/zerobin", "default": "/zerobin" @@ -31,7 +33,8 @@ { "name": "is_public", "ask": { - "en": "Is it a public Zerobin site ?" + "en": "Is it a public Zerobin site ?", + "fr": "Est-ce un site public ?" }, "choices": ["Yes", "No"], "default": "Yes"