Updated to version 2.2

README.md

@@ -1,4 +1,4 @@
-# Osada/Zap for Yunohost
+# Osada for Yunohost
 
 [![Integration level](https://dash.yunohost.org/integration/osada.svg)](https://ci-apps.yunohost.org/jenkins/job/osada%20%28Community%29/lastBuild/consoleFull)
 
@@ -21,14 +21,11 @@ Shipped version: **2.2**
 
 **Osada** is a **social networking** platform specifically designed to be the glue that binds much of the **decentralised** web in a way that has not been **possible before**. It does this not by magic, but by **“speaking the language” of the various decentralised networks** and acting as a translator to pass information between them. Using Osada, you can seamlessly connect and share with your contacts whether they have an account on a Hubzilla server, a Mastodon server, or any of several popular platforms on the open web. 
 <br><br>
-## Zap
-**Zap** is a full featured social network application running under the **Zot6 protocol**. It provides **enhanced privacy** modes and **identity/content mirroring** across multiple servers (**"nomadic identity"**). It does **not "federate"** with non-nomadic servers, protocols, or projects like **Mastodon, Pleroma, Pixelfed, PeerTube, Funkwhale, Friendica,**.
 
 ## Important points to know before installing Osada
-1. Osada/Zap needs a valid **certificate** for your **domain** before installing Osada. For eg. Lets Encrpypt can be installed from Yunohost admin planel.
-1. You have to choose between **Osada** or **Zap** protocol while installtion. Once selected the **protocol cannot be changed**.
-1. Osada/Zap will require a **root domain**. Eg. osada.domain.tld
-1. Osada/Zap is **Ldap** enabled.
+1. Osada needs a valid **certificate** for your **domain** before installing Osada. For eg. Lets Encrpypt can be installed from Yunohost admin planel.
+1. Osada will require a **root domain**. Eg. osada.domain.tld
+1. Osada is **Ldap** enabled.
 1. Osada is **multi-instance** app. That means the app can be installed multiple times on a server.
 1. **For logs:** Go to **admin-> logs** and enter the file name as **php.log**.
 

check_process

@@ -2,7 +2,6 @@
 	auto_remove=1
 	; Manifest
 		domain="domain.tld"	(DOMAIN)
-		protocol="osada"
 		admin="john"	(USER)
 		; Checks
 			pkg_linter=1

conf/app.src

@@ -1,4 +1,4 @@
-SOURCE_URL=https://framagit.org/macgirvin/osada/-/archive/2.2/osada-2.2.tar.gz
+SOURCE_URL=https://framagit.org/zot/osada/-/archive/2.2/osada-2.2.tar.gz
 SOURCE_SUM=3861e2e48ce532277ed35f00d7e28c7a75ef0e5ea8a52e4db1832d6de2d4a112
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz

conf/app_addons.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://framagit.org/macgirvin/osada-addons/-/archive/f6d922bad27dd41c532cae370eb447271b84b749/osada-addons-f6d922bad27dd41c532cae370eb447271b84b749.tar.gz
-SOURCE_SUM=260cb35e7fa3ad90a6d728e01f018a6ec40a8cdc6e8a636be0d37db756c562b9
+SOURCE_URL=https://framagit.org/zot/osada-addons/-/archive/2.2/osada-addons-2.2.tar.gz
+SOURCE_SUM=e5185d043fa09ea13a3224a9f0bf4746bc76659ffa6346b1a52f8905dcd980dc
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=

manifest.json

@@ -32,14 +32,6 @@
                     "fr": "Indiquez un domain pour Osada. Osada doit être installé à la racine du domaine. Cela implique qu'aucune autre app ne pourra être installée ou accessible sur ce domain. Nous conseillons un sous-domaine dédié par exemple osada.domain.tld."
                 }
             },
-            {
-                "name": "protocol",
-                "ask": {
-                    "en": "Choose the protocol OSADA or ZAP (Osada can connect with other network like Mastodon,Pleroma,Peertube,Funkwhale but loose the abilty to nomadic identity. Zap has the nomadic abilty but will not connect to other networks thus is more secure."
-                },
-                "choices": ["osada","zap"],
-                "default": "osada"
-			},
             {
                 "name": "admin",
                 "type": "user",

scripts/install

@@ -24,7 +24,6 @@ domain=$YNH_APP_ARG_DOMAIN
 path_url="/"
 admin=$YNH_APP_ARG_ADMIN
 email=$(sudo yunohost user info $admin | grep "mail:" | cut -d' ' -f2)
-protocol=$YNH_APP_ARG_PROTOCOL
 upload="256M"
 database="1"
 
@@ -61,7 +60,6 @@ ynh_app_setting_set $app path $path_url
 ynh_app_setting_set $app admin $admin
 ynh_app_setting_set $app email $email
 ynh_app_setting_set $app upload $upload
-ynh_app_setting_set $app protocol $protocol
 ynh_app_setting_set $app database $database
 
 
@@ -112,11 +110,6 @@ sudo sed -i "s@//ini_set('error_log','php.out');@ini_set('error_log','php.log');
 sudo sed -i "s@//ini_set('log_errors','1');@ini_set('log_errors','1');@g" $final_path/.htconfig.php
 sudo sed -i "s@//ini_set('display_errors', '0');@ini_set('display_errors', '0');@g" $final_path/.htconfig.php
 
-# Set THE PROTOCOL TO USE
-if [ "$protocol" = "zap" ]; then
-	# setup application config
-	sudo su -c "cat ../conf/zap.php >> $final_path/.htconfig.php"
-fi
 	
 # addon ldap config
 sudo su -c "cat ../conf/ldap_conf.php >> $final_path/.htconfig.php"