diff --git a/README.md b/README.md index 363a67e..7c06fdd 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ownCloud Infinite Scale (oCIS) is the new file sync & share platform that will be the foundation of your data management platform. -**Shipped version:** 5.0.0~ynh3 +**Shipped version:** 5.0.0~ynh4 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 9ac183c..2584604 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po ownCloud Infinite Scale (oCIS) est la nouvelle plateforme de synchronisation et de partage de fichiers qui constituera la base de votre plateforme de gestion de données. -**Version incluse :** 5.0.0~ynh3 +**Version incluse :** 5.0.0~ynh4 ## Captures d’écran diff --git a/conf/.env b/conf/.env index abd7eab..da1aee0 100644 --- a/conf/.env +++ b/conf/.env @@ -1,3 +1,5 @@ +TZ=__TIMEZONE__ + OCIS_URL=https://__DOMAIN__ PROXY_HTTP_ADDR=127.0.0.1:__PORT__ PROXY_TLS=true @@ -13,12 +15,3 @@ OCIS_BASE_DATA_PATH=__DATA_DIR__ OCIS_DEFAULT_LANGUAGE=__LANGUAGE__ #OCIS_EXCLUDE_RUN_SERVICES=thumbnails - -#AUTH_BASIC_AUTH_MANAGER=ldap -#OCIS_LDAP_URI=ldap://127.0.0.1:389 -#OCIS_LDAP_USER_BASE_DN='ou=users,dc=yunohost,dc=org' -#OCIS_LDAP_GROUP_BASE_DN='ou=groups,dc=yunohost,dc=org' -#OCIS_LDAP_USER_FILTER='(&(|(objectclass=posixAccount))(uid=%uid)(permission=cn=__APP__.main,ou=permission,dc=yunohost,dc=org))' -#OCIS_LDAP_LOGIN_ATTRIBUTES=uid -#OCIS_LDAP_USER_SCHEMA_MAIL=mail -#OCIS_LDAP_GROUP_SCHEMA_DISPLAYNAME=cn diff --git a/manifest.toml b/manifest.toml index 2dae0e8..054e141 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "ownCloud" description.en = "Online storage, file sharing platform" description.fr = "Stockage en ligne, plateforme de partage de fichiers" -version = "5.0.0~ynh3" +version = "5.0.0~ynh4" maintainers = ["eric_G"] @@ -26,7 +26,7 @@ ldap = false sso = false disk = "50M" -ram.build = "300M" +ram.build = "800M" ram.runtime = "50M" [install] @@ -41,7 +41,7 @@ ram.runtime = "50M" ask.en = "Choose the application language" ask.fr = "Choisissez la langue de l'application" type = "select" - choices = ["de", "fr", "en"] + choices = ["cs", "de", "en", "es", "fr", "gl", "it"] default = "fr" [install.password] @@ -61,15 +61,14 @@ ram.runtime = "50M" in_subdir = false rename = "ocis" - [resources.ports] - main.default = 9200 - [resources.system_user] [resources.install_dir] [resources.data_dir] + [resources.ports] + [resources.permissions] main.url = "/" main.auth_header = false diff --git a/scripts/change_url b/scripts/change_url index f7c2e52..cac663e 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -9,6 +9,8 @@ source _common.sh source /usr/share/yunohost/helpers +timezone=$(cat /etc/timezone) + #================================================= # STANDARD MODIFICATIONS #================================================= diff --git a/scripts/install b/scripts/install index 6f325e1..f0a37d2 100755 --- a/scripts/install +++ b/scripts/install @@ -9,6 +9,8 @@ source _common.sh source /usr/share/yunohost/helpers +timezone=$(cat /etc/timezone) + #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 6d5a7d5..8733b6b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,6 +9,8 @@ source _common.sh source /usr/share/yunohost/helpers +timezone=$(cat /etc/timezone) + #================================================= # CHECK VERSION #================================================= @@ -53,6 +55,16 @@ ynh_add_systemd_config yunohost service add $app --description="File sharing platform" --log="/var/log/$app/$app.log" +#================================================= +# ADD A CONFIGURATION +#================================================= +ynh_script_progression --message="Adding a configuration file..." --weight=1 + +ynh_add_config --template=".env" --destination="$install_dir/ocis.env" + +chmod 400 "$install_dir/ocis.env" +chown $app:$app "$install_dir/ocis.env" + #================================================= # START SYSTEMD SERVICE #=================================================