From 05a8ddd371bedfbe183922ca827889df1483c898 Mon Sep 17 00:00:00 2001
From: dragondaddy <dragondaddy@caselibre.fr>
Date: Thu, 3 Aug 2023 21:35:47 +0200
Subject: [PATCH] Code cleaning thanks to switch to v2

---
 conf/htconfig.sample.php |  4 ++--
 conf/poller-cron         |  2 +-
 manifest.toml            | 36 +++++++++++-------------------------
 3 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/conf/htconfig.sample.php b/conf/htconfig.sample.php
index af51076..d4f5308 100644
--- a/conf/htconfig.sample.php
+++ b/conf/htconfig.sample.php
@@ -17,7 +17,7 @@ $db_port = 0;                    // leave 0 for default or set your port
 $db_user = '__DB_USER__';
 $db_pass = '__DB_PWD__';
 $db_data = '__DB_NAME__';
-$db_type = __DB_TYPE__; // use 1 for postgres, 0 for mysql
+$db_type = 0; // use 1 for postgres, 0 for mysql
 
 /*
  * Notice: Many of the following settings will be available in the admin panel 
@@ -40,7 +40,7 @@ App::$config['system']['timezone'] = 'America/Los_Angeles';
 // What is your site name? DO NOT ADD A TRAILING SLASH!
 
 App::$config['system']['baseurl'] = 'https://__DOMAIN__';
-App::$config['system']['sitename'] = "YunoHost Hubzilla";
+App::$config['system']['sitename'] = "YunoHost Streams";
 App::$config['system']['location_hash'] = '__RANDOM_STRING__';
 
 
diff --git a/conf/poller-cron b/conf/poller-cron
index 1be3361..d0bfb9d 100644
--- a/conf/poller-cron
+++ b/conf/poller-cron
@@ -1,2 +1,2 @@
 # Run poller periodically to update your website
-*/10 * * * * __APP__ /usr/bin/php__PHPVERSION__ -f __INSTALL_DIR__/Code/Daemon/Run.php Cron > /dev/null 2>&1
+*/10 * * * * __APP__ /usr/bin/php__PHPVERSION__ -f Code/Daemon/Run.php Cron > /dev/null 2>&1
diff --git a/manifest.toml b/manifest.toml
index 3dcb2fd..9053449 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -5,7 +5,7 @@ name = "Streams"
 description.en = "An open source fediverse server"
 description.fr = "Un serveur fediverse open source"
 
-version = "23.07.31~ynh1"
+version = "23.08.02~ynh3"
 
 maintainers = ["Papa Dragon"]
 
@@ -17,52 +17,38 @@ code = "https://codeberg.org/streams/streams"
 yunohost = ">= 11.1.21"
 architectures = "all"
 multi_instance = true
-ldap = true
-sso = true
-disk = "50M"
+ldap = false
+sso = false
+disk = "150M"
 ram.build = "200M"
 ram.runtime = "50M"
 
 [install]
     [install.domain]
+    help.en = "Your website can only be installed in a root domain or subdomain"
+    help.fr = "Votre site web ne peut être installé que dans un domaine racine ou un sous-domaine"
     type = "domain"
     full_domain = true
 
     [install.admin]
     type = "user"
 
-    [install.database]
-    ask.en = "Choose your database"
-    ask.fr = "Choisissez votre base de données"
-    type = "select"
-    choices = ["mysql", "postgresql"]
-    default = "mysql"
-
 [resources]
     [resources.sources]
         [resources.sources.main]
-        url = "https://codeberg.org/streams/streams/archive/2ae1943eb9c26b3c798d1c7289d356612c9b6644.tar.gz"
-        sha256 = "7a5f8ddc4d5dcf417e980103c5191bd8d899a96a2fa62cb13ed92bd216b30d25"
+        url = "https://codeberg.org/streams/streams/archive/7e72622fa4c0ebaf0dae19e36576be33e3d46229.tar.gz"
+        sha256 = "ba84087395b0368951e4042b92dd1df23ea68c9104fdd04ce1a5f5e10cc1f899"
 
         [resources.sources.addons]
         url = "https://codeberg.org/streams/streams-addons/archive/0ff7cafbb205611c9f5fbbb8d8294c0b9dba0d70.tar.gz"
         sha256 = "2118bb796e1113a50b72c525708484563656edfe4b03c50b01ef973d839f3bce"
 
-    [resources.system_user]
-
-    [resources.install_dir]
-
     [resources.permissions]
     main.url = "/"
     main.allowed = "visitors"
 
     [resources.apt]
-    packages = "php8.2-mbstring php8.2-cli php8.2-imagick php8.2-xml php8.2-zip php8.2-curl php8.2-ldap php8.2-json php8.2-gd"
+    packages = "php8.2-mbstring php8.2-cli php8.2-imagick php8.2-xml php8.2-zip php8.2-curl php8.2-ldap php8.2-json php8.2-gd mariadb-server php8.2-mysql"
 
-    packages_from_raw_bash = """
-            if [[ "$database" == "mysql" ]]; then 
-                echo "mariadb-server php8.2-mysql"
-            elif [[ "$database" == "postgresql" ]]; then 
-                echo "postgresql postgresql-contrib php8.2-pgsql"
-            fi
-        """
+    [resources.database]
+    type = "mysql"