From 8431aee6795a9b7e50d0788d5243d0df04d7298a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 16 Oct 2020 17:42:03 +0200 Subject: [PATCH 1/6] fix PHP service --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 255e31f..9c5ba09 100644 --- a/manifest.json +++ b/manifest.json @@ -17,7 +17,7 @@ "multi_instance": true, "services": [ "nginx", - "php7.3-fpm", + "php7.0-fpm", "mysql", "postgresql" ], From 129944fcf12161b0c7a846c386dd61a7a21a302b Mon Sep 17 00:00:00 2001 From: anmol Date: Sun, 1 Nov 2020 03:35:42 +0530 Subject: [PATCH 2/6] Updated to latest upsource --- README.md | 20 +++++++++++++++++--- conf/app.src | 4 ++-- conf/app_addons.src | 4 ++-- manifest.json | 2 +- 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 5deb3fa..fd288b4 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,14 @@ # ZAP for YunoHost [![Integration level](https://dash.yunohost.org/integration/zap.svg)](https://dash.yunohost.org/appci/app/zap) ![](https://ci-apps.yunohost.org/ci/badges/zap.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/zap.maintain.svg) + [![Install Zap with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=zap) > *This package allow you to install ZAP 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.* -Version: 2020-10 +Version: 2020-10-30 ### Interesting links @@ -17,7 +18,21 @@ Version: 2020-10 - [Zap addons on codeberg](https://codeberg.org/zot/zap-addons) ## ZAP -[Zap](https://zotlabs.com/zap/) is a powerful platform for creating interconnected websites featuring a decentralized identity, communications, and permissions framework built using common webserver technology. +[Zap](https://zotlabs.com/zap/) is an an ethical alternative to Fediverse that provides powerful features for creating interconnected websites featuring a decentralized identity, communications, and permissions framework built using common webserver technology. + +Compatible with **Mastodon**, **Pleroma**, **Pixelfed**, **Friendica**, **Hubzilla**, **Funkwhale**, **Peertube**, **Plume**, **WriteFreely** and many, many more. + +## Unique Features of ZAP + +- **Groups** : public, private, and moderated. +- **Events** : Calendar and attendance; automatic birthday notifications for friends using this feature. +- **Cloud**storage : Built-in network file storage integrated with social networking access. +- **Editor** : Supports both markdown and bbcode. Use either or both - if you want. +- **Share **: Drag-and-drop a number of different things such as files, photos, webpages, maps, phone numbers to share- them. +- **Lists**: Sometimes referred to as circles or aspects, this lets you define your own groups of related friends and- communicate with them as a private group. +- **Extend** : Change or upgrade your software functionality as desired by installing additional features from addons and- the free app collection. + + ## This app claims following features: - [X] Ldap integration @@ -52,4 +67,3 @@ Before installing, read the [Zap installation instructions](https://codeberg.org * x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/Zap%20%28Official%29.svg)](https://ci-apps.yunohost.org/ci/apps/zap/) * ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/Zap%20%28Official%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/zap/) -* Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/ci/logs/Zap%20%28Official%29.svg)](https://ci-stretch.nohost.me/ci/apps/zap/) diff --git a/conf/app.src b/conf/app.src index 7ffa17e..b650162 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://codeberg.org/zot/zap/archive/29857253bcd53398cd618bcd21c0e4f8e9481393.tar.gz -SOURCE_SUM=70dcf4b9a5de944cd573b170a6bea1ea781356c78a0f15cc434ca36d25df345b +SOURCE_URL=https://codeberg.org/zot/zap/archive/281ee199d815b7a1c30d8d18c9651b3863605f4f.tar.gz +SOURCE_SUM=e3e886f76834fdc5071e31f4fc46c2c58705e01ff7df2dc77207d21f34123fec SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR= diff --git a/conf/app_addons.src b/conf/app_addons.src index 071cd18..6c1ade2 100644 --- a/conf/app_addons.src +++ b/conf/app_addons.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://codeberg.org/zot/zap-addons/archive/87b01b8316ede942d348cd65184ddfd924c24b88.tar.gz -SOURCE_SUM=834c2684c8b4b84e48834ce31e5fc00253bc09ba8726fd804ca910759266e814 +SOURCE_URL=https://codeberg.org/zot/zap-addons/archive/f70737937ecb9876daea3387eb57ecb6068a4a93.tar.gz +SOURCE_SUM=f280bdc98042a772adc0df9d72253bb36c5d77da7105a0561657144932322fb1 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR= diff --git a/manifest.json b/manifest.json index 9c5ba09..8ff1559 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "A fediverse server." }, - "version": "2020-10~ynh1", + "version": "2020-10-30~ynh1", "url": "https://zotlabs.com/zap/", "license": "MIT", "maintainer": { From 0f6c289f8ebd8b21ee8bcf3cc760079e0cd9f753 Mon Sep 17 00:00:00 2001 From: anmol Date: Sun, 1 Nov 2020 03:37:10 +0530 Subject: [PATCH 3/6] Typo in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fd288b4..f0b2330 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Compatible with **Mastodon**, **Pleroma**, **Pixelfed**, **Friendica**, **Hubzil - **Events** : Calendar and attendance; automatic birthday notifications for friends using this feature. - **Cloud**storage : Built-in network file storage integrated with social networking access. - **Editor** : Supports both markdown and bbcode. Use either or both - if you want. -- **Share **: Drag-and-drop a number of different things such as files, photos, webpages, maps, phone numbers to share- them. +- **Share**: Drag-and-drop a number of different things such as files, photos, webpages, maps, phone numbers to share- them. - **Lists**: Sometimes referred to as circles or aspects, this lets you define your own groups of related friends and- communicate with them as a private group. - **Extend** : Change or upgrade your software functionality as desired by installing additional features from addons and- the free app collection. From bad507dd3b32a02aa0bc3865f6df3760085bd97b Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 9 Nov 2020 16:10:25 +0100 Subject: [PATCH 4/6] rm -r -> ynh_secure_remove --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index c373fd2..22a1a7d 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -101,7 +101,7 @@ cp -a "$tmpdir/cache" "${final_path}" cp -a "$tmpdir/store" "${final_path}" cp -a "$tmpdir/.htconfig.php" "${final_path}" cp -a "$tmpdir/php.log" "${final_path}" -rm -Rf "$tmpdir" +ynh_secure_remove "$tmpdir" chmod -R 777 $final_path/store mkdir $final_path/addon ynh_setup_source --dest_dir="$final_path/addon" --source_id="app_addons" From 91d8646f42eaa7d39c80a252a0dc1ed311b2326d Mon Sep 17 00:00:00 2001 From: anmol Date: Fri, 13 Nov 2020 07:01:32 +0530 Subject: [PATCH 5/6] Updated sources to 2020-11-11 --- README.md | 2 +- conf/app.src | 5 ++--- conf/app_addons.src | 4 ++-- manifest.json | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index f0b2330..00dec70 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.* -Version: 2020-10-30 +Version: 2020-11-11 ### Interesting links diff --git a/conf/app.src b/conf/app.src index b650162..b7c1efe 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,5 @@ -SOURCE_URL=https://codeberg.org/zot/zap/archive/281ee199d815b7a1c30d8d18c9651b3863605f4f.tar.gz -SOURCE_SUM=e3e886f76834fdc5071e31f4fc46c2c58705e01ff7df2dc77207d21f34123fec -SOURCE_SUM_PRG=sha256sum +SOURCE_URL=https://codeberg.org/zot/zap/archive/8aa0e232a756be3cb22549342857b4cdcac6fb2a.tar.gz +SOURCE_SUM=9ede3d9f819c47899e27e36a33b435dff13bbc385348a408ae25d21771d0f0af SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR= SOURCE_FILENAME= diff --git a/conf/app_addons.src b/conf/app_addons.src index 6c1ade2..d18f4b2 100644 --- a/conf/app_addons.src +++ b/conf/app_addons.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://codeberg.org/zot/zap-addons/archive/f70737937ecb9876daea3387eb57ecb6068a4a93.tar.gz -SOURCE_SUM=f280bdc98042a772adc0df9d72253bb36c5d77da7105a0561657144932322fb1 +SOURCE_URL=https://codeberg.org/zot/zap-addons/archive/6a888a5ba705fd9e2231322db9bb402abdc577f5.tar.gz +SOURCE_SUM=75d95927eeb2ab92d152796654d4e5fb35dcdea9d1d39613812034b74c481568 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR= diff --git a/manifest.json b/manifest.json index 8ff1559..47f52c5 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "A fediverse server." }, - "version": "2020-10-30~ynh1", + "version": "2020-11-11~ynh1", "url": "https://zotlabs.com/zap/", "license": "MIT", "maintainer": { From fdfe40e6f20c339a18015aaeaf80ad2625c68fb3 Mon Sep 17 00:00:00 2001 From: anmol Date: Fri, 13 Nov 2020 08:01:32 +0530 Subject: [PATCH 6/6] Updated secure remove helper acc to YNH latest for upgrade script --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 22a1a7d..aef000a 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -101,7 +101,7 @@ cp -a "$tmpdir/cache" "${final_path}" cp -a "$tmpdir/store" "${final_path}" cp -a "$tmpdir/.htconfig.php" "${final_path}" cp -a "$tmpdir/php.log" "${final_path}" -ynh_secure_remove "$tmpdir" +ynh_secure_remove --file="$tmpdir" chmod -R 777 $final_path/store mkdir $final_path/addon ynh_setup_source --dest_dir="$final_path/addon" --source_id="app_addons"