From 92ac205710536f60c1a790d11d6ea04e1329cd52 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Mon, 31 Jul 2023 00:56:17 +0200 Subject: [PATCH] Update cpe and disk/ram usage. Replace disclaimer.md by admin.md --- doc/{DISCLAIMER.md => ADMIN.md} | 9 --------- doc/ADMIN_fr.md | 6 ++++++ doc/DISCLAIMER_fr.md | 15 --------------- manifest.toml | 11 +++++------ 4 files changed, 11 insertions(+), 30 deletions(-) rename doc/{DISCLAIMER.md => ADMIN.md} (53%) create mode 100644 doc/ADMIN_fr.md delete mode 100644 doc/DISCLAIMER_fr.md diff --git a/doc/DISCLAIMER.md b/doc/ADMIN.md similarity index 53% rename from doc/DISCLAIMER.md rename to doc/ADMIN.md index a5251a0..b65bff5 100644 --- a/doc/DISCLAIMER.md +++ b/doc/ADMIN.md @@ -4,12 +4,3 @@ How to configure GitLab: - With the GitLab admin panel. - By editing the configuration file `/etc/gitlab/gitlab-persistent.rb` (use `sudo gitlab-ctl reconfigure` after any modification of this file). - -### Multi-users support - -* Are LDAP and HTTP auth supported? **Yes** -* Can the app be used by multiple users? **Yes** - -### Limitations - -* GitLab is not compatible with 32-bit architectures. diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md new file mode 100644 index 0000000..4600559 --- /dev/null +++ b/doc/ADMIN_fr.md @@ -0,0 +1,6 @@ +### Configuration + +Comment configurer GitLab : + +- Avec le panneau d'administration de GitLab. +- En éditant le fichier de configuration `/etc/gitlab/gitlab-persistent.rb` et en éxécutant la commande `sudo gitlab-ctl reconfigure` pour réactualiser la configuration. diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md deleted file mode 100644 index ece504b..0000000 --- a/doc/DISCLAIMER_fr.md +++ /dev/null @@ -1,15 +0,0 @@ -### Configuration - -Comment configurer GitLab : - -- Avec le panneau d'administration de GitLab. -- En éditant le fichier de configuration `/etc/gitlab/gitlab-persistent.rb` et en éxécutant la commande `sudo gitlab-ctl reconfigure` pour réactualiser la configuration. - -### Support multi-utilisateurs - -* L'authentification LDAP et HTTP est-elle prise en charge ? **Oui** -* L'application peut-elle être utilisée par plusieurs utilisateurs ? **Oui** - -### Limitations - -* L'application GitLab n'est pas compatible avec les architectures 32-bit. diff --git a/manifest.toml b/manifest.toml index 9fc37ac..6bc8974 100644 --- a/manifest.toml +++ b/manifest.toml @@ -15,18 +15,17 @@ website = "https://gitlab.com" demo = "https://gitlab.com/explore" admindoc = "https://docs.gitlab.com/" code = "https://gitlab.com/gitlab-org/omnibus-gitlab - https://gitlab.com/gitlab-org/gitlab" -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. +cpe = "cpe:2.3:a:gitlab:gitlab:*:*:*:*:community:*:*:*" [integration] -yunohost = ">= 11.1.15" +yunohost = ">= 11.2.3" architectures = ["amd64", "armhf", "arm64"] multi_instance = false ldap = true sso = false -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, ... +disk = "500M" +ram.build = "3000M" +ram.runtime = "2000M" [install] [install.domain]