From 5525fdfef5d00497f42ab686c2b034b93dd7923a Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Thu, 13 Jun 2019 23:52:45 +0200
Subject: [PATCH 1/3] Update pull_request_template.md

---
 pull_request_template.md | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/pull_request_template.md b/pull_request_template.md
index f850ebe0..884d196c 100644
--- a/pull_request_template.md
+++ b/pull_request_template.md
@@ -11,13 +11,8 @@
 - [ ] Upgrade from last version tested.
 - [ ] Can be reviewed and tested.
 
-## Validation
+## Package_check results
 ---
-- [ ] **Code review**
-- [ ] **Approval (LGTM)**  
-*Code review and approval have to be from a member of @YunoHost/apps group*
-- **CI succeeded** : 
-[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/pixelfed_ynh%20-BRANCH-/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/pixelfed_ynh%20-BRANCH-/)  
-*Please replace '-BRANCH-' in this link by the name of the branch used.*  
-*If the PR is from a forked repository. Please provide public results from package_check.*  
-When the PR is marked as ready to merge, you have to wait for 3 days before really merging it.
+*If you have access to [App Continuous Integration for packagers](https://yunohost.org/#/packaging_apps_ci) you can provide a link to the package_check results like below, replacing '-NUM-' in this link by the PR number and USERNAME by your username on the ci-apps-dev. Or you provide a screenshot or a pastebin of the results*
+
+[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/pixelfed_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/pixelfed_ynh%20PR-NUM-%20(USERNAME)/)  

From 7dfc18401171d2b913a30be4ec9ec9da803e9971 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Fri, 14 Jun 2019 22:36:32 +0200
Subject: [PATCH 2/3] Update .env

---
 conf/.env | 36 ++++++++++++++++--------------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/conf/.env b/conf/.env
index 1d14f831..ea04653a 100644
--- a/conf/.env
+++ b/conf/.env
@@ -2,10 +2,13 @@ APP_NAME=__APP__
 APP_ENV=production
 APP_KEY=__APP_KEY__
 APP_DEBUG=false
-APP_URL=https://__DOMAIN__
 
+APP_URL=https://__DOMAIN__
 ADMIN_DOMAIN="__DOMAIN__"
 APP_DOMAIN="__DOMAIN__"
+SESSION_DOMAIN="${APP_DOMAIN}"
+SESSION_SECURE_COOKIE=true
+TRUST_PROXIES="*"
 
 LOG_CHANNEL=stack
 
@@ -35,37 +38,30 @@ MAIL_ENCRYPTION=null
 MAIL_FROM_ADDRESS="pixelfed@__DOMAIN__"
 MAIL_FROM_NAME="Pixelfed"
 
-SESSION_DOMAIN="${APP_DOMAIN}"
-SESSION_SECURE_COOKIE=true
-API_BASE="/api/1/"
-API_SEARCH="/api/search"
-
 OPEN_REGISTRATION=true
-RECAPTCHA_ENABLED=false
 ENFORCE_EMAIL_VERIFICATION=true
+PF_MAX_USERS=1000
+RECAPTCHA_ENABLED=false
 
 MAX_PHOTO_SIZE=15000
 MAX_CAPTION_LENGTH=150
 MAX_ALBUM_LENGTH=4
 
-MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
-MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
-MIX_APP_URL="${APP_URL}"
-MIX_API_BASE="${API_BASE}"
-MIX_API_SEARCH="${API_SEARCH}"
-
-ACTIVITYPUB_INBOX=false
-ACTIVITYPUB_SHAREDINBOX=false
-HORIZON_DARKMODE=true
-
-# Set these both "true" to enable federation.
+ACTIVITY_PUB=true
+REMOTE_FOLLOW=true
+ACTIVITYPUB_INBOX=true
+ACTIVITYPUB_SHAREDINBOX=true
+# Set these "true" to enable federation.
 # You might need to also run:
 #   php artisan cache:clear
 #   php artisan optimize:clear
 #   php artisan optimize
-ACTIVITY_PUB=true
-REMOTE_FOLLOW=true
 
+PF_COSTAR_ENABLED=false
 CS_BLOCKED_DOMAINS='example.org,example.net,example.com'
 CS_CW_DOMAINS='example.org,example.net,example.com'
 CS_UNLISTED_DOMAINS='example.org,example.net,example.com'
+
+## Optional 
+#HORIZON_DARKMODE=false  # Horizon theme darkmode
+#HORIZON_EMBED=false  # Single Docker Container mode 

From 8cad418f56865dacec8595b4167b2faf8287536b Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Fri, 14 Jun 2019 22:40:11 +0200
Subject: [PATCH 3/3] upgrade version

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index 907b52a4..8ad43311 100644
--- a/manifest.json
+++ b/manifest.json
@@ -5,7 +5,7 @@
     "description": {
         "en": "ActivityPub Federated Image Sharing"
     },
-    "version": "0.9.4~ynh2",
+    "version": "0.9.4~ynh3",
     "url": "https://pixelfed.org/",
     "license": "AGPL-3.0-or-later",
     "maintainer": [