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] 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