From 167c69cf475e131888b7772de04fa10ef1eef934 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Mon, 8 Jan 2024 17:53:45 +0100 Subject: [PATCH] update manifest --- conf/config.yaml | 6 +- manifest.json | 109 ----------------------------------- manifest.toml | 145 ++++++++++++++++++++++++----------------------- 3 files changed, 76 insertions(+), 184 deletions(-) delete mode 100644 manifest.json diff --git a/conf/config.yaml b/conf/config.yaml index e5f5a58..253e02a 100644 --- a/conf/config.yaml +++ b/conf/config.yaml @@ -729,18 +729,18 @@ smtp-port: __SMTP_PORT__ # This is often, but not always, an email address. # Examples: ["maillord@example.org"] # Default: "" -smtp-username: "__SMTP_USERNAME__" +smtp-username: "__APP__" # String. Password to use when authenticating with the smtp server. # This should have been provided to you by your smtp host. # Examples: ["1234", "password"] # Default: "" -smtp-password: "__SMTP_PASSWORD__" +smtp-password: "__MAIL_PWD__" # String. 'From' address for sent emails. # Examples: ["mail@example.org"] # Default: "" -smtp-from: "__SMTP_FROM__" +smtp-from: "__APP__@__DOMAIN__" # Bool. If true, when an email is sent that has multiple recipients, each recipient # will be included in the To field, so that each recipient can see who else got the diff --git a/manifest.json b/manifest.json deleted file mode 100644 index 33f7da2..0000000 --- a/manifest.json +++ /dev/null @@ -1,109 +0,0 @@ -{ - "name": "GoToSocial", - "id": "gotosocial", - "packaging_format": 1, - "description": { - "en": "Fast ActivityPub social network server written in Go", - "fr": "Serveur de réseau social véloce basé sur ActivityPub écrit en Go" - }, - "version": "0.13.0~ynh1", - "url": "https://github.com/superseriousbusiness/gotosocial", - "upstream": { - "license": "AGPL-3.0-only", - "website": "https://gotosocial.org/", - "demo": "", - "admindoc": "https://docs.gotosocial.org/en/latest/", - "userdoc": "https://docs.gotosocial.org/en/latest/", - "code": "https://github.com/superseriousbusiness/gotosocial" - }, - "license": "AGPL-3.0-only", - "maintainer": { - "name": "OniriCorpe", - "email": "" - }, - "requirements": { - "yunohost": ">= 11.2.6" - }, - "multi_instance": true, - "services": [ - "nginx", - "postgresql" - ], - "arguments": { - "install": [ - { - "name": "domain", - "type": "domain" - }, - { - "name": "admin", - "type": "string", - "ask": { - "en": "The username of your admin account.", - "fr": "Le nom d'utilisateur de votre compte admin." - }, - "help": { - "en": "Must be in lower case and without special characters.", - "fr": "Doit être en minuscule et sans caractère special." - }, - "example": "johndoe" - }, - { - "name": "email", - "type": "string", - "ask": { - "en": "The email adress of your admin account.", - "fr": "L'adresse e-mail de votre compte admin." - }, - "example": "johndoe@example.com" - }, - { - "name": "password", - "type": "password", - "help": { - "en": "Must contain: upper case, lower case, number and special character.", - "fr": "Il doit contenir : majuscule, minuscule, chiffre et caractère spécial." - } - }, - { - "name": "accounts_registration_open", - "type": "boolean", - "ask": { - "en": "Open registration?", - "fr": "Inscriptions ouvertes ?" - }, - "help": { - "en": "Do you want people to be able to just submit sign up requests (true), or do you want invite only (false)?", - "fr": "Voulez-vous que les gens puissent envoyer des demandes d'inscription (true) ou voulez-vous que les inscriptions soient uniquement sur invitation (false) ?" - }, - "default": false - }, - { - "name": "accounts_approval_required", - "type": "boolean", - "ask": { - "en": "Registration approval?", - "fr": "Vérification manuelle des inscriptions ?" - }, - "help": { - "en": "Do sign up requests require approval from an admin/moderator before an account can sign in/use the server?", - "fr": "Les demandes d'inscription doivent-elles être approuvées par un-e administrateur-ice/modérateur-ice avant qu'un compte puisse se connecter et utiliser le serveur ?" - }, - "default": true - }, - { - "name": "accounts_reason_required", - "type": "boolean", - "ask": { - "en": "Request registration reason?", - "fr": "Demande de motif pour les inscriptions ?" - }, - "help": { - "en": "Are sign up requests required to submit a reason for the request (eg., an explanation of why they want to join the instance)?", - "fr": "Les demandes d'inscription doivent-elles être accompagnée d'un motif (par exemple, une explication de la raison pour laquelle la personne veut rejoindre l'instance) ?" - }, - "default": true - } - ] - } -} diff --git a/manifest.toml b/manifest.toml index 3297830..f4e2913 100644 --- a/manifest.toml +++ b/manifest.toml @@ -14,100 +14,101 @@ maintainers = ["OniriCorpe"] [upstream] license = "AGPL-3.0-only" website = "https://gotosocial.org/" -demo = "" admindoc = "https://docs.gotosocial.org/en/latest/" userdoc = "https://docs.gotosocial.org/en/latest/" code = "https://github.com/superseriousbusiness/gotosocial" -cpe = "???" # FIXME: optional but recommended if relevant, this is meant to contain the Common Platform Enumeration, which is sort of a standard id for applications defined by the NIST. In particular, Yunohost may use this is in the future to easily track CVE (=security reports) related to apps. The CPE may be obtained by searching here: https://nvd.nist.gov/products/cpe/search. For example, for Nextcloud, the CPE is 'cpe:2.3:a:nextcloud:nextcloud' (no need to include the version number) -fund = "???" # FIXME: optional but recommended (or remove if irrelevant / not applicable). This is meant to be an URL where people can financially support this app, especially when its development is based on volunteers and/or financed by its community. YunoHost may later advertise it in the webadmin. [integration] yunohost = ">= 11.2.6" -architectures = "all" # FIXME: can be replaced by a list of supported archs using the dpkg --print-architecture nomenclature (amd64/i386/armhf/arm64), for example: ["amd64", "i386"] +architectures = ["amd64", "i386", "arm64", "armhf"] multi_instance = true -ldap = "?" # FIXME: replace with true, false, or "not_relevant". Not to confuse with the "sso" key : the "ldap" key corresponds to wether or not a user *can* login on the app using its YunoHost credentials. -sso = "?" # FIXME: replace with true, false, or "not_relevant". Not to confuse with the "ldap" key : the "sso" key corresponds to wether or not a user is *automatically logged-in* on the app when logged-in on the YunoHost portal. -disk = "50M" # FIXME: replace with an **estimate** minimum disk requirement. e.g. 20M, 400M, 1G, ... -ram.build = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ... -ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ... +ldap = false +sso = false +disk = "50M" +ram.build = "100M" +ram.runtime = "100M" [install] - [install.domain] - # this is a generic question - ask strings are automatically handled by Yunohost's core - type = "domain" +[install.domain] +type = "domain" - [install.admin] - # this is a generic question - ask strings are automatically handled by Yunohost's core - help.en = "Must be in lower case and without special characters." - help.fr = "Doit être en minuscule et sans caractère special." - type = "string" - example = "johndoe" +[install.admin] +help.en = "Must be in lower case and without special characters." +help.fr = "Doit être en minuscule et sans caractère special." +type = "string" +example = "johndoe" - [install.email] - ask.en = "The email adress of your admin account." - ask.fr = "L'adresse e-mail de votre compte admin." - type = "string" - example = "johndoe@example.com" +[install.email] +ask.en = "The email adress of your admin account." +ask.fr = "L'adresse e-mail de votre compte admin." +type = "string" +example = "johndoe@example.com" - [install.password] - # this is a generic question - ask strings are automatically handled by Yunohost's core - help.en = "Must contain: upper case, lower case, number and special character." - help.fr = "Il doit contenir : majuscule, minuscule, chiffre et caractère spécial." - type = "password" +[install.password] +help.en = "Must contain: upper case, lower case, number and special character." +help.fr = "Il doit contenir : majuscule, minuscule, chiffre et caractère spécial." +type = "password" - [install.accounts_registration_open] - ask.en = "Open registration?" - ask.fr = "Inscriptions ouvertes ?" - help.en = "Do you want people to be able to just submit sign up requests (true), or do you want invite only (false)?" - help.fr = "Voulez-vous que les gens puissent envoyer des demandes d'inscription (true) ou voulez-vous que les inscriptions soient uniquement sur invitation (false) ?" - type = "boolean" - default = false +[install.accounts_registration_open] +ask.en = "Open registration?" +ask.fr = "Inscriptions ouvertes ?" +help.en = "Do you want people to be able to just submit sign up requests (true), or do you want invite only (false)?" +help.fr = "Voulez-vous que les gens puissent envoyer des demandes d'inscription (true) ou voulez-vous que les inscriptions soient uniquement sur invitation (false) ?" +type = "boolean" +default = false - [install.accounts_approval_required] - ask.en = "Registration approval?" - ask.fr = "Vérification manuelle des inscriptions ?" - help.en = "Do sign up requests require approval from an admin/moderator before an account can sign in/use the server?" - help.fr = "Les demandes d'inscription doivent-elles être approuvées par un-e administrateur-ice/modérateur-ice avant qu'un compte puisse se connecter et utiliser le serveur ?" - type = "boolean" - default = true +[install.accounts_approval_required] +ask.en = "Registration approval?" +ask.fr = "Vérification manuelle des inscriptions ?" +help.en = "Do sign up requests require approval from an admin/moderator before an account can sign in/use the server?" +help.fr = "Les demandes d'inscription doivent-elles être approuvées par un-e administrateur-ice/modérateur-ice avant qu'un compte puisse se connecter et utiliser le serveur ?" +type = "boolean" +default = true - [install.accounts_reason_required] - ask.en = "Request registration reason?" - ask.fr = "Demande de motif pour les inscriptions ?" - help.en = "Are sign up requests required to submit a reason for the request (eg., an explanation of why they want to join the instance)?" - help.fr = "Les demandes d'inscription doivent-elles être accompagnée d'un motif (par exemple, une explication de la raison pour laquelle la personne veut rejoindre l'instance) ?" - type = "boolean" - default = true +[install.accounts_reason_required] +ask.en = "Request registration reason?" +ask.fr = "Demande de motif pour les inscriptions ?" +help.en = "Are sign up requests required to submit a reason for the request (eg., an explanation of why they want to join the instance)?" +help.fr = "Les demandes d'inscription doivent-elles être accompagnée d'un motif (par exemple, une explication de la raison pour laquelle la personne veut rejoindre l'instance) ?" +type = "boolean" +default = true [resources] - [resources.sources.main] - in_subdir = false - i386.url = "https://github.com/superseriousbusiness/gotosocial/releases/download/v0.13.0/gotosocial_0.13.0_linux_386.tar.gz" - i386.sha256 = "0b75d0c2b55877f6f2c1a8a1d723aa1c868bee902a9689f3cde8410c8b680d89" - amd64.url = "https://github.com/superseriousbusiness/gotosocial/releases/download/v0.13.0/gotosocial_0.13.0_linux_amd64.tar.gz" - amd64.sha256 = "fce2f2e3cb0af23542f1f15887cf967dedcae849971c56ee9ce4284a4593a70c" - armel.url = "https://github.com/superseriousbusiness/gotosocial/releases/download/v0.13.0/gotosocial_0.13.0_linux_armv6.tar.gz" - armel.sha256 = "9d67def302645987279ea76a64e72eda2d05318bd2aea42109dce097e65b2087" - arm64.url = "https://github.com/superseriousbusiness/gotosocial/releases/download/v0.13.0/gotosocial_0.13.0_linux_arm64.tar.gz" - arm64.sha256 = "cd93eb377ff86f241a3957fc81b08607b3df89bb70c3d857bb2ad107db917678" - armhf.url = "https://github.com/superseriousbusiness/gotosocial/releases/download/v0.13.0/gotosocial_0.13.0_linux_armv7.tar.gz" - armhf.sha256 = "2bff982d96333528d6479aef16d3686038a9d01f11c5043a536f2b7a463fd881" +[resources.sources.main] +in_subdir = false +i386.url = "https://github.com/superseriousbusiness/gotosocial/releases/download/v0.8.1/gotosocial_0.8.1_linux_386.tar.gz" +i386.sha256 = "8d1436b1eab293e97f3de3572b3631da1efb12b23dc29ffcdb76b40f8f925a0c" +amd64.url = "https://github.com/superseriousbusiness/gotosocial/releases/download/v0.8.1/gotosocial_0.8.1_linux_amd64.tar.gz" +amd64.sha256 = "32475bc78db64dbcfadb61b6c9b63542d9687fb9d42fa4c866f8136d86f8cf6d" +armv6.url = "https://github.com/superseriousbusiness/gotosocial/releases/download/v0.8.1/gotosocial_0.8.1_linux_armv6.tar.gz" +armv6.sha256 = "207aed157dd418d6a4a7e4cff74de0724e08b0be24cf7208122988a2d9da44cc" +arm64.url = "https://github.com/superseriousbusiness/gotosocial/releases/download/v0.8.1/gotosocial_0.8.1_linux_arm64.tar.gz" +arm64.sha256 = "671d66a6c7cd6b96b7499bf3e6419a1c4cc9278ff532191c0bcecc025fd4a0db" +armhf.url = "https://github.com/superseriousbusiness/gotosocial/releases/download/v0.8.1/gotosocial_0.8.1_linux_armv7.tar.gz" +armhf.sha256 = "54117d643829ec0c3a8e47d036d2485747d301299964dd33178308e560e1b265" +autoupdate.asset.i386 = "^gotosocial_.*_linux_386.tar.gz$" +autoupdate.asset.amd64 = "^gotosocial_.*_linux_amd64.tar.gz$" +autoupdate.asset.armv6 = "^gotosocial_.*_linux_armv6.tar.gz$" +autoupdate.asset.arm64 = "^gotosocial_.*_linux_arm64.tar.gz$" +autoupdate.asset.armhf = "^gotosocial_.*_linux_armv7.tar.gz$" +autoupdate.strategy = "latest_github_release" - [resources.system_user] +[resources.system_user] +allow_email = true - [resources.install_dir] +[resources.install_dir] - [resources.data_dir] +[resources.data_dir] - [resources.permissions] - main.url = "/" +[resources.permissions] +main.url = "/" - [resources.ports] - main.default = 8095 +[resources.ports] +main.default = 8095 - [resources.apt] - packages = "postgresql, postgresql-contrib" +[resources.apt] +packages = "postgresql, postgresql-contrib" - [resources.database] - type = "postgresql" +[resources.database] +type = "postgresql"