diff --git a/config_panel.toml b/config_panel.toml index 459f636..c9fc221 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -25,18 +25,8 @@ help = "Here you can easily configure some things about your GoToSocial instance bind = "accounts-registration-open:__INSTALL_DIR__/config.yaml" choices = [ "true", "false" ] default = "false" - help.en = "Do we want people to be able to just submit sign up requests, or do we want invite only?" - help.fr = "Voulez-vous que les gens puissent simplement envoyer des demandes d'inscription, ou voulez-vous qu'iels doivent être invité-e-s ?" - type = "select" - - [main.accounts.accounts_approval_required] - ask.en = "Approval required?" - ask.fr = "Validation requise ?" - bind = "accounts-approval-required:__INSTALL_DIR__/config.yaml" - choices = [ "true", "false" ] - default = "true" - 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/utiliser le serveur ?" + help.en = "Allow people to submit new sign-up / registration requests via the form at `/signup`." + help.fr = "Permettre aux personnes de déposer de nouvelles demandes d'inscription via le formulaire à l'adresse `/signup`." type = "select" [main.accounts.accounts_reason_required] diff --git a/manifest.toml b/manifest.toml index 4579954..63333f5 100644 --- a/manifest.toml +++ b/manifest.toml @@ -67,25 +67,13 @@ ask.ar = "التسجيلات مفتوحة؟" ask.gl = "Rexistro aberto?" ask.ca = "Registres oberts?" 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.en = "Allow people to submit new sign-up / registration requests via the form at `/signup`." help.gl = "Queres permitir que calquera poida solicitar unha conta (verdadeiro), ou queres que só sexa a través de convite (falso)?" help.ca = "Voleu que la gent puguin enviar peticions de registre (true), o voleu que les registres es facin únicament per invitació (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) ?" +help.fr = "Permettre aux personnes de déposer de nouvelles demandes d'inscription via le formulaire à l'adresse `/signup`." type = "boolean" default = false -[install.accounts_approval_required] -ask.en = "Registration approval?" -ask.gl = "Aprobar novas contas?" -ask.ca = "Verificació manual dels registres?" -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.gl = "Para indicar se, após crear unha conta, esta debe ser aprobada pola administración antes de poder usar o servidor" -help.ca = "Ha d'aprovar manualment un administrador/moderador el registre abans que el compte pugui iniciar sessió al servidor?" -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.gl = "Requerir razón para crear conta?" diff --git a/scripts/install b/scripts/install index 980c26e..af480eb 100755 --- a/scripts/install +++ b/scripts/install @@ -25,7 +25,6 @@ client_max_body_size="100M" cache_memory_target="100MiB" accounts_registration_open=$(convert_bool "$YNH_APP_ARG_ACCOUNTS_REGISTRATION_OPEN") -accounts_approval_required=$(convert_bool "$YNH_APP_ARG_ACCOUNTS_APPROVAL_REQUIRED") accounts_reason_required=$(convert_bool "$YNH_APP_ARG_ACCOUNTS_REASON_REQUIRED") accounts_allow_custom_css="false" accounts_custom_css_length="10000" @@ -97,7 +96,6 @@ ynh_app_setting_set --app="$app" --key=password --value="$password" ynh_app_setting_set --app="$app" --key=cache_memory_target --value="$cache_memory_target" ynh_app_setting_set --app="$app" --key=accounts_registration_open --value="$accounts_registration_open" -ynh_app_setting_set --app="$app" --key=accounts_approval_required --value="$accounts_approval_required" ynh_app_setting_set --app="$app" --key=accounts_reason_required --value="$accounts_reason_required" ynh_app_setting_set --app="$app" --key=accounts_allow_custom_css --value="$accounts_allow_custom_css" ynh_app_setting_set --app="$app" --key=accounts_custom_css_length --value="$accounts_custom_css_length" diff --git a/scripts/upgrade b/scripts/upgrade index 759b680..9d43b8c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -280,6 +280,13 @@ then ynh_app_setting_delete --app="$app" --key=statuses_cw_max_chars fi +# Upgrade from <0.16.0~ynh1: +if ynh_compare_current_package_version --comparison lt --version 0.16.0~ynh1 || [ -n "${accounts_approval_required:-}" ] +then + # parameter removal + ynh_app_setting_delete --app="$app" --key=accounts_approval_required +fi + #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #=================================================