From 1805251664f2ed155b04e6f6594e21bb50b98c96 Mon Sep 17 00:00:00 2001
From: anmol26s <5068843+anmol26s@users.noreply.github.com>
Date: Mon, 20 Apr 2020 10:53:16 +0530
Subject: [PATCH] Forgot to updated addon sources and updated readme, manifest
---
README.md | 27 ++++++++++++++++++++++-----
check_process | 2 +-
conf/addons.src | 4 ++--
manifest.json | 4 ++--
pull_request_template.md | 18 ++++++++++++++++++
5 files changed, 45 insertions(+), 10 deletions(-)
create mode 100644 pull_request_template.md
diff --git a/README.md b/README.md
index 072513d..cb7adce 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,12 @@
# Friendica social network for YunoHost
-[](https://ci-apps.yunohost.org/jenkins/job/friendica%20%28Community%29/lastBuild/consoleFull)
+[](https://dash.yunohost.org/appci/app/friendica)
[](https://install-app.yunohost.org/?app=friendica)
+> *This package allow you to install Friendica quickly and simply on a YunoHost server.
+If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.*
+
[Friendica](http://friendi.ca/) integration for YunoHost
**Version:2020.03**
@@ -19,7 +22,10 @@ Before installing, read the [Friendica installation instructions](https://github
- SSL certificate validation requirement (now with support for [Let's Encrypt!](https://letsencrypt.org)). See Installation section below.
- Dedicated domain (must install under web root like **https://hub.example.com/** not **https://example.com/hub/** )
-Note:You can use accounts from YunoHost's LDAP. There are not yet active SSO.
+#### Multi-users support
+
+LDAP auth supported. There are not yet active SSO.
+
# To-do
- [ ] Fail2Ban support
@@ -30,9 +36,6 @@ Before installing, read the [Friendica installation instructions](https://github
### Register a new domain and add it to YunoHost
Friendica requires a dedicated domain, so obtain one and add it using the YunoHost admin panel. **Domains -> Add domain**. As Friendica uses the full domain and is installed on the root, you can create a subdomain such as friendica.domain.tld. Don't forget to update your DNS if you manage them manually.
-Friendica requires browser-approved SSL certificates. If you have certificates not issued by [Let's Encrypt](https://letsencrypt.org/), install them manually as usual.
-
-
### Install the Friendica application
Use the YunoHost admin panel to install Friendica by entering the GitHub repo address in the custom app URL
@@ -42,3 +45,17 @@ Make sure to select your domain from the previous section as the application dom
After the installation,login with the username provided at the time of the installaion with your SSO password.You can then create your profile and access the admin panel from the button in the center of the top nav bar, just adjecent to the search bar.(The admin panel don't have text,so don't get confuse with it)
Public users can register and use the instance as normal users. SSO users can login with there username and password as normal users too.
+
+Developers info
+----------------
+
+**Only if you want to use a testing branch for coding, instead of merging directly into master.**
+Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/friendica_ynh/tree/testing).
+
+To try the testing branch, please proceed like that.
+```
+sudo yunohost app install https://github.com/YunoHost-Apps/friendica_ynh/tree/testing --debug
+or
+sudo yunohost app upgrade REPLACEBYYOURAPP -u https://github.com/YunoHost-Apps/friendica_ynh/tree/testing --debug
+```
+
diff --git a/check_process b/check_process
index 0726b57..eb9fe54 100644
--- a/check_process
+++ b/check_process
@@ -10,7 +10,7 @@
setup_private=0
setup_public=1
upgrade=1
- upgrade=1 from_commit=1c018b9ed379e25d5bcab4bd27e9833feee9da68
+ upgrade=1 from_commit=3396188976f75170f2217fcc0e6c9b5f61f7b9e9
backup_restore=1
multi_instance=1
# This test is no longer necessary since the version 2.7 (PR: https://github.com/YunoHost/yunohost/pull/304), you can still do it if your app could be installed with this version.
diff --git a/conf/addons.src b/conf/addons.src
index 78d838c..9ce9c67 100644
--- a/conf/addons.src
+++ b/conf/addons.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/friendica/friendica-addons/archive/2019.12.tar.gz
-SOURCE_SUM=c206a8b0845a4a5102b5a9d1881d039472d734c70d5f1dd52e44684955b6a7f2
+SOURCE_URL=https://github.com/friendica/friendica-addons/archive/2020.03.tar.gz
+SOURCE_SUM=937aa87bbe8a40ef78348387969e77ac0422d2ce8bd00579aaf4ce45ea1362da
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index af61b28..48d1380 100644
--- a/manifest.json
+++ b/manifest.json
@@ -8,13 +8,13 @@
},
"url": "http://friendi.ca",
"license": "free",
- "version": "2020.03",
+ "version": "2020.03-ynh2",
"maintainer": {
"name": "Anmol Sharma",
"email": "anmol@datamol.org"
},
"requirements": {
- "yunohost": ">= 2.7.2"
+ "yunohost": ">= 3.5"
},
"previous_maintainers": {
"name": "aymhce",
diff --git a/pull_request_template.md b/pull_request_template.md
new file mode 100644
index 0000000..0287f9f
--- /dev/null
+++ b/pull_request_template.md
@@ -0,0 +1,18 @@
+## Problem
+- *Description of why you made this PR*
+
+## Solution
+- *And how do you fix that problem*
+
+## PR Status
+- [ ] Code finished.
+- [ ] Tested with Package_check.
+- [ ] Fix or enhancement tested.
+- [ ] Upgrade from last version tested.
+- [ ] Can be reviewed and tested.
+
+## Package_check results
+---
+*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*
+
+[/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/REPLACEBYYOURAPP_ynh%20PR-NUM-%20(USERNAME)/)