From a56a8086a4751c7ff2a39c834ab1d48b536900d5 Mon Sep 17 00:00:00 2001 From: SpencerDub Date: Mon, 20 Jan 2020 09:19:58 -0800 Subject: [PATCH 01/10] Update to 2019.12 sources --- conf/addons.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/addons.src b/conf/addons.src index 5c08c63..cf75f1a 100644 --- a/conf/addons.src +++ b/conf/addons.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/friendica/friendica-addons/archive/2019.01.zip -SOURCE_SUM=23edfeddf58de1f605f8cb71603fbb31f415641b76f09a102e4bdb2ec78d508d +SOURCE_URL=https://github.com/friendica/friendica-addons/archive/2019.12.tar.gz +SOURCE_SUM=c206a8b0845a4a5102b5a9d1881d039472d734c70d5f1dd52e44684955b6a7f2 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true From 996d4464b71568b0fd04810add2e0117b5db00a8 Mon Sep 17 00:00:00 2001 From: SpencerDub Date: Mon, 20 Jan 2020 09:20:49 -0800 Subject: [PATCH 02/10] Update to 2019.12 --- conf/app.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/app.src b/conf/app.src index c8b5fb7..458887f 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://friendi.ca/wp-content/uploads/2019/02/friendica-full-2019.01.tar.gz -SOURCE_SUM=895025c0adf042b6139ed3e7c4674a49d3a0237ce3490a367be681e6310c92a3 +SOURCE_URL=https://friendi.ca/wp-content/uploads/2019/12/friendica-full-2019.12.tar.gz +SOURCE_SUM=6affca62ba26ba34f809a2b1db6612090bb7e0cf5d39bde6e7cbabd1c080ade9 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true From fd1911123348112e7ed7a20f7c77d94b880994e5 Mon Sep 17 00:00:00 2001 From: SpencerDub Date: Mon, 20 Jan 2020 09:22:59 -0800 Subject: [PATCH 03/10] Update version number to 2019.12 --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 9e5edf2..8711e5b 100644 --- a/manifest.json +++ b/manifest.json @@ -8,7 +8,7 @@ }, "url": "http://friendi.ca", "license": "free", - "version": "2019.01", + "version": "2019.12", "maintainer": { "name": "Anmol Sharma", "email": "anmol@datamol.org" From b3b26f9fd1ca468622029186a5af969aed48176e Mon Sep 17 00:00:00 2001 From: SpencerDub Date: Mon, 20 Jan 2020 09:26:40 -0800 Subject: [PATCH 04/10] Update PHP version to 7.0 --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 8711e5b..c29b5b1 100644 --- a/manifest.json +++ b/manifest.json @@ -23,7 +23,7 @@ "multi_instance": true, "services": [ "nginx", - "php5-fpm", + "php7.0-fpm", "mysql" ], "arguments": { From 524a828821d70e5a367a40122480d9cf51782f67 Mon Sep 17 00:00:00 2001 From: SpencerDub Date: Mon, 20 Jan 2020 11:42:21 -0800 Subject: [PATCH 05/10] Update version number to 2019.12 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c5bc68e..6c902de 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [Friendica](http://friendi.ca/) integration for YunoHost
-**Version:2019.01**

+**Version:2019.12**

Current snapshot in *sources*: From bb10d2015a0e127cdc33493725ebbfc00bf962b2 Mon Sep 17 00:00:00 2001 From: SpencerDub Date: Mon, 20 Jan 2020 11:47:48 -0800 Subject: [PATCH 06/10] Update to match current Friendica license --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 2bbe2d1..e720a40 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ Friendica Communications Server -Copyright (c) 2010-2017 the Friendica Project +Copyright (c) 2010-2019 the Friendica Project This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by From 9fa33e1cf63e6c2a2c5af2d2ee3dc8933be076a8 Mon Sep 17 00:00:00 2001 From: SpencerDub Date: Mon, 20 Jan 2020 12:02:28 -0800 Subject: [PATCH 07/10] Updating snapshot version numbers to 2019.12 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6c902de..1157a78 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,8 @@ Current snapshot in *sources*: -* https://github.com/friendica/friendica: 2019.01 -* https://github.com/friendica/friendica-addons: 2019.01 +* https://github.com/friendica/friendica: 2019.12 +* https://github.com/friendica/friendica-addons: 2019.12 ## Important Notes From 31aab0762c424f936f1fe0d49f9d877913dd1f15 Mon Sep 17 00:00:00 2001 From: SpencerDub Date: Mon, 20 Jan 2020 12:04:34 -0800 Subject: [PATCH 08/10] Minor copy-editing --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1157a78..822dddb 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [Friendica](http://friendi.ca/) integration for YunoHost
-**Version:2019.12**

+**Version: 2019.12**

Current snapshot in *sources*: @@ -19,7 +19,7 @@ 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.

+Note:You can use accounts from YunoHost's LDAP. Single sign-on (SSO) is not yet functional.

# To-do - [ ] Fail2Ban support @@ -40,5 +40,5 @@ Use the YunoHost admin panel to install Friendica by entering the GitHub repo ad Make sure to select your domain from the previous section as the application domain. -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. +After the installation,login with the username provided at the time of the installation 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 adjacent to the search bar. (The admin panel doesn't have text, so don't get confused with it.) +Public users can register and use the instance as normal users. SSO users can login with their username and password as normal users too. From bab5a0cf2854d75ae0eca48c80f2f8c5e060e77d Mon Sep 17 00:00:00 2001 From: SpencerDub Date: Mon, 20 Jan 2020 12:05:18 -0800 Subject: [PATCH 09/10] Even more minor copy editing --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 822dddb..ffddb4e 100644 --- a/README.md +++ b/README.md @@ -40,5 +40,5 @@ Use the YunoHost admin panel to install Friendica by entering the GitHub repo ad Make sure to select your domain from the previous section as the application domain. -After the installation,login with the username provided at the time of the installation 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 adjacent to the search bar. (The admin panel doesn't have text, so don't get confused with it.) +After the installation, login with the username provided at the time of the installation 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 adjacent to the search bar. (The admin panel doesn't have text, so don't get confused with it.) Public users can register and use the instance as normal users. SSO users can login with their username and password as normal users too. From 0de65bba4f3c0e9c9c3987d11baa6b24ee0d17ad Mon Sep 17 00:00:00 2001 From: SpencerDub Date: Tue, 21 Jan 2020 12:27:13 -0800 Subject: [PATCH 10/10] Fixing Friendica install link The old one was 404'd. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ffddb4e..0cca6c4 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Current snapshot in *sources*: ## Important Notes -Before installing, read the [Friendica installation instructions](https://github.com/friendica/friendica/blob/master/INSTALL.txt) for important information about +Before installing, read the [Friendica installation instructions](https://github.com/friendica/friendica/blob/develop/doc/Install.md) for important information about - 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/** )