From 83ae4a69573db2c7f5ecb3878682ae0a2269eb1f Mon Sep 17 00:00:00 2001
From: nemsia <nemsia@nemsia.org>
Date: Mon, 17 Apr 2017 00:26:26 +0200
Subject: [PATCH] Revert "Clean"

This reverts commit f6848ea476bd4c9f3e8ffeee417c3fde2e968ffb.
---
 README.md       |  4 ++++
 manifest.json   | 13 +++++++++++++
 scripts/install |  6 ++++++
 3 files changed, 23 insertions(+)

diff --git a/README.md b/README.md
index d66dc2c..6eca3ca 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,13 @@
 # Mastodon for YunoHost
 
+<<<<<<< HEAD
+[![Status](https://img.shields.io/badge/status-in_progress-yellow.svg?style=flat)](https://github.com/magikcypress/mastodon_ynh/milestones)
+=======
 [![Latest Version](https://img.shields.io/badge/version-_--_-green.svg?style=flat)](https://github.com/YunoHost-Apps/mastodon_ynh/releases)
 [![Status](https://img.shields.io/badge/status-testing-yellow.svg?style=flat)](https://github.com/YunoHost-Apps/mastodon_ynh/milestones)
 [![Dependencies](https://img.shields.io/badge/dependencies-includes-lightgrey.svg?style=flat)](https://github.com/YunoHost-Apps/mastodon_ynh#dependencies)
 [![GitHub license](https://img.shields.io/badge/license-GPLv3-blue.svg?style=flat)](https://raw.githubusercontent.com/YunoHost-Apps/mastodon_ynh/master/LICENSE)
+>>>>>>> refs/remotes/YunoHost-Apps/master
 [![Yunohost version](https://img.shields.io/badge/yunohost-2.4.2_tested-orange.svg?style=flat)](https://github.com/YunoHost/yunohost)
 [![GitHub issues](https://img.shields.io/github/issues/YunoHost-Apps/mastodon_ynh.svg?style=flat)](https://github.com/YunoHost-Apps/mastodon_ynh/issues)
 
diff --git a/manifest.json b/manifest.json
index f4f245e..de52a88 100644
--- a/manifest.json
+++ b/manifest.json
@@ -32,6 +32,19 @@
 				"example": "domain.org"
 			},
 			{
+<<<<<<< HEAD
+				"name": "path",
+				"type": "path",
+				"ask": {
+					"en": "Choose a path for Mastodon",
+					"fr": "Choisissez un chemin pour Mastodon"
+				},
+				"example": "/",
+				"default": "/"
+			},
+			{
+=======
+>>>>>>> refs/remotes/YunoHost-Apps/master
 				"name": "admin",
 				"type": "user",
 				"ask": {
diff --git a/scripts/install b/scripts/install
index 29eeae0..318d18a 100644
--- a/scripts/install
+++ b/scripts/install
@@ -134,12 +134,18 @@ sudo sed -i "s@DB_USER=postgres@DB_USER=${app}@g" "${final_path}/live/.env.produ
 sudo sed -i "s@DB_NAME=postgres@DB_NAME=${app}_production@g" "${final_path}/live/.env.production"
 sudo sed -i "s@LOCAL_DOMAIN=example.com@LOCAL_DOMAIN=${domain}@g" "${final_path}/live/.env.production"
 
+<<<<<<< HEAD
+sudo sed -i "s@PAPERCLIP_SECRET=@PAPERCLIP_SECRET=$(head -n32 /dev/urandom | tr -dc -d 'A-Za-z0-9' | head -c128)@g" "${final_path}/live/.env.production"
+sudo sed -i "s@SECRET_KEY_BASE=@SECRET_KEY_BASE=$(head -n32 /dev/urandom | tr -dc -d 'A-Za-z0-9' | head -c128)@g" "${final_path}/live/.env.production"
+sudo sed -i "s@OTP_SECRET=@OTP_SECRET=$(head -n32 /dev/urandom | tr -dc -d 'A-Za-z0-9' | head -c128)@g" "${final_path}/live/.env.production"
+=======
 language="$(echo $language | head -c 2)"
 sudo sed -i "s@# DEFAULT_LOCALE=de@DEFAULT_LOCALE=${language}@g" "${final_path}/live/.env.production"
 
 sudo sed -i "s@PAPERCLIP_SECRET=@PAPERCLIP_SECRET=$(head -n128 /dev/urandom | tr -dc -d 'a-z0-9' | head -c128)@g" "${final_path}/live/.env.production"
 sudo sed -i "s@SECRET_KEY_BASE=@SECRET_KEY_BASE=$(head -n128 /dev/urandom | tr -dc -d 'a-z0-9' | head -c128)@g" "${final_path}/live/.env.production"
 sudo sed -i "s@OTP_SECRET=@OTP_SECRET=$(head -n128 /dev/urandom | tr -dc -d 'a-z0-9' | head -c128)@g" "${final_path}/live/.env.production"
+>>>>>>> refs/remotes/YunoHost-Apps/master
 
 sudo sed -i 's,SMTP_LOGIN=,SMTP_LOGIN='${admin_mastodon}'@'${domain}',' "${final_path}/live/.env.production"
 sudo sed -i "s@SMTP_PASSWORD=@SMTP_PASSWORD=${admin_pass}@g" "${final_path}/live/.env.production"