From 7252f7be6b9c95617d658c951f074efc9fc8b3da Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 19 Sep 2023 13:19:20 +0000 Subject: [PATCH 01/25] Auto-update README --- README.md | 4 ---- README_fr.md | 4 ---- 2 files changed, 8 deletions(-) diff --git a/README.md b/README.md index 874c221..4203637 100644 --- a/README.md +++ b/README.md @@ -24,10 +24,6 @@ ownCloud Infinite Scale (oCIS) is the new file sync & share platform that will b ![Screenshot of ownCloud](./doc/screenshots/screenshot.png) -## :red_circle: Antifeatures - -- **Package not maintained**: This YunoHost package is not maintained and needs adoption. - ## Documentation and resources * Official app website: diff --git a/README_fr.md b/README_fr.md index 062acab..3c94b4b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -25,10 +25,6 @@ ownCloud Infinite Scale (oCIS) est la nouvelle plateforme de synchronisation et ![Capture d’écran de ownCloud](./doc/screenshots/screenshot.png) -## :red_circle: Fonctions indésirables - -- **Package not maintained**: This YunoHost package is not maintained and needs adoption. - ## Documentations et ressources * Site officiel de l’app : From 88409db797008da08ce495d371ae734265d9bc0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 19 Sep 2023 15:49:01 +0200 Subject: [PATCH 02/25] Update manifest.toml --- manifest.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/manifest.toml b/manifest.toml index e3cfa50..6cbb391 100644 --- a/manifest.toml +++ b/manifest.toml @@ -62,3 +62,6 @@ ram.runtime = "50M" [resources.permissions] main.url = "/" + api.url = "/api" + api.show_tile = false + api.auth_header = false From 8b40ac997132792526325f5e6c13f3326788bd77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 19 Sep 2023 16:20:23 +0200 Subject: [PATCH 03/25] Update manifest.toml --- manifest.toml | 3 --- 1 file changed, 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 6cbb391..e3cfa50 100644 --- a/manifest.toml +++ b/manifest.toml @@ -62,6 +62,3 @@ ram.runtime = "50M" [resources.permissions] main.url = "/" - api.url = "/api" - api.show_tile = false - api.auth_header = false From d821779fec6f5c2ba7d9d0a4ac5a1309f4d6192b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 13 Nov 2023 09:26:50 +0100 Subject: [PATCH 04/25] cleaning --- manifest.toml | 3 +++ scripts/install | 9 +++++---- scripts/remove | 5 +++-- scripts/restore | 13 ++++--------- scripts/upgrade | 5 ++--- 5 files changed, 17 insertions(+), 18 deletions(-) diff --git a/manifest.toml b/manifest.toml index e3cfa50..8625231 100644 --- a/manifest.toml +++ b/manifest.toml @@ -20,8 +20,11 @@ cpe = "cpe:2.3:a:owncloud:owncloud" yunohost = ">= 11.2" architectures = ["amd64", "arm64", "armhf", "i386"] multi_instance = false + ldap = false + sso = false + disk = "50M" ram.build = "300M" ram.runtime = "50M" diff --git a/scripts/install b/scripts/install index a471a5d..cecd67b 100755 --- a/scripts/install +++ b/scripts/install @@ -17,15 +17,14 @@ ynh_script_progression --message="Setting up source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" -chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" chmod +x $install_dir/ocis #================================================= -# NGINX CONFIGURATION +# SYSTEM CONFIGURATION #================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=1 +ynh_script_progression --message="Adding system configurations related to $app..." --weight=1 # Create a dedicated NGINX config ynh_add_nginx_config @@ -50,7 +49,9 @@ yunohost service add $app --description="File sharing platform" --log="/var/log/ #================================================= ynh_script_progression --message="Installing $app..." --weight=3 -(cd "$install_dir" && ./ocis init --insecure=true --force-overwrite=true --admin-password=$password --config-path=$install_dir/.ocis/config) +pushd "$install_dir" + ./ocis init --insecure=true --force-overwrite=true --admin-password=$password --config-path=$install_dir/.ocis/config +popd chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" diff --git a/scripts/remove b/scripts/remove index 57324bf..4c29204 100755 --- a/scripts/remove +++ b/scripts/remove @@ -10,10 +10,11 @@ source _common.sh source /usr/share/yunohost/helpers #================================================= -# STANDARD REMOVE +# REMOVE SYSTEM CONFIGURATIONS #================================================= -# REMOVE SERVICE INTEGRATION IN YUNOHOST +# REMOVE SYSTEMD SERVICE #================================================= +ynh_script_progression --message="Removing system configurations related to $app..." --weight=1 # Remove the service from the list of services known by YunoHost (added from `yunohost service add`) if ynh_exec_warn_less yunohost service status $app >/dev/null diff --git a/scripts/restore b/scripts/restore index bf68e09..5660de6 100755 --- a/scripts/restore +++ b/scripts/restore @@ -32,9 +32,11 @@ ynh_restore_file --origin_path="$data_dir" --not_mandatory chown -R $app:www-data "$data_dir" #================================================= -# RESTORE THE NGINX CONFIGURATION +# RESTORE SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1 +# RESTORE THE PHP-FPM CONFIGURATION +#================================================= +ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" @@ -50,13 +52,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=1 ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" -#================================================= -# GENERIC FINALIZATION -#================================================= -# RELOAD NGINX AND PHP-FPM -#================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=1 - ynh_systemd_action --service_name=nginx --action=reload #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 159df72..96dccbe 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -36,15 +36,14 @@ then ynh_setup_source --dest_dir="$install_dir" --keep=".ocis" fi -chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" chmod +x $install_dir/ocis #================================================= -# PHP-FPM CONFIGURATION +# REAPPLY SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 +ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1 # Create a dedicated NGINX config ynh_add_nginx_config From 1fff2dc076994d5407c1b01bbc24bcf806506b58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 13 Nov 2023 09:27:58 +0100 Subject: [PATCH 05/25] Update manifest.toml --- manifest.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/manifest.toml b/manifest.toml index 8625231..74abfdc 100644 --- a/manifest.toml +++ b/manifest.toml @@ -65,3 +65,4 @@ ram.runtime = "50M" [resources.permissions] main.url = "/" + main.auth_header = false From 01fc86a56d0c42e9cf621b120d4f8b1eec895851 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 13 Nov 2023 09:28:47 +0100 Subject: [PATCH 06/25] Update manifest.toml --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 74abfdc..e536bd6 100644 --- a/manifest.toml +++ b/manifest.toml @@ -45,12 +45,12 @@ ram.runtime = "50M" [resources.sources.main] amd64.url = "https://download.owncloud.com/ocis/ocis/stable/4.0.1/ocis-4.0.1-linux-amd64" amd64.sha256 = "91f21d74099f5ae24ea4686913e8c916b20736c3f6dd64b5536957af5a5e31ae" - i386.url = "https://download.owncloud.com/ocis/ocis/stable/4.0.1/ocis-4.0.1-linux-386" - i386.sha256 = "68f876f2f094e1c2f0056a39910c0a94751b4138d211ffeae11b56e53ff37998" arm64.url = "https://download.owncloud.com/ocis/ocis/stable/4.0.1/ocis-4.0.1-linux-arm64" arm64.sha256 = "0003cb8d81c8468397229e917ffdd25476d1355eb1258b08e855473880398da9" armhf.url = "https://download.owncloud.com/ocis/ocis/stable/4.0.1/ocis-4.0.1-linux-arm" armhf.sha256 = "d6cd4c21356f0ebaaa8bfda0e2b3bd481402248af4647c901141f85febc16106" + i386.url = "https://download.owncloud.com/ocis/ocis/stable/4.0.1/ocis-4.0.1-linux-386" + i386.sha256 = "68f876f2f094e1c2f0056a39910c0a94751b4138d211ffeae11b56e53ff37998" in_subdir = false rename = "ocis" From d0508a443d27f4d7ad4a5fa11488b6554c7c3bb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 13 Nov 2023 09:29:17 +0100 Subject: [PATCH 07/25] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index e536bd6..f32846b 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ description.fr = "Stockage en ligne, plateforme de partage de fichiers et divers version = "4.0.1~ynh1" -maintainers = [""] +maintainers = ["eric_G"] [upstream] license = "Apache-2.0" From 7b63f19e33f307fd5f0758013794c750c9a92e4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 13 Nov 2023 09:32:25 +0100 Subject: [PATCH 08/25] Update manifest.toml --- manifest.toml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/manifest.toml b/manifest.toml index f32846b..b5ab0f9 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "ownCloud" description.en = "Online storage, file sharing platform and various other applications" description.fr = "Stockage en ligne, plateforme de partage de fichiers et diverses autres applications" -version = "4.0.1~ynh1" +version = "5.0.0~ynh1" maintainers = ["eric_G"] @@ -43,14 +43,14 @@ ram.runtime = "50M" [resources] [resources.sources.main] - amd64.url = "https://download.owncloud.com/ocis/ocis/stable/4.0.1/ocis-4.0.1-linux-amd64" - amd64.sha256 = "91f21d74099f5ae24ea4686913e8c916b20736c3f6dd64b5536957af5a5e31ae" - arm64.url = "https://download.owncloud.com/ocis/ocis/stable/4.0.1/ocis-4.0.1-linux-arm64" - arm64.sha256 = "0003cb8d81c8468397229e917ffdd25476d1355eb1258b08e855473880398da9" - armhf.url = "https://download.owncloud.com/ocis/ocis/stable/4.0.1/ocis-4.0.1-linux-arm" - armhf.sha256 = "d6cd4c21356f0ebaaa8bfda0e2b3bd481402248af4647c901141f85febc16106" - i386.url = "https://download.owncloud.com/ocis/ocis/stable/4.0.1/ocis-4.0.1-linux-386" - i386.sha256 = "68f876f2f094e1c2f0056a39910c0a94751b4138d211ffeae11b56e53ff37998" + amd64.url = "https://download.owncloud.com/ocis/ocis/testing/5.0.0-alpha.2/ocis-5.0.0-alpha.2-linux-amd64" + amd64.sha256 = "704a1c210ad98ddc8131b54f5e7cf9ee21917e82f2fa0828a096825023002965" + arm64.url = "https://download.owncloud.com/ocis/ocis/testing/5.0.0-alpha.2/ocis-5.0.0-alpha.2-linux-arm64" + arm64.sha256 = "0d32c5fd7e3e7c15c248690e9da9f606b64a9ccb446dd92d84f6b821b2c1f579" + armhf.url = "https://download.owncloud.com/ocis/ocis/testing/5.0.0-alpha.2/ocis-5.0.0-alpha.2-linux-arm" + armhf.sha256 = "45270ba7c2325032aacd99a91c7df23a9ffb3cb30ddc9ca56798d24ea95427c4" + i386.url = "https://download.owncloud.com/ocis/ocis/testing/5.0.0-alpha.2/ocis-5.0.0-alpha.2-linux-386" + i386.sha256 = "6d997bdef3c9f38cd7dd55025d8436df641db3e19316db66d514af52ce0effe9" in_subdir = false rename = "ocis" From 229c937d36f9ed3b491bb0948af658a5e592f410 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 13 Nov 2023 08:32:30 +0000 Subject: [PATCH 09/25] 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 73f8df5..dd5c9be 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:** 4.0.1~ynh1 +**Shipped version:** 5.0.0~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index ed25897..2e62ae8 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 :** 4.0.1~ynh1 +**Version incluse :** 5.0.0~ynh1 ## Captures d’écran From 6fe5679655a46fb4bb5d5af624954292eb67d73d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 13 Nov 2023 10:02:59 +0100 Subject: [PATCH 10/25] fix --- conf/.env | 35 +++++++++++++++++++++++++++++++++++ conf/systemd.service | 1 + doc/POST_INSTALL.md | 1 - doc/POST_INSTALL_fr.md | 1 - manifest.toml | 3 +++ 5 files changed, 39 insertions(+), 2 deletions(-) delete mode 100644 doc/POST_INSTALL.md delete mode 100644 doc/POST_INSTALL_fr.md diff --git a/conf/.env b/conf/.env index 81ed846..6835fc2 100644 --- a/conf/.env +++ b/conf/.env @@ -13,3 +13,38 @@ OCIS_LOG_LEVEL=warn OCIS_CONFIG_DIR=__INSTALL_DIR__ ADMIN_PASSWORD=__PASSWORD__ + + + + +OCIS_URL: https://__DOMAIN__ +PROXY_HTTP_ADDR= 127.0.0.1:__PORT__ + +OCIS_LOG_LEVEL: info + +OCIS_LOG_COLOR: false +PROXY_TLS: false +OCIS_INSECURE: true +PROXY_ENABLE_BASIC_AUTH: false + +# admin user password +IDM_ADMIN_PASSWORD: __ADMIN__ # this overrides the admin password from the configuration file + +# demo users +IDM_CREATE_DEMO_USERS: false +NOTIFICATIONS_SMTP_HOST: inbucket +NOTIFICATIONS_SMTP_PORT: 2500 +NOTIFICATIONS_SMTP_SENDER: oCIS notifications +NOTIFICATIONS_SMTP_USERNAME: notifications@${OCIS_DOMAIN:-ocis.owncloud.test} +NOTIFICATIONS_SMTP_INSECURE: true # the mail catcher uses self signed certificates + +# activate s3ng storage driver +STORAGE_USERS_DRIVER: s3ng +STORAGE_SYSTEM_DRIVER: ocis # keep system data on ocis storage since this are only small files atm + +# s3ng specific settings +STORAGE_USERS_S3NG_ENDPOINT: http://minio:9000 +STORAGE_USERS_S3NG_REGION: default +STORAGE_USERS_S3NG_ACCESS_KEY: +STORAGE_USERS_S3NG_SECRET_KEY: +STORAGE_USERS_S3NG_BUCKET: ocis-bucket \ No newline at end of file diff --git a/conf/systemd.service b/conf/systemd.service index b5130f1..ef03817 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -7,6 +7,7 @@ User=__APP__ Group=__APP__ Environment=OCIS_BASE_DATA_PATH=__DATA_DIR__ Environment=PROXY_HTTP_ADDR=127.0.0.1:__PORT__ +Environment=IDM_ADMIN_PASSWORD: __ADMIN__ Environment=OCIS_URL=https://__DOMAIN__ ExecStart=__INSTALL_DIR__/ocis server Restart=always diff --git a/doc/POST_INSTALL.md b/doc/POST_INSTALL.md deleted file mode 100644 index 6687031..0000000 --- a/doc/POST_INSTALL.md +++ /dev/null @@ -1 +0,0 @@ -Connect to ownCloud with `admin` as a username and the password selected at install. \ No newline at end of file diff --git a/doc/POST_INSTALL_fr.md b/doc/POST_INSTALL_fr.md deleted file mode 100644 index cbee989..0000000 --- a/doc/POST_INSTALL_fr.md +++ /dev/null @@ -1 +0,0 @@ -Connectez-vous à ownCloud avec « admin » comme nom d'utilisateur et le mot de passe sélectionné lors de l'installation. \ No newline at end of file diff --git a/manifest.toml b/manifest.toml index b5ab0f9..b056140 100644 --- a/manifest.toml +++ b/manifest.toml @@ -37,6 +37,9 @@ ram.runtime = "50M" type = "group" default = "visitors" + [install.admin] + type = "user" + [install.password] type = "password" From beb6b3a3f0fb0c695edf43b62afcab43a4cfdbf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 13 Nov 2023 10:06:47 +0100 Subject: [PATCH 11/25] Revert "fix" This reverts commit 6fe5679655a46fb4bb5d5af624954292eb67d73d. --- conf/.env | 35 ----------------------------------- conf/systemd.service | 1 - doc/POST_INSTALL.md | 1 + doc/POST_INSTALL_fr.md | 1 + manifest.toml | 3 --- 5 files changed, 2 insertions(+), 39 deletions(-) create mode 100644 doc/POST_INSTALL.md create mode 100644 doc/POST_INSTALL_fr.md diff --git a/conf/.env b/conf/.env index 6835fc2..81ed846 100644 --- a/conf/.env +++ b/conf/.env @@ -13,38 +13,3 @@ OCIS_LOG_LEVEL=warn OCIS_CONFIG_DIR=__INSTALL_DIR__ ADMIN_PASSWORD=__PASSWORD__ - - - - -OCIS_URL: https://__DOMAIN__ -PROXY_HTTP_ADDR= 127.0.0.1:__PORT__ - -OCIS_LOG_LEVEL: info - -OCIS_LOG_COLOR: false -PROXY_TLS: false -OCIS_INSECURE: true -PROXY_ENABLE_BASIC_AUTH: false - -# admin user password -IDM_ADMIN_PASSWORD: __ADMIN__ # this overrides the admin password from the configuration file - -# demo users -IDM_CREATE_DEMO_USERS: false -NOTIFICATIONS_SMTP_HOST: inbucket -NOTIFICATIONS_SMTP_PORT: 2500 -NOTIFICATIONS_SMTP_SENDER: oCIS notifications -NOTIFICATIONS_SMTP_USERNAME: notifications@${OCIS_DOMAIN:-ocis.owncloud.test} -NOTIFICATIONS_SMTP_INSECURE: true # the mail catcher uses self signed certificates - -# activate s3ng storage driver -STORAGE_USERS_DRIVER: s3ng -STORAGE_SYSTEM_DRIVER: ocis # keep system data on ocis storage since this are only small files atm - -# s3ng specific settings -STORAGE_USERS_S3NG_ENDPOINT: http://minio:9000 -STORAGE_USERS_S3NG_REGION: default -STORAGE_USERS_S3NG_ACCESS_KEY: -STORAGE_USERS_S3NG_SECRET_KEY: -STORAGE_USERS_S3NG_BUCKET: ocis-bucket \ No newline at end of file diff --git a/conf/systemd.service b/conf/systemd.service index ef03817..b5130f1 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -7,7 +7,6 @@ User=__APP__ Group=__APP__ Environment=OCIS_BASE_DATA_PATH=__DATA_DIR__ Environment=PROXY_HTTP_ADDR=127.0.0.1:__PORT__ -Environment=IDM_ADMIN_PASSWORD: __ADMIN__ Environment=OCIS_URL=https://__DOMAIN__ ExecStart=__INSTALL_DIR__/ocis server Restart=always diff --git a/doc/POST_INSTALL.md b/doc/POST_INSTALL.md new file mode 100644 index 0000000..6687031 --- /dev/null +++ b/doc/POST_INSTALL.md @@ -0,0 +1 @@ +Connect to ownCloud with `admin` as a username and the password selected at install. \ No newline at end of file diff --git a/doc/POST_INSTALL_fr.md b/doc/POST_INSTALL_fr.md new file mode 100644 index 0000000..cbee989 --- /dev/null +++ b/doc/POST_INSTALL_fr.md @@ -0,0 +1 @@ +Connectez-vous à ownCloud avec « admin » comme nom d'utilisateur et le mot de passe sélectionné lors de l'installation. \ No newline at end of file diff --git a/manifest.toml b/manifest.toml index b056140..b5ab0f9 100644 --- a/manifest.toml +++ b/manifest.toml @@ -37,9 +37,6 @@ ram.runtime = "50M" type = "group" default = "visitors" - [install.admin] - type = "user" - [install.password] type = "password" From 9a6aaff4c32f8e8c5b5a5b2b1bb91c60bf045852 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 13 Nov 2023 10:23:43 +0100 Subject: [PATCH 12/25] fix --- conf/.env | 18 +++++++++--------- conf/systemd.service | 3 --- manifest.toml | 3 +++ scripts/install | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/conf/.env b/conf/.env index 81ed846..67cdf9a 100644 --- a/conf/.env +++ b/conf/.env @@ -1,15 +1,15 @@ -OCIS_INSECURE=true - OCIS_URL=https://__DOMAIN__ - PROXY_HTTP_ADDR=127.0.0.1:__PORT__ - -OCIS_BASE_DATA_PATH=__DATA_DIR__ - -FORCE_CONFIG_OVERWRITE=true +PROXY_TLS=false +OCIS_INSECURE=false OCIS_LOG_LEVEL=warn -OCIS_CONFIG_DIR=__INSTALL_DIR__ +OCIS_FORCE_CONFIG_OVERWRITE=true -ADMIN_PASSWORD=__PASSWORD__ +OCIS_CONFIG_DIR=__INSTALL_DIR__ +OCIS_BASE_DATA_PATH=__DATA_DIR__ + + +IDM_ADMIN_PASSWORD=__PASSWORD__ +IDM_ADMIN=__ADMIN__ \ No newline at end of file diff --git a/conf/systemd.service b/conf/systemd.service index b5130f1..1f74a2e 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -5,9 +5,6 @@ Description=ownCloud Infinite Scale server Type=simple User=__APP__ Group=__APP__ -Environment=OCIS_BASE_DATA_PATH=__DATA_DIR__ -Environment=PROXY_HTTP_ADDR=127.0.0.1:__PORT__ -Environment=OCIS_URL=https://__DOMAIN__ ExecStart=__INSTALL_DIR__/ocis server Restart=always diff --git a/manifest.toml b/manifest.toml index b5ab0f9..10bd36d 100644 --- a/manifest.toml +++ b/manifest.toml @@ -37,6 +37,9 @@ ram.runtime = "50M" type = "group" default = "visitors" + [install.admin] + type = "user" + [install.password] type = "password" diff --git a/scripts/install b/scripts/install index cecd67b..2a5120a 100755 --- a/scripts/install +++ b/scripts/install @@ -39,10 +39,10 @@ yunohost service add $app --description="File sharing platform" --log="/var/log/ #================================================= #ynh_script_progression --message="Adding a configuration file..." --weight=1 -#ynh_add_config --template="../conf/.env" --destination="$install_dir/.env" +#ynh_add_config --template=".env" --destination="$install_dir/ocis.env" -#chmod 600 "$install_dir/.env" -#chown $app:$app "$install_dir/.env" +#chmod 400 "$install_dir/ocis.env" +#chown $app:$app "$install_dir/ocis.env" #================================================= # INSTALL OWNCLOUD From e62f9ce423d5960e8870bd8917aaf6897c2f36f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 13 Nov 2023 10:40:13 +0100 Subject: [PATCH 13/25] cleaning --- conf/.env | 9 ++++++++- manifest.toml | 9 ++++++++- scripts/install | 8 ++++---- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/conf/.env b/conf/.env index 67cdf9a..8a5044b 100644 --- a/conf/.env +++ b/conf/.env @@ -12,4 +12,11 @@ OCIS_BASE_DATA_PATH=__DATA_DIR__ IDM_ADMIN_PASSWORD=__PASSWORD__ -IDM_ADMIN=__ADMIN__ \ No newline at end of file +#IDM_ADMIN=__ADMIN__ + +OCIS_DEFAULT_LANGUAGE=__LANGUAGE__ + + +OCIS_LDAP_URI=ldap://localhost:9235 +OCIS_LDAP_USER_BASE_DN="ou=users,dc=yunohost,dc=org" +OCIS_LDAP_GROUP_BASE_DN="ou=groups,dc=yunohost,dc=org" \ No newline at end of file diff --git a/manifest.toml b/manifest.toml index 10bd36d..bd4c8bb 100644 --- a/manifest.toml +++ b/manifest.toml @@ -36,10 +36,17 @@ ram.runtime = "50M" [install.init_main_permission] type = "group" default = "visitors" + + [install.language] + ask.en = "Choose the application language" + ask.fr = "Choisissez la langue de l'application" + type = "select" + choices = ["fr", "en"] + default = "fr" [install.admin] type = "user" - + [install.password] type = "password" diff --git a/scripts/install b/scripts/install index 2a5120a..9c27c23 100755 --- a/scripts/install +++ b/scripts/install @@ -37,12 +37,12 @@ yunohost service add $app --description="File sharing platform" --log="/var/log/ #================================================= # ADD A CONFIGURATION #================================================= -#ynh_script_progression --message="Adding a configuration file..." --weight=1 +ynh_script_progression --message="Adding a configuration file..." --weight=1 -#ynh_add_config --template=".env" --destination="$install_dir/ocis.env" +ynh_add_config --template=".env" --destination="$install_dir/ocis.env" -#chmod 400 "$install_dir/ocis.env" -#chown $app:$app "$install_dir/ocis.env" +chmod 400 "$install_dir/ocis.env" +chown $app:$app "$install_dir/ocis.env" #================================================= # INSTALL OWNCLOUD From 2e30d47062cfce239c5015153d30b05b9e26ff3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 13 Nov 2023 10:40:49 +0100 Subject: [PATCH 14/25] fix --- conf/.env | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/.env b/conf/.env index 8a5044b..4d266a4 100644 --- a/conf/.env +++ b/conf/.env @@ -12,7 +12,7 @@ OCIS_BASE_DATA_PATH=__DATA_DIR__ IDM_ADMIN_PASSWORD=__PASSWORD__ -#IDM_ADMIN=__ADMIN__ + OCIS_DEFAULT_LANGUAGE=__LANGUAGE__ diff --git a/scripts/upgrade b/scripts/upgrade index 96dccbe..a0a93fe 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -33,7 +33,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" --keep=".ocis" + ynh_setup_source --dest_dir="$install_dir" --keep=".ocis ocis.env" fi chmod -R o-rwx "$install_dir" From c7cf9a5a1b72f804759b3686947fcc2fbd03b7b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 13 Nov 2023 10:50:19 +0100 Subject: [PATCH 15/25] Update .env --- conf/.env | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/conf/.env b/conf/.env index 4d266a4..d0bdff7 100644 --- a/conf/.env +++ b/conf/.env @@ -16,7 +16,11 @@ IDM_ADMIN_PASSWORD=__PASSWORD__ OCIS_DEFAULT_LANGUAGE=__LANGUAGE__ - +AUTH_BASIC_AUTH_MANAGER=ldap OCIS_LDAP_URI=ldap://localhost:9235 OCIS_LDAP_USER_BASE_DN="ou=users,dc=yunohost,dc=org" -OCIS_LDAP_GROUP_BASE_DN="ou=groups,dc=yunohost,dc=org" \ No newline at end of file +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)) +LDAP_LOGIN_ATTRIBUTES="uid" +OCIS_LDAP_USER_SCHEMA_MAIL="mail" +OCIS_LDAP_GROUP_SCHEMA_DISPLAYNAME="cn" \ No newline at end of file From 95c048d838021ea73be66f04f27dbc6a206640cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 13 Nov 2023 10:54:11 +0100 Subject: [PATCH 16/25] Update systemd.service --- conf/systemd.service | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/systemd.service b/conf/systemd.service index 1f74a2e..f96ae00 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -5,6 +5,7 @@ Description=ownCloud Infinite Scale server Type=simple User=__APP__ Group=__APP__ +EnvironmentFile=__INSTALL_DIR__/ocis.env ExecStart=__INSTALL_DIR__/ocis server Restart=always From 399a4c2243dc3971d0a697162634a6365b3097be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 13 Nov 2023 10:54:29 +0100 Subject: [PATCH 17/25] Update .env --- conf/.env | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/.env b/conf/.env index d0bdff7..fc31857 100644 --- a/conf/.env +++ b/conf/.env @@ -3,6 +3,10 @@ PROXY_HTTP_ADDR=127.0.0.1:__PORT__ PROXY_TLS=false OCIS_INSECURE=false +#tls_certificate_path: "/etc/yunohost/certs/__DOMAIN__/crt.pem" +#tls_private_key_path: "/etc/yunohost/certs/__DOMAIN__/key.pem" + + OCIS_LOG_LEVEL=warn OCIS_FORCE_CONFIG_OVERWRITE=true From 6f56db90c04d0795eefa41006fd8817189c5c3cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 13 Nov 2023 11:01:54 +0100 Subject: [PATCH 18/25] fix --- conf/.env | 5 ++--- manifest.toml | 8 +++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/conf/.env b/conf/.env index fc31857..2fe2602 100644 --- a/conf/.env +++ b/conf/.env @@ -3,9 +3,8 @@ PROXY_HTTP_ADDR=127.0.0.1:__PORT__ PROXY_TLS=false OCIS_INSECURE=false -#tls_certificate_path: "/etc/yunohost/certs/__DOMAIN__/crt.pem" -#tls_private_key_path: "/etc/yunohost/certs/__DOMAIN__/key.pem" - +OCIS_HTTP_TLS_CERTIFICATE="/etc/yunohost/certs/__DOMAIN__/crt.pem" +OCIS_HTTP_TLS_KEY="/etc/yunohost/certs/__DOMAIN__/key.pem" OCIS_LOG_LEVEL=warn diff --git a/manifest.toml b/manifest.toml index bd4c8bb..5e19794 100644 --- a/manifest.toml +++ b/manifest.toml @@ -36,7 +36,7 @@ ram.runtime = "50M" [install.init_main_permission] type = "group" default = "visitors" - + [install.language] ask.en = "Choose the application language" ask.fr = "Choisissez la langue de l'application" @@ -76,3 +76,9 @@ ram.runtime = "50M" [resources.permissions] main.url = "/" main.auth_header = false + + api.url = "/api" + api.auth_header = false + api.show_tile = false + api.protected= true + api.allowed = ["visitors"] From 036349ecc4e616abbc6265f886059aaec5851b6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 13 Nov 2023 11:03:15 +0100 Subject: [PATCH 19/25] Update .env --- conf/.env | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/.env b/conf/.env index 2fe2602..c0abca2 100644 --- a/conf/.env +++ b/conf/.env @@ -3,6 +3,8 @@ PROXY_HTTP_ADDR=127.0.0.1:__PORT__ PROXY_TLS=false OCIS_INSECURE=false +JWT_SECRET=123515646465456465465465465465 + OCIS_HTTP_TLS_CERTIFICATE="/etc/yunohost/certs/__DOMAIN__/crt.pem" OCIS_HTTP_TLS_KEY="/etc/yunohost/certs/__DOMAIN__/key.pem" From f5ddec9a76a5cdd86e53e6dd41c95a764f11dbd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 13 Nov 2023 11:06:24 +0100 Subject: [PATCH 20/25] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 9c27c23..4ae6129 100755 --- a/scripts/install +++ b/scripts/install @@ -50,7 +50,7 @@ chown $app:$app "$install_dir/ocis.env" ynh_script_progression --message="Installing $app..." --weight=3 pushd "$install_dir" - ./ocis init --insecure=true --force-overwrite=true --admin-password=$password --config-path=$install_dir/.ocis/config + ./ocis init --insecure=true --force-overwrite=true --admin-password=$password --config-path=$install_dir/ocis.env popd chmod 750 "$install_dir" From 8a926d3770a2639772e457d2a4255ae39ffd1120 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 13 Nov 2023 11:08:10 +0100 Subject: [PATCH 21/25] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 4ae6129..6f325e1 100755 --- a/scripts/install +++ b/scripts/install @@ -50,7 +50,7 @@ chown $app:$app "$install_dir/ocis.env" ynh_script_progression --message="Installing $app..." --weight=3 pushd "$install_dir" - ./ocis init --insecure=true --force-overwrite=true --admin-password=$password --config-path=$install_dir/ocis.env + ./ocis init --insecure=true --force-overwrite=true --admin-password=$password --config-path=$install_dir popd chmod 750 "$install_dir" From ddb44a63b17e29bc5f72cdcfb485726f88d5c3b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 13 Nov 2023 11:13:16 +0100 Subject: [PATCH 22/25] Update .env --- conf/.env | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/conf/.env b/conf/.env index c0abca2..741d587 100644 --- a/conf/.env +++ b/conf/.env @@ -3,10 +3,8 @@ PROXY_HTTP_ADDR=127.0.0.1:__PORT__ PROXY_TLS=false OCIS_INSECURE=false -JWT_SECRET=123515646465456465465465465465 - -OCIS_HTTP_TLS_CERTIFICATE="/etc/yunohost/certs/__DOMAIN__/crt.pem" -OCIS_HTTP_TLS_KEY="/etc/yunohost/certs/__DOMAIN__/key.pem" +#OCIS_HTTP_TLS_CERTIFICATE="/etc/yunohost/certs/__DOMAIN__/crt.pem" +#OCIS_HTTP_TLS_KEY="/etc/yunohost/certs/__DOMAIN__/key.pem" OCIS_LOG_LEVEL=warn From c8143b56bada72d7f7eae36b3d9d972517e3ff11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 13 Nov 2023 11:16:20 +0100 Subject: [PATCH 23/25] Update .env --- conf/.env | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/conf/.env b/conf/.env index 741d587..cbc3d3d 100644 --- a/conf/.env +++ b/conf/.env @@ -19,11 +19,11 @@ IDM_ADMIN_PASSWORD=__PASSWORD__ OCIS_DEFAULT_LANGUAGE=__LANGUAGE__ -AUTH_BASIC_AUTH_MANAGER=ldap -OCIS_LDAP_URI=ldap://localhost:9235 -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)) -LDAP_LOGIN_ATTRIBUTES="uid" -OCIS_LDAP_USER_SCHEMA_MAIL="mail" -OCIS_LDAP_GROUP_SCHEMA_DISPLAYNAME="cn" \ No newline at end of file +#AUTH_BASIC_AUTH_MANAGER=ldap +#OCIS_LDAP_URI=ldap://localhost:9235 +#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" \ No newline at end of file From 1491bbcce9d5a62593aeef26fe18494a442002d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 13 Nov 2023 11:16:43 +0100 Subject: [PATCH 24/25] Update .env --- conf/.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/.env b/conf/.env index cbc3d3d..f80b51f 100644 --- a/conf/.env +++ b/conf/.env @@ -1,6 +1,6 @@ OCIS_URL=https://__DOMAIN__ PROXY_HTTP_ADDR=127.0.0.1:__PORT__ -PROXY_TLS=false +PROXY_TLS=true OCIS_INSECURE=false #OCIS_HTTP_TLS_CERTIFICATE="/etc/yunohost/certs/__DOMAIN__/crt.pem" From cf1630d87c163df8103260287441daa0c8c367ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 13 Nov 2023 12:05:08 +0100 Subject: [PATCH 25/25] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 5e19794..93fcf9b 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 = ["fr", "en"] + choices = ["de", "fr", "en"] default = "fr" [install.admin]