From d877f394d9fbd974a0a74ba928db41eb7f2eeacc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 24 Nov 2023 22:44:48 +0100 Subject: [PATCH 01/10] Update upgrade --- scripts/upgrade | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index 6d5a7d5..525c82c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -53,6 +53,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 #================================================= From 39e8c289d36d610b28687487998c737ec79e0438 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 26 Nov 2023 18:46:37 +0100 Subject: [PATCH 02/10] Update .env --- conf/.env | 9 --------- 1 file changed, 9 deletions(-) diff --git a/conf/.env b/conf/.env index abd7eab..db163e9 100644 --- a/conf/.env +++ b/conf/.env @@ -13,12 +13,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 From 8fd6288017eb584c6e702b70606872a80504e1ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 26 Nov 2023 19:18:58 +0100 Subject: [PATCH 03/10] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 2dae0e8..6a69060 100644 --- a/manifest.toml +++ b/manifest.toml @@ -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 = ["de", "en", "es", "fr", "it"] default = "fr" [install.password] From 1781ae55762a8641508bbf2dcc65ca43cdc86c01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 26 Nov 2023 21:07:23 +0100 Subject: [PATCH 04/10] add timezone --- conf/.env | 2 ++ scripts/install | 2 ++ scripts/upgrade | 2 ++ 3 files changed, 6 insertions(+) diff --git a/conf/.env b/conf/.env index db163e9..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 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 525c82c..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 #================================================= From b1de422d2471d8e13fd2daee0c20f0f2aa97ca67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 26 Nov 2023 21:07:37 +0100 Subject: [PATCH 05/10] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 6a69060..2ee8d16 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"] From 6cd7e62cf38018908baaf9f0bf2b95b4a2d2ed0e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 26 Nov 2023 20:07:41 +0000 Subject: [PATCH 06/10] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 From 2c9ea961f24a83e8f09a35675f3927f3003fab19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 26 Nov 2023 21:10:45 +0100 Subject: [PATCH 07/10] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 2ee8d16..2c46123 100644 --- a/manifest.toml +++ b/manifest.toml @@ -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", "en", "es", "fr", "it"] + choices = ["cs", "de", "en", "es", "fr", "gl", "it"] default = "fr" [install.password] From 397922c224442361d96c3ef56567d4f57a983253 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 26 Nov 2023 21:11:35 +0100 Subject: [PATCH 08/10] Update manifest.toml --- manifest.toml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 2c46123..2c0aa77 100644 --- a/manifest.toml +++ b/manifest.toml @@ -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 From 8f021713ca9f41bba318aa357984f9505e242983 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 26 Nov 2023 21:32:32 +0100 Subject: [PATCH 09/10] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 2c0aa77..054e141 100644 --- a/manifest.toml +++ b/manifest.toml @@ -26,7 +26,7 @@ ldap = false sso = false disk = "50M" -ram.build = "300M" +ram.build = "800M" ram.runtime = "50M" [install] From 085c5103aa910e4e9656f078c82a430bf63c8c6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 26 Nov 2023 22:18:10 +0100 Subject: [PATCH 10/10] Update change_url --- scripts/change_url | 2 ++ 1 file changed, 2 insertions(+) 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 #=================================================