From aa11e5a24e58716b0d5a0c18a1636bd43b1705c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 12 Oct 2023 17:47:30 +0200
Subject: [PATCH] cleaning

---
 conf/.env.example | 27 +++++++++++++++++++++------
 manifest.toml     |  6 ++++++
 scripts/install   |  1 +
 scripts/upgrade   | 13 ++++++++-----
 4 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/conf/.env.example b/conf/.env.example
index 5a0b7a6..01bbb5e 100644
--- a/conf/.env.example
+++ b/conf/.env.example
@@ -20,6 +20,9 @@ media.baseURL="https://__DOMAIN__"
 admin.gateway="cp-admin"
 auth.gateway="cp-auth"
 
+media.root="media"
+media.storage="__DATA_DIR__"
+
 #--------------------------------------------------------------------
 # Database configuration
 #--------------------------------------------------------------------
@@ -32,12 +35,12 @@ database.default.DBPrefix="cp_"
 #--------------------------------------------------------------------
 # Email configuration
 #--------------------------------------------------------------------
-# email.fromEmail="your_email_address"
-# email.fromName="Castopod"
-# email.SMTPHost="localhost"
-# email.SMTPPort="25"
-# email.SMTPUser="your_smtp_user"
-# email.SMTPPass="your_smtp_password"
+email.fromEmail="__EMAIL__"
+email.fromName="Castopod"
+email.SMTPHost="localhost"
+email.SMTPPort="25"
+email.SMTPUser="__APP__"
+email.SMTPPass="__MAIL_PWD__"
 
 #--------------------------------------------------------------------
 # Cache configuration (advanced)
@@ -55,7 +58,19 @@ cache.redis.password=null
 cache.redis.port=6379
 cache.redis.database=__REDIS_DB__
 
+#--------------------------------------------------------------------
+# S3 configuration
+#--------------------------------------------------------------------
+# media.fileManager="s3"
+# media.s3.endpoint="your_s3_host"
+# media.s3.key="your_s3_key"
+# media.s3.secret="your_s3_secret"
+# media.s3.region="your_s3_region"
+
 #--------------------------------------------------------------------
 # REST API configuration
 #--------------------------------------------------------------------
 # restapi.enabled=true
+# restapi.basicAuthUsername=castopod
+# restapi.basicAuthPassword=password
+# restapi.basicAuth=true
diff --git a/manifest.toml b/manifest.toml
index 984c6a6..37029e0 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -34,6 +34,9 @@ ram.runtime = "50M"
     type = "group"
     default = "visitors"
 
+    [install.admin]
+    type = "user"
+
 [resources]
 
     [resources.sources]
@@ -44,9 +47,12 @@ ram.runtime = "50M"
         in_subdir = true
 
     [resources.system_user]
+    allow_email = true
 
     [resources.install_dir]
 
+    [resources.data_dir]
+
     [resources.permissions]
     main.url = "/"
 
diff --git a/scripts/install b/scripts/install
index a688986..3fa7318 100755
--- a/scripts/install
+++ b/scripts/install
@@ -16,6 +16,7 @@ source /usr/share/yunohost/helpers
 fpm_footprint="low"
 fpm_free_footprint=0
 fpm_usage="low"
+email=$(ynh_user_get_info --username=$admin --key=mail)
 
 ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint
 ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint
diff --git a/scripts/upgrade b/scripts/upgrade
index 0fe442e..4ab944a 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -73,17 +73,20 @@ chown root: "/etc/cron.d/$app"
 chmod 644 "/etc/cron.d/$app"
 
 #=================================================
-# CONFIGURE CASTOPOD
+# CONFIGURE CASTOPOD DATABASE
 #=================================================
 ynh_script_progression --message="Configuring Castopod database..." --weight=1
 
 ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < "../conf/v1.5.2.sql"
 
-#ynh_script_progression --message="Configuring Castopod..." --weight=1
+#=================================================
+# ADD CONFIGURE
+#=================================================
+ynh_script_progression --message="Configuring Castopod..." --weight=1
 
-# ynh_add_config --template="../conf/.env.example" --destination="$install_dir/.env"
-# chmod 600 $install_dir/.env
-# chown $app:www-data "$install_dir/.env"
+ynh_add_config --template="../conf/.env.example" --destination="$install_dir/.env"
+chmod 600 $install_dir/.env
+chown $app:www-data "$install_dir/.env"
 
 #=================================================
 # END OF SCRIPT