diff --git a/conf/systemd.service b/conf/systemd.service index 48f1149..8c75ab4 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -1,5 +1,5 @@ [Unit] -Description=Etherpad-lite: the collaborative editor. +Description=Etherpad-lite: Collaborative editor After=syslog.target network.target postgresql.service [Service] diff --git a/manifest.toml b/manifest.toml index cd68536..21e5820 100644 --- a/manifest.toml +++ b/manifest.toml @@ -13,7 +13,7 @@ maintainers = ["eric_G"] license = "Apache-2.0" website = "https://etherpad.org/" demo = "https://video.etherpad.com/" -admindoc = "http://etherpad.org/doc/v1.9.1" +admindoc = "http://etherpad.org/doc/v1.9.2" code = "https://github.com/ether/etherpad-lite" [integration] @@ -23,7 +23,7 @@ multi_instance = true ldap = true sso = true disk = "50M" -ram.build = "50M" +ram.build = "2G" ram.runtime = "50M" [install] @@ -43,14 +43,14 @@ ram.runtime = "50M" [install.export] ask.en = "Use AbiWord (~260 Mo) or LibreOffice (~400 Mo) (more stable) to expand export possibilities (PDF, doc)?" ask.fr = "Utiliser AbiWord (~260 Mo) ou LibreOffice (~400 Mo) (plus stable) pour étendre les possibilités d'export (PDF, doc) ?" - type = "string" + type = "select" choices = ["none", "abiword", "libreoffice"] default = "none" [install.language] ask.en = "Choose the application language" ask.fr = "Choisissez la langue de l'application" - type = "string" + type = "select" choices = ["ca", "de", "en", "es", "fr", "gl", "hu", "it", "nl", "pt"] default = "en" diff --git a/scripts/_common.sh b/scripts/_common.sh index bd0bb47..f248e9c 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -9,9 +9,6 @@ nodejs_version=18 # Dependencies for AbiWord abiword_app_depencencies="abiword" -# Dependencies for LibreOffice -#REMOVEME? libreoffice_app_dependencies="unoconv libreoffice-writer" - #================================================= # PERSONAL HELPERS #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 4a3c780..c130b65 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -35,7 +35,6 @@ then ynh_setup_source --dest_dir="$install_dir" --keep="$install_dir/settings.json $install_dir/credentials.json" fi -# Set permissions on app files chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir"